tensorflow · codesue · Dec 16, 2022 · Dec 3, 2022
diff --git a/model_card_toolkit/model_card_test.py b/model_card_toolkit/model_card_test.py
@@ -27,11 +27,11 @@
 _FULL_PROTO_FILE_NAME = "full.pbtxt"
 _FULL_PROTO = pkgutil.get_data(
     "model_card_toolkit",
-    os.path.join("template/test", _FULL_PROTO_FILE_NAME))
+    os.path.join("utils", "testdata", _FULL_PROTO_FILE_NAME))
 _FULL_JSON_FILE_PATH = "full.json"
 _FULL_JSON = model_card_json_bytestring = pkgutil.get_data(
     "model_card_toolkit",
-    os.path.join("template/test", _FULL_JSON_FILE_PATH))
+    os.path.join("utils", "testdata", _FULL_JSON_FILE_PATH))
 
 
 class ModelCardTest(absltest.TestCase):

diff --git a/model_card_toolkit/template/html/test/cats_vs_dogs.html b/model_card_toolkit/template/html/test/cats_vs_dogs.html
diff --git a/model_card_toolkit/template/html/test/considerations.html b/model_card_toolkit/template/html/test/considerations.html
diff --git a/model_card_toolkit/template/html/test/train_data.html b/model_card_toolkit/template/html/test/train_data.html
diff --git a/model_card_toolkit/template/md/test/cats_vs_dogs.md b/model_card_toolkit/template/md/test/cats_vs_dogs.md
diff --git a/model_card_toolkit/template/md/test/considerations.md b/model_card_toolkit/template/md/test/considerations.md
diff --git a/model_card_toolkit/template/md/test/train_data.md b/model_card_toolkit/template/md/test/train_data.md
diff --git a/model_card_toolkit/utils/json_util_test.py b/model_card_toolkit/utils/json_util_test.py
@@ -7,12 +7,12 @@
 import jsonschema
 from model_card_toolkit.utils import json_util
 
-_CATS_VS_DOGS_V1_PATH = os.path.join("utils", "testdata", "cats_vs_dogs.json")
+_CATS_VS_DOGS_V1_PATH = os.path.join("utils", "testdata", "cats_vs_dogs_v0_0_1.json")
 _CATS_VS_DOGS_V1_TEXT = pkgutil.get_data("model_card_toolkit",
                                          _CATS_VS_DOGS_V1_PATH)
 _CATS_VS_DOGS_V1_DICT = json.loads(_CATS_VS_DOGS_V1_TEXT)
 
-_CATS_VS_DOGS_V2_PATH = os.path.join("template", "test", "cats_vs_dogs.json")
+_CATS_VS_DOGS_V2_PATH = os.path.join("utils", "testdata", "cats_vs_dogs_v0_0_2.json")
 _CATS_VS_DOGS_V2_TEXT = pkgutil.get_data("model_card_toolkit",
                                          _CATS_VS_DOGS_V2_PATH)
 _CATS_VS_DOGS_V2_DICT = json.loads(_CATS_VS_DOGS_V2_TEXT)

diff --git a/..._toolkit/utils/testdata/cats_vs_dogs.json → ...t/utils/testdata/cats_vs_dogs_v0_0_1.json b/..._toolkit/utils/testdata/cats_vs_dogs.json → ...t/utils/testdata/cats_vs_dogs_v0_0_1.json
diff --git a/...d_toolkit/template/test/cats_vs_dogs.json → ...t/utils/testdata/cats_vs_dogs_v0_0_2.json b/...d_toolkit/template/test/cats_vs_dogs.json → ...t/utils/testdata/cats_vs_dogs_v0_0_2.json
diff --git a/...toolkit/template/test/considerations.json → ...oolkit/utils/testdata/considerations.json b/...toolkit/template/test/considerations.json → ...oolkit/utils/testdata/considerations.json
diff --git a/model_card_toolkit/template/test/full.json → model_card_toolkit/utils/testdata/full.json b/model_card_toolkit/template/test/full.json → model_card_toolkit/utils/testdata/full.json
diff --git a/model_card_toolkit/template/test/full.pbtxt → model_card_toolkit/utils/testdata/full.pbtxt b/model_card_toolkit/template/test/full.pbtxt → model_card_toolkit/utils/testdata/full.pbtxt
diff --git a/...ard_toolkit/template/test/train_data.json → ...rd_toolkit/utils/testdata/train_data.json b/...ard_toolkit/template/test/train_data.json → ...rd_toolkit/utils/testdata/train_data.json
diff --git a/model_card_toolkit/utils/validation_test.py b/model_card_toolkit/utils/validation_test.py
@@ -192,10 +192,10 @@ def test_validate_json_schema_invalid_version(self):
 
   @parameterized.named_parameters(("train_data", "train_data.json"),
                                   ("considerations", "considerations.json"),
-                                  ("cats_vs_dogs", "cats_vs_dogs.json"),
+                                  ("cats_vs_dogs", "cats_vs_dogs_v0_0_2.json"),
                                   ("full", "full.json"))
   def test_template_test_files(self, file_name):
-    template_path = os.path.join("template", "test", file_name)
+    template_path = os.path.join("utils", "testdata", file_name)
     json_data = json.loads(
         pkgutil.get_data("model_card_toolkit", template_path))
     validation.validate_json_schema(json_data)