RuleTransitionFactory returns NoTransition instead of null.

RELNOTES: None.
PiperOrigin-RevId: 194433721

2 files changed, 11 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactoryTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactoryTest.java
index 74533cfcf5..d991a79b9f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactoryTest.java
@@ -22,6 +22,7 @@ import com.google.common.testing.EqualsTester;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
+import com.google.devtools.build.lib.analysis.config.transitions.NoTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -163,6 +164,9 @@ public final class ConfigFeatureFlagTransitionFactoryTest extends BuildViewTestC
   public void transition_equalsTester() throws Exception {
     scratch.file(
         "a/BUILD",
+        "filegroup(",
+        "    name = 'not_a_flagsetter',",
+        "    srcs = [])",
         "feature_flag_setter(",
         "    name = 'empty',",
         "    flag_values = {})",
@@ -193,6 +197,7 @@ public final class ConfigFeatureFlagTransitionFactoryTest extends BuildViewTestC
         "    allowed_values = ['a', 'b'],",
         "    default_value = 'a')");
 
+    Rule nonflag = (Rule) getTarget("//a:not_a_flagsetter");
     Rule empty = (Rule) getTarget("//a:empty");
     Rule empty2 = (Rule) getTarget("//a:empty2");
     Rule flagSetterA = (Rule) getTarget("//a:flag_setter_a");
@@ -208,6 +213,10 @@ public final class ConfigFeatureFlagTransitionFactoryTest extends BuildViewTestC
 
     new EqualsTester()
         .addEqualityGroup(
+            // transition for non flags target
+            factory.buildTransitionFor(nonflag),
+            NoTransition.INSTANCE)
+        .addEqualityGroup(
             // transition with empty map
             factory.buildTransitionFor(empty),
             // transition produced by same factory on same rule
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
index a73ed01e4a..43cc5636ab 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
@@ -31,6 +31,7 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.ConfigurationResolver;
 import com.google.devtools.build.lib.analysis.config.TransitionResolver;
 import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition;
+import com.google.devtools.build.lib.analysis.config.transitions.NoTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition;
 import com.google.devtools.build.lib.analysis.test.TestConfiguration;
@@ -153,7 +154,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
       NonconfigurableAttributeMapper attributes = NonconfigurableAttributeMapper.of(rule);
       String value = attributes.get("sets_test_filter_to", STRING);
       if (Strings.isNullOrEmpty(value)) {
-        return null;
+        return NoTransition.INSTANCE;
       } else {
         return new SetsTestFilterFromAttributePatchTransition(value);
       }