Deserialize unit tests 5722 (#5724)

* RailwayConflate tests don't need to be serial * Railway cases aren't serial, can be run in parallel * Make libphonenumber based classes thread safe and move the unit tests out of 'serial' * Copyright
ngageoint · Nov 4, 2023 · a01b19b · a01b19b
1 parent aac960e
commit a01b19b
Show file tree

Hide file tree

Showing 64 changed files with 1,786 additions and 123 deletions.
diff --git a/.../test/cpp/hoot/core/algorithms/extractors/poi-polygon/PoiPolygonDistanceExtractorTest.cpp b/.../test/cpp/hoot/core/algorithms/extractors/poi-polygon/PoiPolygonDistanceExtractorTest.cpp
@@ -22,18 +22,18 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020, 2021 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2015-2023 Maxar (http://www.maxar.com/)
  */
 
 // Hoot
-#include <hoot/core/elements/OsmMap.h>
 #include <hoot/core/TestUtils.h>
 #include <hoot/core/algorithms/extractors/poi-polygon/PoiPolygonDistanceExtractor.h>
+#include <hoot/core/conflate/poi-polygon/PoiPolygonInfoCache.h>
+#include <hoot/core/elements/MapProjector.h>
+#include <hoot/core/elements/OsmMap.h>
 #include <hoot/core/elements/Way.h>
 #include <hoot/core/io/OsmXmlReader.h>
 #include <hoot/core/io/OsmXmlWriter.h>
-#include <hoot/core/elements/MapProjector.h>
-#include <hoot/core/conflate/poi-polygon/PoiPolygonInfoCache.h>
 
 using namespace geos::geom;
 

diff --git a/...p/hoot/core/algorithms/extractors/poi-polygon/PoiPolygonPhoneNumberScoreExtractorTest.cpp b/...p/hoot/core/algorithms/extractors/poi-polygon/PoiPolygonPhoneNumberScoreExtractorTest.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019, 2021 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2018-2023 Maxar (http://www.maxar.com/)
  */
 
 // Hoot
@@ -53,8 +53,7 @@ class PoiPolygonPhoneNumberScoreExtractorTest : public HootTestFixture
     PoiPolygonPhoneNumberScoreExtractor uut;
     OsmMapPtr map = std::make_shared<OsmMap>();
 
-    NodePtr node1 =
-      std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
+    NodePtr node1 = std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
     WayPtr way1 = std::make_shared<Way>(Status::Unknown2, -1, 15.0);
 
     node1->getTags().set("phone", "(123) 456 7890");
@@ -67,8 +66,7 @@ class PoiPolygonPhoneNumberScoreExtractorTest : public HootTestFixture
     PoiPolygonPhoneNumberScoreExtractor uut;
     OsmMapPtr map = std::make_shared<OsmMap>();
 
-    NodePtr node1 =
-      std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
+    NodePtr node1 = std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
     WayPtr way1 = std::make_shared<Way>(Status::Unknown2, -1, 15.0);
 
     node1->getTags().set("phone", "(123) 456 7890");
@@ -90,8 +88,7 @@ class PoiPolygonPhoneNumberScoreExtractorTest : public HootTestFixture
     PoiPolygonPhoneNumberScoreExtractor uut;
     OsmMapPtr map = std::make_shared<OsmMap>();
 
-    NodePtr node1 =
-      std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
+    NodePtr node1 = std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
     WayPtr way1 = std::make_shared<Way>(Status::Unknown2, -1, 15.0);
 
     node1->getTags().set("phone", "blah");
@@ -104,8 +101,7 @@ class PoiPolygonPhoneNumberScoreExtractorTest : public HootTestFixture
     PoiPolygonPhoneNumberScoreExtractor uut;
     OsmMapPtr map = std::make_shared<OsmMap>();
 
-    NodePtr node1 =
-      std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
+    NodePtr node1 = std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
     WayPtr way1 = std::make_shared<Way>(Status::Unknown2, -1, 15.0);
 
     node1->getTags().set("source:phone", "(123) 456 7890");
@@ -133,8 +129,7 @@ class PoiPolygonPhoneNumberScoreExtractorTest : public HootTestFixture
     PoiPolygonPhoneNumberScoreExtractor uut;
     OsmMapPtr map = std::make_shared<OsmMap>();
 
-    NodePtr node1 =
-      std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
+    NodePtr node1 = std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
     WayPtr way1 = std::make_shared<Way>(Status::Unknown2, -1, 15.0);
 
     node1->getTags().set("note", "(123) 456 7890");
@@ -152,13 +147,10 @@ class PoiPolygonPhoneNumberScoreExtractorTest : public HootTestFixture
     PoiPolygonPhoneNumberScoreExtractor uut;
     OsmMapPtr map = std::make_shared<OsmMap>();
 
-    NodePtr node1 =
-      std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
+    NodePtr node1 = std::make_shared<Node>(Status::Unknown1, -1, geos::geom::Coordinate(0.0, 0.0), 15.0);
     WayPtr way1 = std::make_shared<Way>(Status::Unknown2, -1, 15.0);
 
-    node1->getTags().set(
-      "phone",
-      "this is some text with a phone number: (123) 456 7890; and here's another one: 123 456 7890");
+    node1->getTags().set("phone", "this is some text with a phone number: (123) 456 7890; and here's another one: 123 456 7890");
     way1->getTags().set("phone", "123 456 7890");
 
     uut._phoneNumberParser.setRegionCode("US");

diff --git a/hoot-core-test/src/test/cpp/hoot/core/visitors/NormalizePhoneNumbersVisitorTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/visitors/NormalizePhoneNumbersVisitorTest.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019, 2021 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2018-2023 Maxar (http://www.maxar.com/)
  */
 
 // hoot
@@ -34,6 +34,7 @@
 
 // libphonenumber
 #include <phonenumbers/phonenumberutil.h>
+
 using namespace i18n::phonenumbers;
 
 namespace hoot
@@ -51,10 +52,9 @@ class NormalizePhoneNumbersVisitorTest : public HootTestFixture
 
 public:
 
-  NormalizePhoneNumbersVisitorTest() :
-  HootTestFixture(
-    "test-files/visitors/NormalizePhoneNumbersVisitorTest/",
-    "test-output/visitors/NormalizePhoneNumbersVisitorTest/")
+  NormalizePhoneNumbersVisitorTest()
+    : HootTestFixture("test-files/visitors/NormalizePhoneNumbersVisitorTest/",
+                      "test-output/visitors/NormalizePhoneNumbersVisitorTest/")
   {
   }
 
@@ -109,24 +109,19 @@ class NormalizePhoneNumbersVisitorTest : public HootTestFixture
     NormalizePhoneNumbersVisitor uut;
 
     uut._phoneNumberNormalizer.setFormat("E164");
-    CPPUNIT_ASSERT_EQUAL(
-      PhoneNumberUtil::PhoneNumberFormat::E164, uut._phoneNumberNormalizer._format);
+    CPPUNIT_ASSERT_EQUAL(PhoneNumberUtil::PhoneNumberFormat::E164, uut._phoneNumberNormalizer._format);
 
     uut._phoneNumberNormalizer.setFormat("INTERNATIONAL");
-    CPPUNIT_ASSERT_EQUAL(
-      PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL, uut._phoneNumberNormalizer._format);
+    CPPUNIT_ASSERT_EQUAL(PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL, uut._phoneNumberNormalizer._format);
 
     uut._phoneNumberNormalizer.setFormat("NATIONAL");
-    CPPUNIT_ASSERT_EQUAL(
-      PhoneNumberUtil::PhoneNumberFormat::NATIONAL, uut._phoneNumberNormalizer._format);
+    CPPUNIT_ASSERT_EQUAL(PhoneNumberUtil::PhoneNumberFormat::NATIONAL, uut._phoneNumberNormalizer._format);
 
     uut._phoneNumberNormalizer.setFormat("RFC3966");
-    CPPUNIT_ASSERT_EQUAL(
-      PhoneNumberUtil::PhoneNumberFormat::RFC3966, uut._phoneNumberNormalizer._format);
+    CPPUNIT_ASSERT_EQUAL(PhoneNumberUtil::PhoneNumberFormat::RFC3966, uut._phoneNumberNormalizer._format);
 
     uut._phoneNumberNormalizer.setFormat("rfc3966");
-    CPPUNIT_ASSERT_EQUAL(
-      PhoneNumberUtil::PhoneNumberFormat::RFC3966, uut._phoneNumberNormalizer._format);
+    CPPUNIT_ASSERT_EQUAL(PhoneNumberUtil::PhoneNumberFormat::RFC3966, uut._phoneNumberNormalizer._format);
 
     QString exceptionMsg;
     try
@@ -137,8 +132,7 @@ class NormalizePhoneNumbersVisitorTest : public HootTestFixture
     {
       exceptionMsg = e.what();
     }
-    CPPUNIT_ASSERT_EQUAL(
-      QString("Invalid phone number format: blah").toStdString(), exceptionMsg.toStdString());
+    CPPUNIT_ASSERT_EQUAL(QString("Invalid phone number format: blah").toStdString(), exceptionMsg.toStdString());
   }
 
   void runInvalidRegionCodeTest()
@@ -156,9 +150,7 @@ class NormalizePhoneNumbersVisitorTest : public HootTestFixture
     {
       exceptionMsg = e.what();
     }
-    CPPUNIT_ASSERT_EQUAL(
-      QString("Empty phone number region code.").toStdString(),
-      exceptionMsg.toStdString());
+    CPPUNIT_ASSERT_EQUAL(QString("Empty phone number region code.").toStdString(), exceptionMsg.toStdString());
 
     try
     {
@@ -168,9 +160,7 @@ class NormalizePhoneNumbersVisitorTest : public HootTestFixture
     {
       exceptionMsg = e.what();
     }
-    CPPUNIT_ASSERT_EQUAL(
-      QString("Invalid phone number region code: BLAH").toStdString(),
-      exceptionMsg.toStdString());
+    CPPUNIT_ASSERT_EQUAL(QString("Invalid phone number region code: BLAH").toStdString(), exceptionMsg.toStdString());
   }
 
   void runConfigureTest()
@@ -203,5 +193,3 @@ class NormalizePhoneNumbersVisitorTest : public HootTestFixture
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(NormalizePhoneNumbersVisitorTest, "quick");
 
 }
-
-
diff --git a/hoot-core-test/src/test/cpp/hoot/core/visitors/PhoneNumberCountVisitorTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/visitors/PhoneNumberCountVisitorTest.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019, 2021 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2018-2023 Maxar (http://www.maxar.com/)
  */
 
 // hoot
@@ -43,8 +43,8 @@ class PhoneNumberCountVisitorTest : public HootTestFixture
 
 public:
 
-  PhoneNumberCountVisitorTest() :
-  HootTestFixture("test-files/cmd/glacial/PoiPolygonConflateStandaloneTest/", UNUSED_PATH)
+  PhoneNumberCountVisitorTest()
+    : HootTestFixture("test-files/cmd/glacial/PoiPolygonConflateStandaloneTest/", UNUSED_PATH)
   {
   }
 
@@ -69,7 +69,7 @@ class PhoneNumberCountVisitorTest : public HootTestFixture
     settings.set(ConfigOptions::getPhoneNumberRegionCodeKey(), "US");
     settings.set(ConfigOptions::getPhoneNumberAdditionalTagKeysKey(), QStringList());
     settings.set(ConfigOptions::getPhoneNumberSearchInTextKey(), false);
-    uut.setConfiguration(/*conf()*/settings);
+    uut.setConfiguration(settings);
 
     map->visitRo(uut);
 
@@ -80,5 +80,3 @@ class PhoneNumberCountVisitorTest : public HootTestFixture
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PhoneNumberCountVisitorTest, "quick");
 
 }
-
-
diff --git a/hoot-core-test/src/test/cpp/hoot/core/visitors/PhoneNumberLocateVisitorTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/visitors/PhoneNumberLocateVisitorTest.cpp
@@ -22,12 +22,12 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019, 2021 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2018-2023 Maxar (http://www.maxar.com/)
  */
 
 // hoot
-#include <hoot/core/elements/OsmMap.h>
 #include <hoot/core/TestUtils.h>
+#include <hoot/core/elements/OsmMap.h>
 #include <hoot/core/io/OsmMapReaderFactory.h>
 #include <hoot/core/io/OsmMapWriterFactory.h>
 #include <hoot/core/visitors/PhoneNumberLocateVisitor.h>
@@ -46,59 +46,49 @@ class PhoneNumberLocateVisitorTest : public HootTestFixture
 
 public:
 
-  PhoneNumberLocateVisitorTest() :
-  HootTestFixture(
-    "test-files/visitors/PhoneNumberLocateVisitorTest/",
-    "test-output/visitors/PhoneNumberLocateVisitorTest/")
+  PhoneNumberLocateVisitorTest()
+    : HootTestFixture("test-files/visitors/PhoneNumberLocateVisitorTest/",
+                      "test-output/visitors/PhoneNumberLocateVisitorTest/")
   {
     setResetType(ResetEnvironment);
   }
 
   void runBasicTest()
   {
     OsmMapPtr map = std::make_shared<OsmMap>();
-    OsmMapReaderFactory::read(
-      map,
-      "test-files/cmd/glacial/PoiPolygonConflateStandaloneTest/PoiPolygon2.osm",
-      false,
-      Status::Unknown1);
+    OsmMapReaderFactory::read(map, _inputPath + "BasicTest.osm", false, Status::Unknown1);
 
     PhoneNumberLocateVisitor uut;
     uut._phoneNumberLocator.setRegionCode("US");
     map->visitRw(uut);
 
-    const QString outputFile = _outputPath + "out.osm";
+    const QString outputFile = _outputPath + "BasicTestOutput.osm";
     OsmMapWriterFactory::write(map, outputFile);
 
     CPPUNIT_ASSERT_EQUAL(12, uut._phoneNumberLocator.getNumLocated());
-    HOOT_FILE_EQUALS(_inputPath + "gold.osm", outputFile);
+    HOOT_FILE_EQUALS(_inputPath + "BasicTestExpected.osm", outputFile);
   }
 
   void runConfigurationTest()
   {
     OsmMapPtr map = std::make_shared<OsmMap>();
-    OsmMapReaderFactory::read(
-      map,
-      "test-files/cmd/glacial/PoiPolygonConflateStandaloneTest/PoiPolygon2.osm",
-      false,
-      Status::Unknown1);
+    OsmMapReaderFactory::read(map, _inputPath + "ConfigTest.osm", false, Status::Unknown1);
 
     PhoneNumberLocateVisitor uut;
     Settings settings;
     settings.set(ConfigOptions::getPhoneNumberRegionCodeKey(), "US");
     uut.setConfiguration(settings);
     map->visitRw(uut);
 
-    const QString outputFile = _outputPath + "out.osm";
+    const QString outputFile = _outputPath + "ConfigTestOutput.osm";
     OsmMapWriterFactory::write(map, outputFile);
 
     CPPUNIT_ASSERT_EQUAL(12, uut._phoneNumberLocator.getNumLocated());
-    HOOT_FILE_EQUALS(_inputPath + "gold.osm", outputFile);
+    HOOT_FILE_EQUALS(_inputPath + "ConfigTestExpected.osm", outputFile);
   }
 };
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PhoneNumberLocateVisitorTest, "quick");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PhoneNumberLocateVisitorTest, "serial");
 
 }
 

