1 files changed, 14 insertions, 10 deletions
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java
index c1c53191..a1d30c57 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java
@@ -16,29 +16,33 @@
 
 package com.google.i18n.phonenumbers;
 
-import junit.framework.TestCase;
-
 /**
  * Unit tests for MultiFileMetadataSourceImpl.java.
  */
-public class MultiFileMetadataSourceImplTest extends TestCase {
-  public MultiFileMetadataSourceImplTest() {}
+public class MultiFileMetadataSourceImplTest extends TestMetadataTestCase  {
+
+  private final MultiFileMetadataSourceImpl multiFileMetadataSource;
+
+  public MultiFileMetadataSourceImplTest() {
+    multiFileMetadataSource = new MultiFileMetadataSourceImpl(TEST_META_DATA_FILE_PREFIX,
+        PhoneNumberUtil.DEFAULT_METADATA_LOADER);
+  }
 
   public void testMissingMetadataFileThrowsRuntimeException() {
-    MultiFileMetadataSourceImpl multiFileMetadataSource = new MultiFileMetadataSourceImpl(
-        "no/such/file", PhoneNumberUtil.DEFAULT_METADATA_LOADER);
     // In normal usage we should never get a state where we are asking to load metadata that doesn't
     // exist. However if the library is packaged incorrectly in the jar, this could happen and the
     // best we can do is make sure the exception has the file name in it.
     try {
-      multiFileMetadataSource.loadMetadataFromFile("XX", -1);
+      multiFileMetadataSource.loadMetadataFromFile(
+          "no/such/file", "XX", -1, PhoneNumberUtil.DEFAULT_METADATA_LOADER);
       fail("expected exception");
     } catch (RuntimeException e) {
-      assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_XX"));
+      assertTrue("Unexpected error: " + e, e.toString().contains("no/such/file_XX"));
     }
     try {
-      multiFileMetadataSource.loadMetadataFromFile(
-          PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123);
+      multiFileMetadataSource.loadMetadataFromFile("no/such/file",
+          PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123,
+          PhoneNumberUtil.DEFAULT_METADATA_LOADER);
       fail("expected exception");
     } catch (RuntimeException e) {
       assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_123"));