diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java index 2dbd7db711..8b24e74985 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java @@ -175,9 +175,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { assertThat(Artifact.toRootRelativePaths(filesToBuild)) .containsAllOf( "package/_generated_protos/opl_protobuf/package/FileA.pbobjc.h", - "package/_generated_protos/opl_protobuf/package/FileA.pbobjc.m", "package/_generated_protos/opl_protobuf/package/dir/FileB.pbobjc.h", - "package/_generated_protos/opl_protobuf/package/dir/FileB.pbobjc.m", "package/_generated_protos/opl_protobuf/dep/File.pbobjc.h"); } @@ -187,9 +185,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { assertThat(Artifact.toRootRelativePaths(filesToBuild)) .containsAllOf( "package/_generated_protos/nested_opl/package/FileA.pbobjc.h", - "package/_generated_protos/nested_opl/package/FileA.pbobjc.m", - "package/_generated_protos/nested_opl/package/dir/FileB.pbobjc.h", - "package/_generated_protos/nested_opl/package/dir/FileB.pbobjc.m"); + "package/_generated_protos/nested_opl/package/dir/FileB.pbobjc.h"); } @Test @@ -201,9 +197,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { assertThat(Artifact.toRootRelativePaths(filesToBuild)) .containsAllOf( "package/_generated_protos/opl_protobuf/package/FileA.pbobjc.h", - "package/_generated_protos/opl_protobuf/package/FileA.pbobjc.m", "package/_generated_protos/opl_protobuf/package/dir/FileB.pbobjc.h", - "package/_generated_protos/opl_protobuf/package/dir/FileB.pbobjc.m", "package/_generated_protos/opl_protobuf/dep/File.pbobjc.h"); } @@ -215,21 +209,13 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { assertThat(Artifact.toRootRelativePaths(filesToBuild)) .containsAllOf( outputPath + "J2ObjcDescriptor.pbobjc.h", - outputPath + "J2ObjcDescriptor.pbobjc.m", outputPath + "HTTP.pbobjc.h", - outputPath + "HTTP.pbobjc.m", outputPath + "HTTPS.pbobjc.h", - outputPath + "HTTPS.pbobjc.m", outputPath + "SomeURLBlah.pbobjc.h", - outputPath + "SomeURLBlah.pbobjc.m", outputPath + "ThumbnailURL.pbobjc.h", - outputPath + "ThumbnailURL.pbobjc.m", outputPath + "URL.pbobjc.h", - outputPath + "URL.pbobjc.m", outputPath + "URL2HTTPS.pbobjc.h", - outputPath + "URL2HTTPS.pbobjc.m", - outputPath + "Urlbar.pbobjc.h", - outputPath + "Urlbar.pbobjc.m"); + outputPath + "Urlbar.pbobjc.h"); } @Test @@ -237,31 +223,26 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { NestedSet<Artifact> filesToBuild = getFilesToBuild(getConfiguredTarget("//package:opl_protobuf_well_known_types")); assertThat(Artifact.toRootRelativePaths(filesToBuild)) - .containsAllOf( - "package/_generated_protos/opl_protobuf_well_known_types/package/FileA.pbobjc.h", - "package/_generated_protos/opl_protobuf_well_known_types/package/FileA.pbobjc.m"); + .contains( + "package/_generated_protos/opl_protobuf_well_known_types/package/FileA.pbobjc.h"); assertThat(Artifact.toRootRelativePaths(filesToBuild)) .doesNotContain( "package/_generated_protos/opl_protobuf_well_known_types/objcproto/WellKnownType.pbobjc.h"); - assertThat(Artifact.toRootRelativePaths(filesToBuild)) - .doesNotContain( - "package/_generated_protos/opl_protobuf_well_known_types/objcproto/WellKnownType.pbobjc.m"); } @Test public void testOutputsGenfile() throws Exception { NestedSet<Artifact> filesToBuild = getFilesToBuild(getConfiguredTarget("//package:gen_opl")); assertThat(Artifact.toRootRelativePaths(filesToBuild)) - .containsAllOf( - "package/_generated_protos/gen_opl/package/FileAGenfile.pbobjc.h", - "package/_generated_protos/gen_opl/package/FileAGenfile.pbobjc.m"); + .contains( + "package/_generated_protos/gen_opl/package/FileAGenfile.pbobjc.h"); } @Test - public void testSourceGenerationAction() throws Exception { + public void testHeaderGenerationAction() throws Exception { Artifact sourceFile = ActionsTestUtil.getFirstArtifactEndingWith( - getFilesToBuild(getConfiguredTarget("//package:opl_protobuf")), "/FileA.pbobjc.m"); + getFilesToBuild(getConfiguredTarget("//package:opl_protobuf")), "/FileA.pbobjc.h"); SpawnAction action = (SpawnAction) getGeneratingAction(sourceFile); Artifact inputFileList = @@ -290,7 +271,8 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { "--config", "package/proto_filter2.txt", "--config", - "package/proto_filter3.txt") + "package/proto_filter3.txt", + "--headers-only") .inOrder(); assertThat(Artifact.toRootRelativePaths(action.getInputs())) .containsAllOf( @@ -306,11 +288,11 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { @Test public void testWellKnownTypesProtoListInput() throws Exception { - Artifact sourceFile = + Artifact headerFile = ActionsTestUtil.getFirstArtifactEndingWith( getFilesToBuild(getConfiguredTarget("//package:opl_protobuf_well_known_types")), - "/FileA.pbobjc.m"); - SpawnAction action = (SpawnAction) getGeneratingAction(sourceFile); + "/FileA.pbobjc.h"); + SpawnAction action = (SpawnAction) getGeneratingAction(headerFile); Artifact inputFileList = ActionsTestUtil.getFirstArtifactEndingWith( |