Fix kotlin standard lib compilation test expectation
Change-Id: Ifae8cfbf769f86cc5b213c55e97a4a740785c550
diff --git a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
index 66dbfec..fe73aa1 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -8,13 +8,14 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.CompilationMode;
+import com.android.tools.r8.DiagnosticsMatcher;
import com.android.tools.r8.KotlinCompilerTool.KotlinCompiler;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestBase;
-import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestShrinkerBuilder;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.errors.InterfaceDesugarMissingTypeDiagnostic;
import com.android.tools.r8.utils.AndroidApiLevel;
import java.util.List;
import org.junit.Test;
@@ -32,7 +33,7 @@
public static List<Object[]> setup() {
return buildParameters(
TestParameters.builder().withAllRuntimesAndApiLevels().build(),
- getKotlinTestParameters().withAllCompilers().withNoTargetVersion().build());
+ getKotlinTestParameters().withNoTargetVersion().build());
}
public KotlinStdLibCompilationTest(
@@ -47,7 +48,17 @@
testForD8()
.addProgramFiles(kotlinTestParameters.getCompiler().getKotlinStdlibJar())
.setMinApi(parameters.getApiLevel())
- .compileWithExpectedDiagnostics(TestDiagnosticMessages::assertNoMessages);
+ .compileWithExpectedDiagnostics(
+ diagnostics -> {
+ if (parameters.isDexRuntime()
+ && parameters.getApiLevel().isLessThan(AndroidApiLevel.N)) {
+ diagnostics.assertWarningsCount(2);
+ diagnostics.assertAllWarningsMatch(
+ DiagnosticsMatcher.diagnosticType(InterfaceDesugarMissingTypeDiagnostic.class));
+ } else {
+ diagnostics.assertNoMessages();
+ }
+ });
}
@Test