diff --git a/...n/cpp/hoot/core/algorithms/extractors/poi-polygon/PoiPolygonPhoneNumberScoreExtractor.cpp b/...n/cpp/hoot/core/algorithms/extractors/poi-polygon/PoiPolygonPhoneNumberScoreExtractor.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019, 2021, 2022 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2018-2023 Maxar (http://www.maxar.com/)
  */
 
 #include "PoiPolygonPhoneNumberScoreExtractor.h"
@@ -72,9 +72,8 @@ double PoiPolygonPhoneNumberScoreExtractor::extract(const OsmMap& /*map*/,
     for (const auto& polyNumber : qAsConst(polyPhoneNumbers))
     {
       _matchAttemptMade = true;
-      PhoneNumberUtil::MatchType numberMatchType =
-        PhoneNumberUtil::GetInstance()->IsNumberMatchWithTwoStrings(
-          poiNumber.tagValue.toStdString(), polyNumber.tagValue.toStdString());
+      std::lock_guard<std::mutex> libphonenumber_lock(getPhoneNumberMutex());
+      PhoneNumberUtil::MatchType numberMatchType = PhoneNumberUtil::GetInstance()->IsNumberMatchWithTwoStrings(poiNumber.tagValue.toStdString(), polyNumber.tagValue.toStdString());
       LOG_VART(numberMatchType);
       if (numberMatchType > PhoneNumberUtil::MatchType::NO_MATCH)
       {

diff --git a/...ain/cpp/hoot/core/algorithms/extractors/poi-polygon/PoiPolygonPhoneNumberScoreExtractor.h b/...ain/cpp/hoot/core/algorithms/extractors/poi-polygon/PoiPolygonPhoneNumberScoreExtractor.h
@@ -22,16 +22,17 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019, 2020, 2021, 2022 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2018-2023 Maxar (http://www.maxar.com/)
  */
 
 #ifndef POIPOLYGONPHONENUMBERSCOREEXTRACTOR_H
 #define POIPOLYGONPHONENUMBERSCOREEXTRACTOR_H
 
 // hoot
 #include <hoot/core/algorithms/extractors/FeatureExtractorBase.h>
-#include <hoot/core/util/Configurable.h>
+#include <hoot/core/conflate/phone/PhoneNumberBase.h>
 #include <hoot/core/conflate/phone/PhoneNumberParser.h>
+#include <hoot/core/util/Configurable.h>
 
 namespace hoot
 {
@@ -42,7 +43,7 @@ class OsmMap;
  * @brief The PoiPolygonPhoneNumberScoreExtractor class scores phone number similarity between
  * features for POI to Polygon conflation.
  */
-class PoiPolygonPhoneNumberScoreExtractor : public FeatureExtractorBase, public Configurable
+class PoiPolygonPhoneNumberScoreExtractor : public PhoneNumberBase, public FeatureExtractorBase, public Configurable
 {
 public: