aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools
diff options
context:
space:
mode:
authorGravatar Irina Iancu <elenairina@google.com>2017-02-17 15:07:06 +0000
committerGravatar Irina Iancu <elenairina@google.com>2017-02-20 09:40:25 +0000
commitb1d3f5ffb11151de097311cc3e91bdc44eb0df13 (patch)
tree7e0a86324386e5499ca27a284012498e7154a47c /src/test/java/com/google/devtools
parent463a957a381a1473a973cd88217a12423e9dcd09 (diff)
Progress on Skylarkified java_lite_proto_library.
* Exposed transitive_runtime_jars from the former black-box JavaProvider. * Added support for aliases. * Returned the runfiles from the Skylark rule of java_lite_proto_library. -- PiperOrigin-RevId: 147834471 MOS_MIGRATED_REVID=147834471
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
index 064177538e..c44aea35cb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
@@ -253,10 +253,8 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
prettyJarNames(
getProvider(JavaCompilationArgsProvider.class, litepb2)
.getJavaCompilationArgs().getRuntimeJars());
- // TODO(elenairina): Remove libalpha-lite.jar from directJars assertion after implementing
- // a check for proto sources in Skylarkified java_lite_proto_library.
- assertThat(directJars).containsExactly(
- "cross/libbravo-lite.jar", "cross/libalpha-lite.jar", "protobuf/libjavalite_runtime.jar");
+ assertThat(directJars)
+ .containsExactly("cross/libbravo-lite.jar", "protobuf/libjavalite_runtime.jar");
}
@Test
@@ -486,9 +484,6 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
* behaves as if we depend directly on the aliased proto_library.
*/
@Test
- @Ignore
- // TODO(bazel-team): Enable once alias protos are supported in the Skylark version of
- // java_lite_proto_library.
public void jplCorrectlyDefinesDirectJars_strictDepsEnabled_aliasProto() throws Exception {
scratch.file(
"x/BUILD",