Fix Kotlin tests after reformatting test Kotlin files
Change-Id: I4013a4b506931c0f94960025e3f13aaf23f0cd29
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 31c491e..49914e0 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -28,6 +28,9 @@
'third_party', 'google', 'google-kotlin-format', '0.54.tar.gz.sha1')
KOTLIN_FMT_TGZ = path.join(
'third_party', 'google', 'google-kotlin-format', '0.54.tar.gz.sha1')
+KOTLIN_FMT_IGNORE = {
+ 'src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt'
+}
FMT_CMD = path.join(
'third_party',
@@ -62,6 +65,8 @@
if not path.endswith('.java') and not path.endswith('.kt'):
continue
if path.endswith('.kt'):
+ if path in KOTLIN_FMT_IGNORE:
+ continue
result = check_output(
[GetJavaExecutable(), '-jar', KOTLIN_FMT_JAR, '--google-style', '-n', path])
if len(result) > 0:
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt
index dcc0d47..f5b430a 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt
@@ -5,6 +5,8 @@
package com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_app
import com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_lib.create
+// This unused import should not be removed - expected by test.
+import com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_lib.Password
import com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_lib.login
fun main() {
diff --git a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
index 5fca659..4b4149c 100644
--- a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
@@ -8,7 +8,6 @@
import static com.android.tools.r8.utils.codeinspector.Matchers.isInlineFrame;
import static com.android.tools.r8.utils.codeinspector.Matchers.isInlineStack;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
-import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.StringContains.containsString;
@@ -115,10 +114,10 @@
.uniqueMethodWithOriginalName("foo")
.asFoundMethodSubject(),
1,
- 8,
+ 7,
FILENAME_INLINE),
LinePosition.create(
- mainSubject.asFoundMethodSubject(), 1, 21, FILENAME_INLINE));
+ mainSubject.asFoundMethodSubject(), 1, 19, FILENAME_INLINE));
checkInlineInformation(stackTrace, codeInspector, mainSubject, inlineStack);
});
}
diff --git a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
index 170e5be..387fdd0 100644
--- a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
@@ -9,7 +9,6 @@
import static com.android.tools.r8.utils.codeinspector.Matchers.isInlineFrame;
import static com.android.tools.r8.utils.codeinspector.Matchers.isInlineStack;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
-import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.StringContains.containsString;
@@ -92,7 +91,7 @@
.addRunClasspathFiles(buildOnDexRuntime(parameters, kotlinc.getKotlinStdlibJar()))
.run(parameters.getRuntime(), "retrace.MainKt")
.assertFailureWithErrorThatMatches(containsString("inlineExceptionStatic"))
- .assertFailureWithErrorThatMatches(containsString("at retrace.MainKt.main(Main.kt:15)"));
+ .assertFailureWithErrorThatMatches(containsString("at retrace.MainKt.main(Main.kt:13)"));
}
@Test
@@ -182,7 +181,7 @@
inlineExceptionStatic(kotlinInspector), 3, 8, FILENAME_INLINE_STATIC),
// TODO(b/146399675): There should be a nested frame on
// retrace.NestedInlineFunctionKt.nestedInline(line 10).
- LinePosition.create(mainSubject.asFoundMethodSubject(), 3, 10, mainFileName));
+ LinePosition.create(mainSubject.asFoundMethodSubject(), 3, 9, mainFileName));
checkInlineInformation(stackTrace, codeInspector, mainSubject, inlineStack);
});
}
@@ -213,7 +212,7 @@
inlineExceptionStatic(kotlinInspector), 2, 8, FILENAME_INLINE_STATIC),
// TODO(b/146399675): There should be a nested frame on
// retrace.NestedInlineFunctionKt.nestedInline(line 10).
- LinePosition.create(mainSubject.asFoundMethodSubject(), 2, 10, mainFileName));
+ LinePosition.create(mainSubject.asFoundMethodSubject(), 2, 9, mainFileName));
checkInlineInformation(stackTrace, codeInspector, mainSubject, inlineStack);
});
}
