Merge "Move DeviceInfoUtilsTest from NetworkStack to frameworks/lib/net" into tm-dev am: d3c184b36b am: 3466fbe5d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/18645484
Change-Id: I30e4c66a092fdd6c4810fa56eb408f800f1d526a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/unit/src/android/net/testutils/DeviceInfoUtilsTest.java b/tests/unit/src/android/net/testutils/DeviceInfoUtilsTest.java
deleted file mode 100644
index f99700a..0000000
--- a/tests/unit/src/android/net/testutils/DeviceInfoUtilsTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.testutils;
-
-import static org.junit.Assert.assertEquals;
-
-import androidx.test.filters.SmallTest;
-
-import org.junit.Test;
-
-@SmallTest
-public final class DeviceInfoUtilsTest {
- /**
- * Verifies that version string compare logic returns expected result for various cases.
- * Note that only major and minor number are compared.
- */
- @Test
- public void testMajorMinorVersionCompare() {
- assertEquals(0, DeviceInfoUtils.compareMajorMinorVersion("4.8.1", "4.8"));
- assertEquals(1, DeviceInfoUtils.compareMajorMinorVersion("4.9", "4.8.1"));
- assertEquals(1, DeviceInfoUtils.compareMajorMinorVersion("5.0", "4.8"));
- assertEquals(1, DeviceInfoUtils.compareMajorMinorVersion("5", "4.8"));
- assertEquals(0, DeviceInfoUtils.compareMajorMinorVersion("5", "5.0"));
- assertEquals(1, DeviceInfoUtils.compareMajorMinorVersion("5-beta1", "4.8"));
- assertEquals(0, DeviceInfoUtils.compareMajorMinorVersion("4.8.0.0", "4.8"));
- assertEquals(0, DeviceInfoUtils.compareMajorMinorVersion("4.8-RC1", "4.8"));
- assertEquals(0, DeviceInfoUtils.compareMajorMinorVersion("4.8", "4.8"));
- assertEquals(-1, DeviceInfoUtils.compareMajorMinorVersion("3.10", "4.8.0"));
- assertEquals(-1, DeviceInfoUtils.compareMajorMinorVersion("4.7.10.10", "4.8"));
- }
-}