Skip to content

Commit 9f589fb

Browse files
committed
update tests to only use 1 test
1 parent 3550d4c commit 9f589fb

File tree

2 files changed

+1
-38
lines changed

2 files changed

+1
-38
lines changed

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ jobs:
5555
gradle-version: 9.2.1
5656
- name: Run Gradle 9 compatibility test
5757
run: |
58-
gradle :jib-gradle-plugin:test --tests "*FilesTaskV2Test.testFilesTask_multiProjectComplexService_gradle9" -x jacocoTestReport --stacktrace
58+
gradle :jib-gradle-plugin:test --tests "*FilesTaskV2Test.testFilesTask_multiProjectComplexService" -x jacocoTestReport --stacktrace

jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2Test.java

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ public class FilesTaskV2Test {
4848

4949
@ClassRule public static final TestProject multiTestProject = new TestProject("multi-service");
5050

51-
@ClassRule
52-
public static final TestProject multiTestProjectGradle9 =
53-
new TestProject("multi-service").withGradleVersion("9.0");
5451

5552
@ClassRule
5653
public static final TestProject platformProject =
@@ -194,38 +191,4 @@ public void testFilesTast_withConfigModifiers() throws IOException {
194191
assertPathListsAreEqual(
195192
ImmutableList.of(projectRoot.resolve("src/main/jib/bar")), result.getIgnore());
196193
}
197-
198-
@Test
199-
public void testFilesTask_multiProjectComplexService_gradle9() throws IOException {
200-
// Skip this test if not running with Gradle 9+
201-
Assume.assumeTrue(
202-
"Test requires Gradle 9+",
203-
GradleVersion.current().compareTo(GradleVersion.version("9.0")) >= 0);
204-
205-
Path projectRoot = multiTestProjectGradle9.getProjectRoot();
206-
Path complexServiceRoot = projectRoot.resolve("complex-service");
207-
Path libRoot = projectRoot.resolve("lib");
208-
SkaffoldFilesOutput result =
209-
new SkaffoldFilesOutput(verifyTaskSuccess(multiTestProjectGradle9, "complex-service"));
210-
assertPathListsAreEqual(
211-
ImmutableList.of(
212-
projectRoot.resolve("build.gradle"),
213-
projectRoot.resolve("settings.gradle"),
214-
projectRoot.resolve("gradle.properties"),
215-
complexServiceRoot.resolve("build.gradle"),
216-
libRoot.resolve("build.gradle")),
217-
result.getBuild());
218-
assertPathListsAreEqual(
219-
ImmutableList.of(
220-
complexServiceRoot.resolve("src/main/extra-resources-1"),
221-
complexServiceRoot.resolve("src/main/extra-resources-2"),
222-
complexServiceRoot.resolve("src/main/java"),
223-
complexServiceRoot.resolve("src/main/other-jib"),
224-
libRoot.resolve("src/main/resources"),
225-
libRoot.resolve("src/main/java"),
226-
complexServiceRoot.resolve(
227-
"local-m2-repo/com/google/cloud/tools/tiny-test-lib/0.0.1-SNAPSHOT/tiny-test-lib-0.0.1-SNAPSHOT.jar")),
228-
result.getInputs());
229-
assertThat(result.getIgnore()).isEmpty();
230-
}
231194
}

0 commit comments

Comments
 (0)