C++: Updated Geocoder documentation and tests

diff --git a/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h b/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h
index 243404c..8022b77 100644 (file)
--- a/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h
+++ b/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h
@@ -99,6 +99,7 @@ class PhoneNumberOfflineGeocoder {
                                  const Locale& locale) const;
 
   // As per GetDescriptionForValidNumber(PhoneNumber, Locale, String) but
+  // explicitly checks the validity of the number passed in.
   string GetDescriptionForNumber(const PhoneNumber& number,
       const Locale& language, const string& user_region) const;
 

diff --git a/cpp/test/phonenumbers/geocoding/geocoding_test_program.cc b/cpp/test/phonenumbers/geocoding/geocoding_test_program.cc
index dec55a4..63b2b7a 100644 (file)
--- a/cpp/test/phonenumbers/geocoding/geocoding_test_program.cc
+++ b/cpp/test/phonenumbers/geocoding/geocoding_test_program.cc
@@ -15,10 +15,10 @@
 // Sample program using the geocoding functionality. This is used to test that
 // the geocoding library is compiled correctly.
 
-#include <cassert>
 #include <iostream>
 #include <string>
 
+#include "phonenumbers/base/logging.h"
 #include "phonenumbers/geocoding/phonenumber_offline_geocoder.h"
 #include "phonenumbers/phonenumber.pb.h"
 #include "phonenumbers/phonenumberutil.h"
@@ -32,12 +32,12 @@ int main() {
   const PhoneNumberUtil& phone_util = *PhoneNumberUtil::GetInstance();
   const PhoneNumberUtil::ErrorType status = phone_util.Parse(
       "16502530000", "US", &number);
-  assert(status == PhoneNumberUtil::NO_PARSING_ERROR);
+  CHECK_EQ(status, PhoneNumberUtil::NO_PARSING_ERROR);
 
   const std::string description =
       PhoneNumberOfflineGeocoder().GetDescriptionForNumber(
           number, icu::Locale("en", "GB"));
   std::cout << description << std::endl;
-  assert(description == "Mountain View, CA");
+  CHECK_EQ(description, "Mountain View, CA");
   return 0;
 }

diff --git a/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc b/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc
index efeea36..c2e1295 100644 (file)
--- a/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc
+++ b/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc
@@ -190,7 +190,8 @@ TEST_F(PhoneNumberOfflineGeocoderTest,
   // Invalid number - return an empty string.
   EXPECT_EQ("",
             geocoder_->GetDescriptionForNumber(US_INVALID_NUMBER,
-                                               kEnglishLocale, "US"));
+                                               kEnglishLocale,
+                                               "US"));
 }
 
 TEST_F(PhoneNumberOfflineGeocoderTest, TestGetDescriptionForInvalidNumber) {