From 07c94a55868b696eef518836131eca899f4bfedd Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 13 Feb 2018 18:36:10 +0300 Subject: [PATCH] Check output in Maven IC tests --- .../IncrementalCompilationIT.java | 17 ++++++++++++++++- .../MavenExecutionResult.java | 8 +++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/IncrementalCompilationIT.java b/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/IncrementalCompilationIT.java index 31c189588e4..9430fc20c1f 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/IncrementalCompilationIT.java +++ b/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/IncrementalCompilationIT.java @@ -1,6 +1,8 @@ package org.jetbrains.kotlin.maven; +import org.jetbrains.annotations.NotNull; import org.junit.Test; + import java.io.File; public class IncrementalCompilationIT extends MavenITBase { @@ -9,10 +11,20 @@ public class IncrementalCompilationIT extends MavenITBase { MavenProject project = new MavenProject("kotlinSimple"); project.exec("package") .succeeded() - .fileExists("target/classes/test.properties") + .filesExist(kotlinSimpleOutputPaths()) .compiledKotlin("src/main/kotlin/A.kt", "src/main/kotlin/useA.kt", "src/main/kotlin/Dummy.kt"); } + @NotNull + private String[] kotlinSimpleOutputPaths() { + return new String[]{ + "target/classes/test.properties", + "target/classes/A.class", + "target/classes/UseAKt.class", + "target/classes/Dummy.class" + }; + } + @Test public void testNoChanges() throws Exception { MavenProject project = new MavenProject("kotlinSimple"); @@ -20,6 +32,7 @@ public class IncrementalCompilationIT extends MavenITBase { project.exec("package") .succeeded() + .filesExist(kotlinSimpleOutputPaths()) .compiledKotlin(); } @@ -40,6 +53,7 @@ public class IncrementalCompilationIT extends MavenITBase { MavenTestUtils.replaceFirstInFile(aKt, replacement, original); project.exec("package") .succeeded() + .filesExist(kotlinSimpleOutputPaths()) .compiledKotlin("src/main/kotlin/A.kt", "src/main/kotlin/useA.kt"); } @@ -54,6 +68,7 @@ public class IncrementalCompilationIT extends MavenITBase { project.exec("package") .succeeded() + .filesExist(kotlinSimpleOutputPaths()) .compiledKotlin("src/main/kotlin/A.kt", "src/main/kotlin/useA.kt"); // todo rebuild and compare output diff --git a/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/MavenExecutionResult.java b/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/MavenExecutionResult.java index 4bd997f7edc..ca092118722 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/MavenExecutionResult.java +++ b/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/MavenExecutionResult.java @@ -111,12 +111,14 @@ class MavenExecutionResult { }); } - MavenExecutionResult fileExists(@NotNull final String path) throws Exception { + MavenExecutionResult filesExist(@NotNull final String... paths) throws Exception { return check(new Action() { @Override public void run(MavenExecutionResult execResult) { - File file = new File(workingDir, path); - Assert.assertTrue(file + " does not exist", file.exists()); + for (String path : paths) { + File file = new File(workingDir, path); + Assert.assertTrue(file + " does not exist", file.exists()); + } } }); }