diff options
author | 2015-09-02 12:22:46 +0000 | |
---|---|---|
committer | 2015-09-02 13:35:56 +0000 | |
commit | 4202000465878e5252744f7c32cf39fe41393b9c (patch) | |
tree | 05b1180664ca84cae7ebd8deff8e5f50e6d87ec8 /src/test/java/com/google/devtools/build/lib/analysis | |
parent | 702cad7ffc9bc67737fe1a281dbebbeef41b6551 (diff) |
Fix broken tests.
--
MOS_MIGRATED_REVID=102134151
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis')
3 files changed, 19 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectValueTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectValueTest.java index 2906961e7b..338773d824 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/AspectValueTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectValueTest.java @@ -62,16 +62,17 @@ public class AspectValueTest extends AnalysisTestCase { Class<? extends ConfiguredAspectFactory> a2 = TestAspects.ExtraAttributeAspect.class; new EqualsTester() - .addEqualityGroup(AspectValue.key(l1, c1, a1, null), AspectValue.key(l1b, c1, a1, null)) + .addEqualityGroup(AspectValue.key(l1, c1, a1, AspectParameters.EMPTY), + AspectValue.key(l1b, c1, a1, AspectParameters.EMPTY)) .addEqualityGroup(AspectValue.key(l1, c1, a1, i1)) .addEqualityGroup(AspectValue.key(l1, c1, a1, i2)) - .addEqualityGroup(AspectValue.key(l2, c1, a1, null)) - .addEqualityGroup(AspectValue.key(l1, c2, a1, null)) - .addEqualityGroup(AspectValue.key(l2, c2, a1, null)) - .addEqualityGroup(AspectValue.key(l1, c1, a2, null)) - .addEqualityGroup(AspectValue.key(l2, c1, a2, null)) - .addEqualityGroup(AspectValue.key(l1, c2, a2, null)) - .addEqualityGroup(AspectValue.key(l2, c2, a2, null)) + .addEqualityGroup(AspectValue.key(l2, c1, a1, AspectParameters.EMPTY)) + .addEqualityGroup(AspectValue.key(l1, c2, a1, AspectParameters.EMPTY)) + .addEqualityGroup(AspectValue.key(l2, c2, a1, AspectParameters.EMPTY)) + .addEqualityGroup(AspectValue.key(l1, c1, a2, AspectParameters.EMPTY)) + .addEqualityGroup(AspectValue.key(l2, c1, a2, AspectParameters.EMPTY)) + .addEqualityGroup(AspectValue.key(l1, c2, a2, AspectParameters.EMPTY)) + .addEqualityGroup(AspectValue.key(l2, c2, a2, AspectParameters.EMPTY)) .addEqualityGroup(l1) // A random object .testEquals(); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java index e149cb8693..edbcf63d3c 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java @@ -27,6 +27,7 @@ import com.google.devtools.build.lib.analysis.util.TestAspects; import com.google.devtools.build.lib.analysis.util.TestAspects.AspectRequiringRule; import com.google.devtools.build.lib.packages.AspectDefinition; import com.google.devtools.build.lib.packages.AspectFactory; +import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.NoSuchThingException; import com.google.devtools.build.lib.packages.Target; @@ -116,7 +117,8 @@ public class DependencyResolverTest extends AnalysisTestCase { new TargetAndConfiguration(target, getTargetConfiguration()), getHostConfiguration(), aspectDefinition, - null, ImmutableSet.<ConfigMatchingProvider>of()); + AspectParameters.EMPTY, + ImmutableSet.<ConfigMatchingProvider>of()); } @SafeVarargs @@ -124,7 +126,7 @@ public class DependencyResolverTest extends AnalysisTestCase { ListMultimap<Attribute, Dependency> dependentNodeMap, String attrName, String dep, - Class<? extends AspectFactory<?, ?, ?>>... aspects) { + AspectWithParameters... aspects) { Attribute attr = null; for (Attribute candidate : dependentNodeMap.keySet()) { if (candidate.getName().equals(attrName)) { @@ -153,7 +155,7 @@ public class DependencyResolverTest extends AnalysisTestCase { "aspect(name='a', foo=[':b'])", "aspect(name='b', foo=[])"); ListMultimap<Attribute, Dependency> map = dependentNodeMap("//a:a", null); - assertDep(map, "foo", "//a:b", TestAspects.SimpleAspect.class); + assertDep(map, "foo", "//a:b", new AspectWithParameters(TestAspects.SimpleAspect.class)); } @Test @@ -164,7 +166,7 @@ public class DependencyResolverTest extends AnalysisTestCase { "simple(name='b', foo=[])"); ListMultimap<Attribute, Dependency> map = dependentNodeMap("//a:a", TestAspects.AttributeAspect.class); - assertDep(map, "foo", "//a:b", TestAspects.AttributeAspect.class); + assertDep(map, "foo", "//a:b", new AspectWithParameters(TestAspects.AttributeAspect.class)); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java index ffea8bcc9f..5f41e3d4ec 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java @@ -306,8 +306,10 @@ public class TestAspects { @Override public AspectParameters apply(Rule rule) { if (rule.isAttrDefined("baz", STRING)) { - return new AspectParameters.Builder().addAttribute("baz", - rule.getAttributeContainer().getAttr("baz").toString()).build(); + String value = rule.getAttributeContainer().getAttr("baz").toString(); + if (!value.equals("")) { + return new AspectParameters.Builder().addAttribute("baz", value).build(); + } } return AspectParameters.EMPTY; } |