Renames testdata/{r4,stu3}/google/ to testdata/{r4,stu3}/extensions s…

…ince all the testdata are extensions. Deletes existing, unused data in testdata/stu3/extensions PiperOrigin-RevId: 339354965
google · Oct 28, 2020 · a56ab2d · a56ab2d
1 parent 2b8b016
commit a56ab2d
Show file tree

Hide file tree

Showing 400 changed files with 20 additions and 103,697 deletions.
diff --git a/cc/google/fhir/BUILD b/cc/google/fhir/BUILD
@@ -35,7 +35,6 @@ cc_test(
     srcs = ["codes_test.cc"],
     data = [
         "//testdata/r4/codes:testdata",
-        "//testdata/stu3:google",
     ],
     deps = [
         ":codes",

diff --git a/cc/google/fhir/r4/BUILD b/cc/google/fhir/r4/BUILD
@@ -102,7 +102,7 @@ cc_test(
     name = "extensions_test",
     srcs = ["extensions_test.cc"],
     data = [
-        "//testdata/r4:google",
+        "//testdata/r4:extensions",
     ],
     deps = [
         ":extensions",

diff --git a/cc/google/fhir/r4/extensions_test.cc b/cc/google/fhir/r4/extensions_test.cc
@@ -48,9 +48,10 @@ using testing::DigitalMediaType;
 
 template <class T>
 void ReadR4TestData(const std::string& type, T* message, Extension* extension) {
-  *message = ReadR4Proto<T>(absl::StrCat("google/", type, ".message.prototxt"));
+  *message =
+      ReadR4Proto<T>(absl::StrCat("extensions/", type, ".message.prototxt"));
   *extension = ReadR4Proto<Extension>(
-      absl::StrCat("google/", type, ".extension.prototxt"));
+      absl::StrCat("extensions/", type, ".extension.prototxt"));
 }
 
 template <class T>

diff --git a/cc/google/fhir/stu3/BUILD b/cc/google/fhir/stu3/BUILD
@@ -98,7 +98,7 @@ cc_test(
     name = "extensions_test",
     srcs = ["extensions_test.cc"],
     data = [
-        "//testdata/stu3:google",
+        "//testdata/stu3:extensions",
     ],
     deps = [
         ":extensions",

diff --git a/cc/google/fhir/stu3/extensions_test.cc b/cc/google/fhir/stu3/extensions_test.cc
@@ -49,9 +49,9 @@ template <class T>
 void ReadStu3TestData(const std::string& type, T* message,
                       proto::Extension* extension) {
   *message =
-      ReadStu3Proto<T>(absl::StrCat("google/", type, ".message.prototxt"));
+      ReadStu3Proto<T>(absl::StrCat("extensions/", type, ".message.prototxt"));
   *extension = ReadStu3Proto<proto::Extension>(
-      absl::StrCat("google/", type, ".extension.prototxt"));
+      absl::StrCat("extensions/", type, ".extension.prototxt"));
 }
 
 template <class T>

diff --git a/java/BUILD b/java/BUILD
@@ -327,7 +327,7 @@ java_test(
     size = "medium",
     srcs = ["src/test/java/com/google/fhir/wrappers/ExtensionWrapperTest.java"],
     data = [
-        "//testdata/stu3:google",
+        "//testdata/stu3:extensions",
     ],
     test_class = "com.google.fhir.wrappers.ExtensionWrapperTest",
     deps = [
@@ -617,7 +617,6 @@ java_test(
         "//spec:uscore_stu3_package_filegroup",
         "//testdata/r4:descriptors",
         "//testdata/stu3:descriptors",
-        "//testdata/stu3:google",
     ],
     test_class = "com.google.fhir.protogen.ProtoGeneratorTest",
     deps = [

diff --git a/java/src/test/java/com/google/fhir/wrappers/ExtensionWrapperTest.java b/java/src/test/java/com/google/fhir/wrappers/ExtensionWrapperTest.java
@@ -43,7 +43,8 @@ public final class ExtensionWrapperTest {
   /** Read the specifed prototxt file from the testdata directory and parse it. */
   private void mergeText(java.lang.String filename, Message.Builder builder) throws IOException {
     File file =
-        new File(runfiles.rlocation("com_google_fhir/testdata/stu3/google/" + filename));
+        new File(
+            runfiles.rlocation("com_google_fhir/testdata/stu3/extensions/" + filename));
     textParser.merge(Files.asCharSource(file, StandardCharsets.UTF_8).read(), builder);
   }
 

diff --git a/py/google/fhir/r4/BUILD b/py/google/fhir/r4/BUILD
@@ -253,7 +253,7 @@ py_test(
         "extensions_test.py",
     ],
     data = [
-        "//testdata/r4:google",
+        "//testdata/r4:extensions",
     ],
     legacy_create_init = 0,
     python_version = "PY3",

diff --git a/py/google/fhir/r4/extensions_test.py b/py/google/fhir/r4/extensions_test.py
@@ -28,7 +28,7 @@
 from google.fhir import extensions_test
 from testdata.r4.profiles import test_extensions_pb2
 
-_EXTENSIONS_DIR = os.path.join('testdata', 'r4', 'google')
+_EXTENSIONS_DIR = os.path.join('testdata', 'r4', 'extensions')
 
 
 class ExtensionsTest(extensions_test.ExtensionsTest):

diff --git a/py/google/fhir/stu3/BUILD b/py/google/fhir/stu3/BUILD
@@ -88,7 +88,7 @@ py_test(
         "extensions_test.py",
     ],
     data = [
-        "//testdata/stu3:google",
+        "//testdata/stu3:extensions",
     ],
     legacy_create_init = 0,
     python_version = "PY3",

diff --git a/py/google/fhir/stu3/extensions_test.py b/py/google/fhir/stu3/extensions_test.py
@@ -28,7 +28,7 @@
 from google.fhir import extensions_test
 from testdata.stu3.profiles import test_extensions_pb2
 
-_EXTENSIONS_DIR = os.path.join('testdata', 'stu3', 'google')
+_EXTENSIONS_DIR = os.path.join('testdata', 'stu3', 'extensions')
 
 
 class ExtensionsTest(extensions_test.ExtensionsTest):

diff --git a/testdata/r4/BUILD b/testdata/r4/BUILD
@@ -36,11 +36,11 @@ filegroup(
     ]),
 )
 
-# These files contain google extensions.
+# These files contain extensions in both profiled and unprofiled form.
 filegroup(
-    name = "google",
+    name = "extensions",
     srcs = glob([
-        "google/*",
+        "extensions/*",
     ]),
 )
 

diff --git a/...a/r4/google/capability.extension.prototxt → .../extensions/capability.extension.prototxt b/...a/r4/google/capability.extension.prototxt → .../extensions/capability.extension.prototxt
diff --git a/...ata/r4/google/capability.message.prototxt → ...r4/extensions/capability.message.prototxt b/...ata/r4/google/capability.message.prototxt → ...r4/extensions/capability.message.prototxt
diff --git a/...gle/digital_media_type.extension.prototxt → ...ons/digital_media_type.extension.prototxt b/...gle/digital_media_type.extension.prototxt → ...ons/digital_media_type.extension.prototxt
diff --git a/...oogle/digital_media_type.message.prototxt → ...sions/digital_media_type.message.prototxt b/...oogle/digital_media_type.message.prototxt → ...sions/digital_media_type.message.prototxt
diff --git a/testdata/r4/google/empty.extension.prototxt → ...ta/r4/extensions/empty.extension.prototxt b/testdata/r4/google/empty.extension.prototxt → ...ta/r4/extensions/empty.extension.prototxt
diff --git a/testdata/r4/google/empty.message.prototxt → ...data/r4/extensions/empty.message.prototxt b/testdata/r4/google/empty.message.prototxt → ...data/r4/extensions/empty.message.prototxt
diff --git a/...ension-base64binary-separator-stride.json → ...ension-base64binary-separator-stride.json b/...ension-base64binary-separator-stride.json → ...ension-base64binary-separator-stride.json
diff --git a/...data/r4/google/extension-event-label.json → .../r4/extensions/extension-event-label.json b/...data/r4/google/extension-event-label.json → .../r4/extensions/extension-event-label.json
diff --git a/...ta/r4/google/extension-event-trigger.json → ...4/extensions/extension-event-trigger.json b/...ta/r4/google/extension-event-trigger.json → ...4/extensions/extension-event-trigger.json
diff --git a/...gle/extension-primitive-has-no-value.json → ...ons/extension-primitive-has-no-value.json b/...gle/extension-primitive-has-no-value.json → ...ons/extension-primitive-has-no-value.json
diff --git a/testdata/r4/google/label.extension.prototxt → ...ta/r4/extensions/label.extension.prototxt b/testdata/r4/google/label.extension.prototxt → ...ta/r4/extensions/label.extension.prototxt
diff --git a/testdata/r4/google/label.message.prototxt → ...data/r4/extensions/label.message.prototxt b/testdata/r4/google/label.message.prototxt → ...data/r4/extensions/label.message.prototxt
diff --git a/...primitive_has_no_value.extension.prototxt → ...primitive_has_no_value.extension.prototxt b/...primitive_has_no_value.extension.prototxt → ...primitive_has_no_value.extension.prototxt
diff --git a/...e/primitive_has_no_value.message.prototxt → ...s/primitive_has_no_value.message.prototxt b/...e/primitive_has_no_value.message.prototxt → ...s/primitive_has_no_value.message.prototxt
diff --git a/...data/r4/google/trigger.extension.prototxt → .../r4/extensions/trigger.extension.prototxt b/...data/r4/google/trigger.extension.prototxt → .../r4/extensions/trigger.extension.prototxt
diff --git a/testdata/r4/google/trigger.message.prototxt → ...ta/r4/extensions/trigger.message.prototxt b/testdata/r4/google/trigger.message.prototxt → ...ta/r4/extensions/trigger.message.prototxt
diff --git a/testdata/r4/google/google_package_info.prototxt b/testdata/r4/google/google_package_info.prototxt
diff --git a/testdata/stu3/BUILD b/testdata/stu3/BUILD
@@ -36,14 +36,11 @@ filegroup(
     ]),
 )
 
-# These files contain google extensions.
+# These files contain extensions in both profiled and unprofiled form.
 filegroup(
-    name = "google",
+    name = "extensions",
     srcs = glob([
-        "google/*.json",
-        "google/*.descriptor.prototxt",
-        "google/*.extension.prototxt",
-        "google/*.message.prototxt",
+        "extensions/*",
     ]),
 )
 

diff --git a/...stu3/google/capability.extension.prototxt → .../extensions/capability.extension.prototxt b/...stu3/google/capability.extension.prototxt → .../extensions/capability.extension.prototxt
diff --git a/...a/stu3/google/capability.message.prototxt → ...u3/extensions/capability.message.prototxt b/...a/stu3/google/capability.message.prototxt → ...u3/extensions/capability.message.prototxt
diff --git a/...gle/digital_media_type.extension.prototxt → ...ons/digital_media_type.extension.prototxt b/...gle/digital_media_type.extension.prototxt → ...ons/digital_media_type.extension.prototxt
diff --git a/...oogle/digital_media_type.message.prototxt → ...sions/digital_media_type.message.prototxt b/...oogle/digital_media_type.message.prototxt → ...sions/digital_media_type.message.prototxt
diff --git a/...data/stu3/google/empty.extension.prototxt → .../stu3/extensions/empty.extension.prototxt b/...data/stu3/google/empty.extension.prototxt → .../stu3/extensions/empty.extension.prototxt
diff --git a/testdata/stu3/google/empty.message.prototxt → ...ta/stu3/extensions/empty.message.prototxt b/testdata/stu3/google/empty.message.prototxt → ...ta/stu3/extensions/empty.message.prototxt