From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com>
Date: Wed, 18 Mar 2020 17:57:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'younies/units_router' into wip_younies_units_router_res... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db2ae78944a5d025c54b16bc12fd76d5c8afbb73;p=icu

Merge remote-tracking branch 'younies/units_router' into wip_younies_units_router_resources
---

db2ae78944a5d025c54b16bc12fd76d5c8afbb73
diff --cc icu4c/source/test/intltest/unitstest.cpp
index b37dad48f16,901beae69bc..93d3aa009d9
--- a/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);