Merge remote-tracking branch 'younies/units_router' into wip_younies_units_router_res...

diff --cc icu4c/source/test/intltest/unitstest.cpp
index b37dad48f16f6d6f2982ff99ad4d852296d9bc9a,901beae69bc93485e406df0b677d297b6eecf08c..93d3aa009d95ef9bc0313195a34781f404795429
--- 1/icu4c/source/test/intltest/unitstest.cpp
--- 2/icu4c/source/test/intltest/unitstest.cpp
+++ b/icu4c/source/test/intltest/unitstest.cpp
@@@ -28,6 -34,6 +37,10 @@@ class UnitsTest : public IntlTest 
  
      void testConversions();
      void testPreferences();
++    void testUSVolumeResourceLoading();
++    void testSIMassResourceLoading();
++    void testGetUnitsData();
++
      void testBasic();
      void testSiPrefixes();
      void testMass();
@@@ -47,6 -56,6 +63,10 @@@ void UnitsTest::runIndexedTest(int32_t 
      TESTCASE_AUTO_BEGIN;
      TESTCASE_AUTO(testConversions);
      TESTCASE_AUTO(testPreferences);
++    TESTCASE_AUTO(testUSVolumeResourceLoading);
++    TESTCASE_AUTO(testSIMassResourceLoading);
++    TESTCASE_AUTO(testGetUnitsData);
++
      TESTCASE_AUTO(testBasic);
      TESTCASE_AUTO(testSiPrefixes);
      TESTCASE_AUTO(testMass);