diff options
| author |  dslomov <dslomov@google.com> | 2017-08-24 19:54:34 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-08-25 12:53:35 +0200 |
| commit | c79ed5dec0beda5465a3200b6a1139a3d29a8da6 (patch) | |
| tree | 26b7b657056029164818e504d35f5a60052e5533 /src/test | |
| parent | 23bb662af090602971aa86ad59827810dafcb70f (diff) | |
Refactor JavaInfo.
Convert implementation from populating an immutable map to a set of
SkylarkCallables. That saves memory and allows specifying documentation.
Also properly implements equals() and hashCode().
RELNOTES: None.
PiperOrigin-RevId: 166364059
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java index e21ef2c829..0e5d1d140e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java @@ -295,18 +295,16 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { " transitive_runtime_jars = ['libd.jar'],", ")"); ConfiguredTarget target = getConfiguredTarget("//foo:myrule"); - Info info = target.get(JavaInfo.PROVIDER); + JavaInfo info = target.get(JavaInfo.PROVIDER); - SkylarkNestedSet compileJars = (SkylarkNestedSet) info.getValue("compile_jars"); + SkylarkNestedSet compileJars = info.getCompileTimeJars(); assertThat(prettyJarNames(compileJars.getSet(Artifact.class))).containsExactly("foo/liba.jar"); - SkylarkNestedSet transitiveCompileTimeJars = - (SkylarkNestedSet) info.getValue("transitive_compile_time_jars"); + SkylarkNestedSet transitiveCompileTimeJars = info.getTransitiveCompileTimeJars(); assertThat(prettyJarNames( transitiveCompileTimeJars.getSet(Artifact.class))).containsExactly("foo/libc.jar"); - SkylarkNestedSet transitiveRuntimeJars = - (SkylarkNestedSet) info.getValue("transitive_runtime_jars"); + SkylarkNestedSet transitiveRuntimeJars = info.getTransitiveRuntimeJars(); assertThat(prettyJarNames( transitiveRuntimeJars.getSet(Artifact.class))).containsExactly("foo/libd.jar"); } @@ -335,17 +333,15 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { " transitive_runtime_jars = ['libd.jar'],", ")"); ConfiguredTarget target = getConfiguredTarget("//foo:myrule"); - Info info = target.get(JavaInfo.PROVIDER); + JavaInfo info = target.get(JavaInfo.PROVIDER); - SkylarkNestedSet compileJars = (SkylarkNestedSet) info.getValue("compile_jars"); + SkylarkNestedSet compileJars = info.getCompileTimeJars(); assertThat(prettyJarNames(compileJars.getSet(Artifact.class))).containsExactly("foo/liba.jar"); - SkylarkNestedSet transitiveCompileTimeJars = - (SkylarkNestedSet) info.getValue("transitive_compile_time_jars"); + SkylarkNestedSet transitiveCompileTimeJars = info.getTransitiveCompileTimeJars(); assertThat(prettyJarNames(transitiveCompileTimeJars.getSet(Artifact.class))).isEmpty(); - SkylarkNestedSet transitiveRuntimeJars = - (SkylarkNestedSet) info.getValue("transitive_runtime_jars"); + SkylarkNestedSet transitiveRuntimeJars = info.getTransitiveRuntimeJars(); assertThat(prettyJarNames( transitiveRuntimeJars.getSet(Artifact.class))).containsExactly("foo/libd.jar"); } |