From 4b65742a3fb093e1c2a208d1cc1ef8e0d1b126d5 Mon Sep 17 00:00:00 2001
From: penmetsaa <penmetsaa@google.com>
Date: Wed, 21 Nov 2018 12:14:07 +0530
Subject: [PATCH] Fixing brittle unit test of checking example short number.
 (#2284)

* Fixing brittle unit test of checking example short number

* Making same changes in CPP and Java
---
 cpp/test/phonenumbers/shortnumberinfo_test.cc | 23 ++++---------------
 .../phonenumbers/ShortNumberInfoTest.java     | 21 ++++-------------
 .../i18n/phonenumbers/shortnumberinfo_test.js | 17 +++-----------
 3 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/cpp/test/phonenumbers/shortnumberinfo_test.cc b/cpp/test/phonenumbers/shortnumberinfo_test.cc
index 0f70eb9f3..fc7dc3a1d 100644
--- a/cpp/test/phonenumbers/shortnumberinfo_test.cc
+++ b/cpp/test/phonenumbers/shortnumberinfo_test.cc
@@ -299,24 +299,11 @@ TEST_F(ShortNumberInfoTest, GetExpectedCostForSharedCountryCallingCode) {
 }
 
 TEST_F(ShortNumberInfoTest, GetExampleShortNumber) {
-  EXPECT_EQ("110", short_info_.GetExampleShortNumber(RegionCode::AD()));
-  EXPECT_EQ("1010", short_info_.GetExampleShortNumber(RegionCode::FR()));
-  EXPECT_EQ("", short_info_.GetExampleShortNumber(RegionCode::UN001()));
-  EXPECT_EQ("", short_info_.GetExampleShortNumber(RegionCode::GetUnknown()));
-}
-
-TEST_F(ShortNumberInfoTest, GetExampleShortNumberForCost) {
-  EXPECT_EQ("3010",
-      short_info_.GetExampleShortNumberForCost(RegionCode::FR(),
-      ShortNumberInfo::TOLL_FREE));
-  EXPECT_EQ("1023",
-      short_info_.GetExampleShortNumberForCost(RegionCode::FR(),
-      ShortNumberInfo::STANDARD_RATE));
-  EXPECT_EQ("42000",
-      short_info_.GetExampleShortNumberForCost(RegionCode::FR(),
-      ShortNumberInfo::PREMIUM_RATE));
-  EXPECT_EQ("", short_info_.GetExampleShortNumberForCost(RegionCode::FR(),
-      ShortNumberInfo::UNKNOWN_COST));
+  EXPECT_FALSE(short_info_.GetExampleShortNumber(RegionCode::AD()).empty());
+  EXPECT_FALSE(short_info_.GetExampleShortNumber(RegionCode::FR()).empty());
+  EXPECT_TRUE(short_info_.GetExampleShortNumber(RegionCode::UN001()).empty());
+  EXPECT_TRUE(
+      short_info_.GetExampleShortNumber(RegionCode::GetUnknown()).empty());
 }
 
 TEST_F(ShortNumberInfoTest, ConnectsToEmergencyNumber_US) {
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java
index f76c6842b..b83a680cf 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java
@@ -194,22 +194,11 @@ public class ShortNumberInfoTest extends TestMetadataTestCase {
         shortInfo.getExpectedCost(ambiguousTollFreeNumber));
   }
 
-  public void testGetExampleShortNumber() {
-    assertEquals("110", shortInfo.getExampleShortNumber(RegionCode.AD));
-    assertEquals("1010", shortInfo.getExampleShortNumber(RegionCode.FR));
-    assertEquals("", shortInfo.getExampleShortNumber(RegionCode.UN001));
-    assertEquals("", shortInfo.getExampleShortNumber(null));
-  }
-
-  public void testGetExampleShortNumberForCost() {
-    assertEquals("3010", shortInfo.getExampleShortNumberForCost(RegionCode.FR,
-        ShortNumberInfo.ShortNumberCost.TOLL_FREE));
-    assertEquals("1023", shortInfo.getExampleShortNumberForCost(RegionCode.FR,
-        ShortNumberInfo.ShortNumberCost.STANDARD_RATE));
-    assertEquals("42000", shortInfo.getExampleShortNumberForCost(RegionCode.FR,
-        ShortNumberInfo.ShortNumberCost.PREMIUM_RATE));
-    assertEquals("", shortInfo.getExampleShortNumberForCost(RegionCode.FR,
-        ShortNumberInfo.ShortNumberCost.UNKNOWN_COST));
+  public void testExampleShortNumberPresence() {
+    assertFalse(shortInfo.getExampleShortNumber(RegionCode.AD).isEmpty());
+    assertFalse(shortInfo.getExampleShortNumber(RegionCode.FR).isEmpty());
+    assertTrue(shortInfo.getExampleShortNumber(RegionCode.UN001).isEmpty());
+    assertTrue(shortInfo.getExampleShortNumber(null).isEmpty());
   }
 
   public void testConnectsToEmergencyNumber_US() {
diff --git a/javascript/i18n/phonenumbers/shortnumberinfo_test.js b/javascript/i18n/phonenumbers/shortnumberinfo_test.js
index 146b5a982..445dfc926 100644
--- a/javascript/i18n/phonenumbers/shortnumberinfo_test.js
+++ b/javascript/i18n/phonenumbers/shortnumberinfo_test.js
@@ -270,24 +270,13 @@ function testGetExpectedCostForSharedCountryCallingCode() {
       shortInfo.getExpectedCost(ambiguousTollFreeNumber));
 }
 
-function testGetExampleShortNumber() {
-  assertEquals('110', shortInfo.getExampleShortNumber(RegionCode.AD));
-  assertEquals('1010', shortInfo.getExampleShortNumber(RegionCode.FR));
+function testExampleShortNumberPresence() {
+  assertNonEmptyString(shortInfo.getExampleShortNumber(RegionCode.AD));
+  assertNonEmptyString(shortInfo.getExampleShortNumber(RegionCode.FR));
   assertEquals('', shortInfo.getExampleShortNumber(RegionCode.UN001));
   assertEquals('', shortInfo.getExampleShortNumber(null));
 }
 
-function testGetExampleShortNumberForCost() {
-  assertEquals('3010', shortInfo.getExampleShortNumberForCost(RegionCode.FR,
-      i18n.phonenumbers.ShortNumberInfo.ShortNumberCost.TOLL_FREE));
-  assertEquals('1023', shortInfo.getExampleShortNumberForCost(RegionCode.FR,
-      i18n.phonenumbers.ShortNumberInfo.ShortNumberCost.STANDARD_RATE));
-  assertEquals('42000', shortInfo.getExampleShortNumberForCost(RegionCode.FR,
-      i18n.phonenumbers.ShortNumberInfo.ShortNumberCost.PREMIUM_RATE));
-  assertEquals('', shortInfo.getExampleShortNumberForCost(RegionCode.FR,
-      i18n.phonenumbers.ShortNumberInfo.ShortNumberCost.UNKNOWN_COST));
-}
-
 function testConnectsToEmergencyNumber_US() {
   assertTrue(shortInfo.connectsToEmergencyNumber('911', RegionCode.US));
   assertTrue(shortInfo.connectsToEmergencyNumber('112', RegionCode.US));