aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShuo Qian <shuoq@google.com>2019-05-07 18:02:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-05-07 18:02:54 +0000
commit79ac5cb640d8ce650081d7117759014bcdeb3015 (patch)
tree50cf97682f4597ba17845e6cc04eaaed6c30edf1
parent653524969d2918d89b217b302e392f74aa758a1b (diff)
parent1ae66b0606ff30644fc86dd59ad4d7264b1b42e3 (diff)
downloadtelephony-oreo-mr1-iot-release.tar.gz
Merge "Sorting and merge Emergency number better"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-release
-rw-r--r--tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTest.java94
1 files changed, 94 insertions, 0 deletions
diff --git a/tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTest.java b/tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTest.java
index c20b6a7329..1273148940 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTest.java
@@ -500,5 +500,99 @@ public class EmergencyNumberTest extends TestCase {
outputNumberList.add(num);
EmergencyNumber.mergeSameNumbersInEmergencyNumberList(inputNumberList);
assertEquals(outputNumberList, inputNumberList);
+
+ // Corner case 3: multiple element not ordered
+ inputNumberList = new ArrayList<>();
+ outputNumberList = new ArrayList<>();
+
+ EmergencyNumber num1 = new EmergencyNumber(
+ "911",
+ "us",
+ "",
+ 0b111,
+ new ArrayList<String>(),
+ 0b10000,
+ 0);
+
+ EmergencyNumber num12 = new EmergencyNumber(
+ "911",
+ "us",
+ "",
+ 0b111,
+ new ArrayList<String>(),
+ 0b10000,
+ 0);
+
+ EmergencyNumber num3 = new EmergencyNumber(
+ "112",
+ "",
+ "",
+ 0,
+ new ArrayList<String>(),
+ 0,
+ 0);
+
+ EmergencyNumber num4 = new EmergencyNumber(
+ "*911",
+ "",
+ "",
+ 0,
+ new ArrayList<String>(),
+ 0,
+ 0);
+
+ EmergencyNumber num13 = new EmergencyNumber(
+ "911",
+ "us",
+ "",
+ 0b111,
+ new ArrayList<String>(),
+ 0b10000,
+ 0);
+
+ EmergencyNumber num6 = new EmergencyNumber(
+ "#911",
+ "",
+ "",
+ 0,
+ new ArrayList<String>(),
+ 0,
+ 0);
+
+ EmergencyNumber num31 = new EmergencyNumber(
+ "112",
+ "",
+ "",
+ 0,
+ new ArrayList<String>(),
+ 0,
+ 0);
+
+ EmergencyNumber num14 = new EmergencyNumber(
+ "911",
+ "us",
+ "",
+ 0b111,
+ new ArrayList<String>(),
+ 0b10000,
+ 0);
+
+ inputNumberList.add(num1);
+ inputNumberList.add(num12);
+ inputNumberList.add(num3);
+ inputNumberList.add(num4);
+ inputNumberList.add(num13);
+ inputNumberList.add(num6);
+ inputNumberList.add(num31);
+ inputNumberList.add(num14);
+ EmergencyNumber.mergeSameNumbersInEmergencyNumberList(inputNumberList);
+
+ outputNumberList.add(num1);
+ outputNumberList.add(num3);
+ outputNumberList.add(num4);
+ outputNumberList.add(num6);
+ Collections.sort(outputNumberList);
+
+ assertEquals(outputNumberList, inputNumberList);
}
}