Merge pull request #11 from Yannic:delete_tests_for_deprecated_proto_…

…source_root

GitOrigin-RevId: ed8be6d0d3c00b8896edc2b768c47cd51b267048

proto/tests/BUILD.bazel

@@ -53,9 +53,6 @@ proto_library(
         "//proto/tests/dir:add_and_strip_prefix_import_proto",
         "//proto/tests/dir:add_and_strip_prefix_proto",
         "//proto/tests/dir:add_and_strip_prefix_subdir_proto",
-        "//proto/tests/dir:proto_source_root_import_proto",
-        "//proto/tests/dir:proto_source_root_proto",
-        "//proto/tests/dir:proto_source_root_without_dir_proto",
         "//proto/tests/dir:strip_empty_prefix_proto",
         "//proto/tests/dir:strip_empty_prefix_without_dir_proto",
         "//proto/tests/dir:strip_prefix_import_proto",

proto/tests/dir/BUILD.bazel

@@ -68,8 +68,6 @@ proto_library(
         "//proto/tests/dir:add_and_strip_empty_subdir_prefix_proto",
         "//proto/tests/dir:add_and_strip_prefix_proto",
         "//proto/tests/dir:add_and_strip_prefix_subdir_proto",
-        "//proto/tests/dir:proto_source_root_proto",
-        "//proto/tests/dir:proto_source_root_without_dir_proto",
         "//proto/tests/dir:strip_empty_prefix_proto",
         "//proto/tests/dir:strip_empty_prefix_without_dir_proto",
         "//proto/tests/dir:strip_prefix_proto",
@@ -89,73 +87,6 @@ proto_library(
     ],
 )
 
-# TODO(yannic): This is incompatible with --incompatible_disable_proto_source_root.
-proto_library(
-    name = "proto_source_root_proto",
-    srcs = [
-        "proto_source_root/proto_source_root.proto",
-    ],
-    proto_source_root = "proto/tests/dir",
-    visibility = [
-        "//proto/tests:__subpackages__",
-    ],
-)
-
-# TODO(yannic): This is incompatible with --incompatible_disable_proto_source_root.
-proto_library(
-    name = "proto_source_root_import_proto",
-    srcs = [
-        "proto_source_root/proto_source_root_import.proto",
-    ],
-    proto_source_root = "proto/tests/dir",
-    visibility = [
-        "//proto/tests:__subpackages__",
-    ],
-    deps = [
-        "//proto/tests:add_prefix_proto",
-        "//proto/tests:add_prefix_with_dir_proto",
-        "//proto/tests:no_prefix_proto",
-        "//proto/tests/dir:add_and_strip_empty_prefix_proto",
-        "//proto/tests/dir:add_and_strip_empty_subdir_prefix_proto",
-        "//proto/tests/dir:add_and_strip_prefix_proto",
-        "//proto/tests/dir:add_and_strip_prefix_subdir_proto",
-        "//proto/tests/dir:proto_source_root_proto",
-        "//proto/tests/dir:proto_source_root_without_dir_proto",
-        "//proto/tests/dir:strip_empty_prefix_proto",
-        "//proto/tests/dir:strip_empty_prefix_without_dir_proto",
-        "//proto/tests/dir:strip_prefix_proto",
-        "//proto/tests/dir:strip_prefix_with_dir_proto",
-    ],
-)
-
-# TODO(yannic): This is incompatible with --incompatible_disable_proto_source_root.
-proto_library(
-    name = "proto_source_root_import_full_proto",
-    srcs = [
-        "proto_source_root/proto_source_root_import_full.proto",
-    ],
-    proto_source_root = "proto/tests/dir",
-    visibility = [
-        "//proto/tests:__subpackages__",
-    ],
-    deps = [
-        "//proto/tests/dir:proto_source_root_proto",
-        "//proto/tests/dir:proto_source_root_without_dir_proto",
-    ],
-)
-
-# TODO(yannic): This is incompatible with --incompatible_disable_proto_source_root.
-proto_library(
-    name = "proto_source_root_without_dir_proto",
-    srcs = [
-        "proto_source_root_without_dir.proto",
-    ],
-    proto_source_root = "proto/tests/dir",
-    visibility = [
-        "//proto/tests:__subpackages__",
-    ],
-)
-
 proto_library(
     name = "strip_empty_prefix_proto",
     srcs = [
@@ -206,8 +137,6 @@ proto_library(
         "//proto/tests/dir:add_and_strip_empty_subdir_prefix_proto",
         "//proto/tests/dir:add_and_strip_prefix_proto",
         "//proto/tests/dir:add_and_strip_prefix_subdir_proto",
-        "//proto/tests/dir:proto_source_root_proto",
-        "//proto/tests/dir:proto_source_root_without_dir_proto",
         "//proto/tests/dir:strip_empty_prefix_proto",
         "//proto/tests/dir:strip_empty_prefix_without_dir_proto",
         "//proto/tests/dir:strip_prefix_proto",

proto/tests/dir/add_and_strip_prefix/add_and_strip_prefix_import.proto

@@ -23,8 +23,6 @@ import "import_prefix/add_and_strip_empty_prefix.proto";
 import "import_prefix/add_and_strip_prefix.proto";
 import "import_prefix/add_and_strip_prefix/add_and_strip_empty_subdir_prefix.proto";
 import "import_prefix/dir/add_and_strip_prefix_subdir.proto";
-import "proto_source_root/proto_source_root.proto";
-import "proto_source_root_without_dir.proto";
 import "strip_empty_prefix_without_dir.proto";
 import "strip_prefix.proto";
 import "strip_prefix/strip_empty_prefix.proto";
@@ -38,10 +36,8 @@ message AddAndStripPrefixImport {
   AddAndStripPrefix add_and_strip_prefix = 5;
   AddAndStripEmptySubdirPrefix add_and_strip_empty_subdir_prefix = 6;
   AddAndStripPrefixSubdir add_and_strip_prefix_subdir = 7;
-  ProtoSourceRoot proto_source_root = 8;
-  ProtoSourceRootWithoutDir proto_source_root_without_dir = 9;
-  StripEmptyPrefixWithoutDir strip_empty_prefix_without_dir = 10;
-  StripPrefix strip_prefix = 11;
-  StripEmptyPrefix strip_empty_prefix = 12;
-  NoPrefix no_prefix = 13;
+  StripEmptyPrefixWithoutDir strip_empty_prefix_without_dir = 8;
+  StripPrefix strip_prefix = 9;
+  StripEmptyPrefix strip_empty_prefix = 10;
+  NoPrefix no_prefix = 11;
 }

proto/tests/dir/strip_prefix/strip_prefix_import.proto

@@ -23,8 +23,6 @@ import "import_prefix/add_and_strip_empty_prefix.proto";
 import "import_prefix/add_and_strip_prefix.proto";
 import "import_prefix/add_and_strip_prefix/add_and_strip_empty_subdir_prefix.proto";
 import "import_prefix/dir/add_and_strip_prefix_subdir.proto";
-import "proto_source_root/proto_source_root.proto";
-import "proto_source_root_without_dir.proto";
 import "strip_empty_prefix_without_dir.proto";
 import "strip_prefix.proto";
 import "strip_prefix/strip_empty_prefix.proto";
@@ -38,10 +36,8 @@ message StripPrefixImport {
   AddAndStripPrefix add_and_strip_prefix = 5;
   AddAndStripEmptySubdirPrefix add_and_strip_empty_subdir_prefix = 6;
   AddAndStripPrefixSubdir add_and_strip_prefix_subdir = 7;
-  ProtoSourceRoot proto_source_root = 8;
-  ProtoSourceRootWithoutDir proto_source_root_without_dir = 9;
-  StripEmptyPrefixWithoutDir strip_empty_prefix_without_dir = 10;
-  StripPrefix strip_prefix = 11;
-  StripEmptyPrefix strip_empty_prefix = 12;
-  NoPrefix no_prefix = 13;
+  StripEmptyPrefixWithoutDir strip_empty_prefix_without_dir = 8;
+  StripPrefix strip_prefix = 9;
+  StripEmptyPrefix strip_empty_prefix = 10;
+  NoPrefix no_prefix = 11;
 }

proto/tests/import_all.proto

@@ -26,9 +26,6 @@ import "import_prefix/add_and_strip_prefix.proto";
 import "import_prefix/add_and_strip_prefix/add_and_strip_empty_subdir_prefix.proto";
 import "import_prefix/add_and_strip_prefix_import.proto";
 import "import_prefix/dir/add_and_strip_prefix_subdir.proto";
-import "proto_source_root/proto_source_root.proto";
-import "proto_source_root/proto_source_root_import.proto";
-import "proto_source_root_without_dir.proto";
 import "strip_empty_prefix_without_dir.proto";
 import "strip_prefix.proto";
 import "strip_prefix/strip_empty_prefix.proto";
@@ -46,12 +43,9 @@ message ImportAll {
   AddAndStripEmptySubdirPrefix add_and_strip_empty_subdir_prefix = 8;
   AddAndStripPrefixImport add_and_strip_prefix_import = 9;
   AddAndStripPrefixSubdir add_and_strip_prefix_subdir = 10;
-  ProtoSourceRoot proto_source_root = 11;
-  ProtoSourceRootImport proto_source_root_import = 12;
-  ProtoSourceRootWithoutDir proto_source_root_without_dir = 13;
-  StripEmptyPrefixWithoutDir strip_empty_prefix_without_dir = 14;
-  StripPrefix strip_prefix = 15;
-  StripEmptyPrefix strip_empty_prefix = 16;
-  StripPrefixImport strip_prefix_import = 17;
-  NoPrefix no_prefix = 18;
+  StripEmptyPrefixWithoutDir strip_empty_prefix_without_dir = 11;
+  StripPrefix strip_prefix = 12;
+  StripEmptyPrefix strip_empty_prefix = 13;
+  StripPrefixImport strip_prefix_import = 14;
+  NoPrefix no_prefix = 15;
 }