diff options
Diffstat (limited to 'src/test/java/com')
19 files changed, 14 insertions, 30 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 7398b1f51d..2b75859e1c 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -176,7 +176,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//third_party:guava", "//third_party:guava-testlib", "//third_party:joda_time", @@ -378,7 +377,6 @@ java_library( "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:extra_actions_base_java_proto", - "//src/main/protobuf:option_filters_java_proto", "//src/test/java/com/google/devtools/build/lib/skyframe:testutil", "//src/test/java/com/google/devtools/build/skyframe:testutil", "//third_party:guava", @@ -459,7 +457,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib/rules/objc", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:extra_actions_base_java_proto", - "//src/main/protobuf:option_filters_java_proto", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -552,7 +549,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", - "//src/main/protobuf:option_filters_java_proto", "//src/test/java/com/google/devtools/build/lib/skyframe:testutil", "//third_party:auto_value", "//third_party:guava", @@ -1052,7 +1048,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib/buildeventstream/transports", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:invocation_policy_java_proto", - "//src/main/protobuf:option_filters_java_proto", "//src/main/protobuf:test_status_java_proto", "//third_party:guava", "//third_party:junit4", @@ -1255,7 +1250,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", - "//src/main/protobuf:option_filters_java_proto", "//third_party:auto_value", "//third_party:guava", "//third_party:junit4", @@ -1276,7 +1270,6 @@ java_library( ], deps = [ "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//src/main/protobuf:worker_protocol_java_proto", "//third_party:guava", ], diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java index 722a0c99dc..f9297e0f42 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java @@ -35,7 +35,7 @@ import com.google.devtools.build.lib.testutil.UnknownRuleConfiguredTarget; import com.google.devtools.build.lib.util.FileTypeSet; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; +import com.google.devtools.common.options.OptionEffectTag; import java.util.List; /** diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/TransitiveOptionDetailsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/TransitiveOptionDetailsTest.java index aad83ce84e..808f77be13 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/TransitiveOptionDetailsTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/TransitiveOptionDetailsTest.java @@ -21,10 +21,10 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.common.options.Converter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; +import com.google.devtools.common.options.OptionMetadataTag; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; -import com.google.devtools.common.options.proto.OptionFilters.OptionMetadataTag; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index 3be2822846..d87ac01d82 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java @@ -50,10 +50,10 @@ import com.google.devtools.common.options.Converters; import com.google.devtools.common.options.InvocationPolicyEnforcer; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.Options; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.util.Collection; import java.util.HashMap; import java.util.List; diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD index cf09804243..34c5cadbd7 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD @@ -23,7 +23,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/rules/config", "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//src/test/java/com/google/devtools/build/lib:testutil", diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java index bc61b93906..b6f869ecd1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java @@ -32,8 +32,8 @@ import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; -import com.google.devtools.common.options.proto.OptionFilters.OptionMetadataTag; +import com.google.devtools.common.options.OptionEffectTag; +import com.google.devtools.common.options.OptionMetadataTag; import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java index 0d336d967b..14731206b6 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java @@ -21,10 +21,10 @@ import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.util.ExitCode; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsProvider; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/test/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansionTest.java b/src/test/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansionTest.java index a5ff1503dc..f8e8892c59 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansionTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansionTest.java @@ -26,11 +26,11 @@ import com.google.devtools.common.options.ExpansionFunction; import com.google.devtools.common.options.InvocationPolicyEnforcer; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; +import com.google.devtools.common.options.OptionMetadataTag; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsParsingException; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; -import com.google.devtools.common.options.proto.OptionFilters.OptionMetadataTag; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java index 1ab3e217e1..3d6288d406 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java @@ -36,10 +36,10 @@ import com.google.devtools.build.lib.util.ExitCode; import com.google.devtools.build.lib.util.io.RecordingOutErr; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsProvider; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java b/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java index 441c1129c5..8d8e8d651a 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java @@ -31,10 +31,10 @@ import com.google.devtools.build.lib.util.ExitCode; import com.google.devtools.build.lib.util.io.OutErr; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsProvider; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.BrokenBarrierException; diff --git a/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java b/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java index b6f33d5c87..aa23d2a581 100644 --- a/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java +++ b/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java @@ -21,11 +21,11 @@ import com.google.devtools.build.lib.util.OptionsUtils.PathFragmentListConverter import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; +import com.google.devtools.common.options.OptionMetadataTag; import com.google.devtools.common.options.OptionPriority; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; -import com.google.devtools.common.options.proto.OptionFilters.OptionMetadataTag; import java.util.Arrays; import java.util.List; import org.junit.Test; diff --git a/src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java b/src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java index c1ef652677..7cfd14f9b4 100644 --- a/src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java +++ b/src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java @@ -15,8 +15,8 @@ package com.google.devtools.build.lib.worker; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.OptionsBase; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; /** * Options for the example worker itself. diff --git a/src/test/java/com/google/devtools/common/options/BoolOrEnumConverterTest.java b/src/test/java/com/google/devtools/common/options/BoolOrEnumConverterTest.java index 3f0403a0d9..8bc49e117c 100644 --- a/src/test/java/com/google/devtools/common/options/BoolOrEnumConverterTest.java +++ b/src/test/java/com/google/devtools/common/options/BoolOrEnumConverterTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.common.options.OptionsParser.newOptionsParser; import static org.junit.Assert.fail; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/src/test/java/com/google/devtools/common/options/EnumConverterTest.java b/src/test/java/com/google/devtools/common/options/EnumConverterTest.java index 9d5719cec3..cc66c35a63 100644 --- a/src/test/java/com/google/devtools/common/options/EnumConverterTest.java +++ b/src/test/java/com/google/devtools/common/options/EnumConverterTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.common.options.OptionsParser.newOptionsParser; import static org.junit.Assert.fail; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/com/google/devtools/common/options/OptionsDataTest.java b/src/test/java/com/google/devtools/common/options/OptionsDataTest.java index 8710cf1643..5090fab1d4 100644 --- a/src/test/java/com/google/devtools/common/options/OptionsDataTest.java +++ b/src/test/java/com/google/devtools/common/options/OptionsDataTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.devtools.common.options.OptionsParser.ConstructionException; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/google/devtools/common/options/OptionsMapConversionTest.java b/src/test/java/com/google/devtools/common/options/OptionsMapConversionTest.java index a4731c36d8..bed48865d0 100644 --- a/src/test/java/com/google/devtools/common/options/OptionsMapConversionTest.java +++ b/src/test/java/com/google/devtools/common/options/OptionsMapConversionTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableMap; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.lang.reflect.Field; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java index 7d7e2d8737..e1aa563c81 100644 --- a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java +++ b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java @@ -25,8 +25,6 @@ import com.google.devtools.common.options.Converters.CommaSeparatedOptionListCon import com.google.devtools.common.options.OptionsParser.ConstructionException; import com.google.devtools.common.options.OptionsParser.OptionValueDescription; import com.google.devtools.common.options.OptionsParser.UnparsedOptionValueDescription; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; -import com.google.devtools.common.options.proto.OptionFilters.OptionMetadataTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/test/java/com/google/devtools/common/options/OptionsTest.java b/src/test/java/com/google/devtools/common/options/OptionsTest.java index 8f9b99a8e3..12ba3e4dec 100644 --- a/src/test/java/com/google/devtools/common/options/OptionsTest.java +++ b/src/test/java/com/google/devtools/common/options/OptionsTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.common.testing.EqualsTester; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.net.MalformedURLException; import java.net.URL; import java.util.Map; diff --git a/src/test/java/com/google/devtools/common/options/TestOptions.java b/src/test/java/com/google/devtools/common/options/TestOptions.java index c73009b3ee..7dc0228a1f 100644 --- a/src/test/java/com/google/devtools/common/options/TestOptions.java +++ b/src/test/java/com/google/devtools/common/options/TestOptions.java @@ -15,7 +15,6 @@ package com.google.devtools.common.options; import com.google.common.collect.ImmutableList; import com.google.devtools.common.options.InvocationPolicyEnforcerTestBase.ToListConverter; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.util.List; /** Options for testing. */ |