Use Dex suffix instead of dex prefix for better test sorting

(cherry picked from commit 7f3a9c1)
2016-10-13 00:49:23 +03:00
parent 2511ef2c45
commit fe901e9516
40 changed files with 183 additions and 198 deletions
@@ -1,23 +0,0 @@
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:5
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:23
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:29
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:34
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:41
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:46
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:53
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:60
-LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:66
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexSeveralInlineFunctionsInOneFile.DexSeveralInlineFunctionsInOneFileKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexSeveralInlineFunctionsInOneFile.kt:5
-dexSeveralInlineFunctionsInOneFile.kt:23
-dexSeveralInlineFunctionsInOneFile.kt:29
-dexSeveralInlineFunctionsInOneFile.kt:41
-dexSeveralInlineFunctionsInOneFile.kt:66
-dexSeveralInlineFunctionsInOneFile.kt:34
-dexSeveralInlineFunctionsInOneFile.kt:46
-dexSeveralInlineFunctionsInOneFile.kt:53
-dexSeveralInlineFunctionsInOneFile.kt:60
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-
-Process finished with exit code 0
@@ -1,8 +0,0 @@
-LineBreakpoint created at dexStopInInlineInOtherFile.Other.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexStopInInlineInOtherFile.DexStopInInlineInOtherFileKt
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexStopInInlineInOtherFile.Other.kt:6
-dexStopInInlineInOtherFile.Other.kt:7
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-
-Process finished with exit code 0
@@ -1,8 +1,8 @@
-LineBreakpoint created at dexInline.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInline.DexInlineKt
+LineBreakpoint created at inlineDex.kt:5
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineDex.InlineDexKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexInline.kt:5
-dexInline.kt:9
+inlineDex.kt:5
+inlineDex.kt:9
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -1,8 +1,8 @@
-LineBreakpoint created at dexInlineInClass.Other.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInlineInClass.DexInlineInClassKt
+LineBreakpoint created at inlineInClassDex.Other.kt:6
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInClassDex.InlineInClassDexKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexInlineInClass.Other.kt:6
-dexInlineInClass.Other.kt:7
+inlineInClassDex.Other.kt:6
+inlineInClassDex.Other.kt:7
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -1,8 +1,8 @@
-LineBreakpoint created at dexInlineInObject.Other.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInlineInObject.DexInlineInObjectKt
+LineBreakpoint created at inlineInObjectDex.Other.kt:6
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInObjectDex.InlineInObjectDexKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexInlineInObject.Other.kt:6
-dexInlineInObject.Other.kt:7
+inlineInObjectDex.Other.kt:6
+inlineInObjectDex.Other.kt:7
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -1,9 +1,9 @@
-LineBreakpoint created at dexInlineInObjectSameFile.kt:5
-LineBreakpoint created at dexInlineInObjectSameFile.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInlineInObjectSameFile.DexInlineInObjectSameFileKt
+LineBreakpoint created at inlineInObjectSameFileDex.kt:5
+LineBreakpoint created at inlineInObjectSameFileDex.kt:11
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInObjectSameFileDex.InlineInObjectSameFileDexKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexInlineInObjectSameFile.kt:5
-dexInlineInObjectSameFile.kt:11
+inlineInObjectSameFileDex.kt:5
+inlineInObjectSameFileDex.kt:11
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -1,7 +1,7 @@
-LineBreakpoint created at dexManyFilesWithInlineCalls1.First.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexManyFilesWithInlineCalls1.DexManyFilesWithInlineCalls1Kt
+LineBreakpoint created at manyFilesWithInlineCalls1Dex.First.kt:5
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! manyFilesWithInlineCalls1Dex.ManyFilesWithInlineCalls1DexKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexManyFilesWithInlineCalls1.First.kt:5
+manyFilesWithInlineCalls1Dex.First.kt:5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -1,7 +1,7 @@
-LineBreakpoint created at dexManyFilesWithInlineCalls2.Second.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexManyFilesWithInlineCalls2.DexManyFilesWithInlineCalls2Kt
+LineBreakpoint created at manyFilesWithInlineCalls2Dex.Second.kt:5
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! manyFilesWithInlineCalls2Dex.ManyFilesWithInlineCalls2DexKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexManyFilesWithInlineCalls2.Second.kt:5
+manyFilesWithInlineCalls2Dex.Second.kt:5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -1,10 +1,10 @@
-LineBreakpoint created at dexSeveralInlineCallsFromOtherFile.Other.kt:6
-LineBreakpoint created at dexSeveralInlineCallsFromOtherFile.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexSeveralInlineCallsFromOtherFile.DexSeveralInlineCallsFromOtherFileKt
+LineBreakpoint created at severalInlineCallsFromOtherFileDex.Other.kt:6
+LineBreakpoint created at severalInlineCallsFromOtherFileDex.kt:5
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! severalInlineCallsFromOtherFileDex.SeveralInlineCallsFromOtherFileDexKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexSeveralInlineCallsFromOtherFile.kt:5
-dexSeveralInlineCallsFromOtherFile.Other.kt:6
-dexSeveralInlineCallsFromOtherFile.Other.kt:6
+severalInlineCallsFromOtherFileDex.kt:5
+severalInlineCallsFromOtherFileDex.Other.kt:6
+severalInlineCallsFromOtherFileDex.Other.kt:6
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -0,0 +1,6 @@
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! severalInlineFunctionsInOneFileDex.SeveralInlineFunctionsInOneFileDexKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 1
+Error: Could not find or load main class severalInlineFunctionsInOneFileDex.SeveralInlineFunctionsInOneFileDexKt
@@ -1,8 +1,8 @@
-LineBreakpoint created at dexStopInInlineFun.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexStopInInlineFun.DexStopInInlineFunKt
+LineBreakpoint created at stopInInlineFunDex.kt:10
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineFunDex.StopInInlineFunDexKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dexStopInInlineFun.kt:10
-dexStopInInlineFun.kt:11
+stopInInlineFunDex.kt:10
+stopInInlineFunDex.kt:11
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -0,0 +1,8 @@
+LineBreakpoint created at stopInInlineInOtherFileDex.Other.kt:6
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineInOtherFileDex.StopInInlineInOtherFileDexKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stopInInlineInOtherFileDex.Other.kt:6
+stopInInlineInOtherFileDex.Other.kt:7
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
@@ -1,5 +0,0 @@
-package dexManyFilesWithInlineCalls1.second
-
-inline fun secondInline() {
-    1 + 1
-}
@@ -1,14 +0,0 @@
-package dexManyFilesWithInlineCalls1
-
-import dexManyFilesWithInlineCalls1.first.*
-import dexManyFilesWithInlineCalls1.second.*
-
-fun main(args: Array<String>) {
-    firstInline()
-}
-
-fun unused() {
-    secondInline()
-}
-
-// ADDITIONAL_BREAKPOINT: dexManyFilesWithInlineCalls1.First.kt: Breakpoint 1
@@ -1,5 +0,0 @@
-package dexManyFilesWithInlineCalls2.first
-
-inline fun firstInline() {
-    1 + 1
-}
@@ -1,14 +0,0 @@
-package dexManyFilesWithInlineCalls2
-
-import dexManyFilesWithInlineCalls2.first.*
-import dexManyFilesWithInlineCalls2.second.*
-
-fun main(args: Array<String>) {
-    secondInline()
-}
-
-fun unused() {
-    firstInline()
-}
-
-// ADDITIONAL_BREAKPOINT: dexManyFilesWithInlineCalls2.Second.kt: Breakpoint 1
@@ -1,4 +1,4 @@
-package dexInlineInObjectSameFile
+package inlineInObjectSameFileDex

 fun main(args: Array<String>) {
    //Breakpoint!
@@ -1,4 +1,4 @@
-package dexManyFilesWithInlineCalls1.first
+package manyFilesWithInlineCalls1Dex.first

 inline fun firstInline() {
    // Breakpoint 1
@@ -0,0 +1,5 @@
+package manyFilesWithInlineCalls1Dex.second
+
+inline fun secondInline() {
+    1 + 1
+}
@@ -0,0 +1,14 @@
+package manyFilesWithInlineCalls1Dex
+
+import manyFilesWithInlineCalls1Dex.first.*
+import manyFilesWithInlineCalls1Dex.second.*
+
+fun main(args: Array<String>) {
+    firstInline()
+}
+
+fun unused() {
+    secondInline()
+}
+
+// ADDITIONAL_BREAKPOINT: manyFilesWithInlineCalls1Dex.First.kt: Breakpoint 1
@@ -0,0 +1,5 @@
+package manyFilesWithInlineCalls2Dex.first
+
+inline fun firstInline() {
+    1 + 1
+}
@@ -1,4 +1,4 @@
-package dexManyFilesWithInlineCalls2.second
+package manyFilesWithInlineCalls2Dex.second

 inline fun secondInline() {
    // Breakpoint 1
@@ -0,0 +1,14 @@
+package manyFilesWithInlineCalls2Dex
+
+import manyFilesWithInlineCalls2Dex.first.*
+import manyFilesWithInlineCalls2Dex.second.*
+
+fun main(args: Array<String>) {
+    secondInline()
+}
+
+fun unused() {
+    firstInline()
+}
+
+// ADDITIONAL_BREAKPOINT: manyFilesWithInlineCalls2Dex.Second.kt: Breakpoint 1
@@ -1,4 +1,4 @@
-package dexSeveralInlineCallsFromOtherFile
+package severalInlineCallsFromOtherFileDex

 inline fun inlineFun() {
    var i = 1
@@ -1,4 +1,4 @@
-package dexSeveralInlineCallsFromOtherFile
+package severalInlineCallsFromOtherFileDex

 fun main(args: Array<String>) {
    //Breakpoint!
@@ -15,4 +15,4 @@ fun secondCall() {
 }

 // RESUME: 2
-// ADDITIONAL_BREAKPOINT: dexSeveralInlineCallsFromOtherFile.Other.kt: Breakpoint 1
+// ADDITIONAL_BREAKPOINT: severalInlineCallsFromOtherFileDex.Other.kt: Breakpoint 1
@@ -1,4 +1,4 @@
-package dexSeveralInlineFunctionsInOneFile
+package severalInlineCallsFromOtherFileDex

 fun main(args: Array<String>) {
    //Breakpoint!
@@ -1,4 +1,4 @@
-package dexInline
+package inlineDex

 fun main(args: Array<String>) {
    //Breakpoint!
@@ -1,7 +0,0 @@
-package dexInlineInClass
-
-fun main(args: Array<String>) {
-    dexInlineInClass.other.TestDexInlineInClass().inlineFun()
-}
-
-// ADDITIONAL_BREAKPOINT: dexInlineInClass.Other.kt: Breakpoint 1
@@ -1,7 +0,0 @@
-package dexInlineInObject
-
-fun main(args: Array<String>) {
-    dexInlineInObject.other.TestDexInlineInObject.inlineFun()
-}
-
-// ADDITIONAL_BREAKPOINT: dexInlineInObject.Other.kt: Breakpoint 1
@@ -1,7 +0,0 @@
-package dexStopInInlineInOtherFile
-
-fun main(args: Array<String>) {
-    inlineFun()
-}
-
-// ADDITIONAL_BREAKPOINT: dexStopInInlineInOtherFile.Other.kt: Breakpoint 1
@@ -1,4 +1,4 @@
-package dexInlineInClass.other
+package inlineInClassDex.other

 class TestDexInlineInClass {
    inline fun inlineFun() {
@@ -0,0 +1,7 @@
+package inlineInClassDex
+
+fun main(args: Array<String>) {
+    inlineInClassDex.other.TestDexInlineInClass().inlineFun()
+}
+
+// ADDITIONAL_BREAKPOINT: inlineInClassDex.Other.kt: Breakpoint 1
@@ -1,4 +1,4 @@
-package dexInlineInObject.other
+package inlineInObjectDex.other

 object TestDexInlineInObject {
    inline fun inlineFun() {
@@ -0,0 +1,7 @@
+package inlineInObjectDex
+
+fun main(args: Array<String>) {
+    inlineInObjectDex.other.TestDexInlineInObject.inlineFun()
+}
+
+// ADDITIONAL_BREAKPOINT: inlineInObjectDex.Other.kt: Breakpoint 1
@@ -1,4 +1,4 @@
-package dexStopInInlineFun
+package stopInInlineFunDex

 fun main(args: Array<String>) {
    inlineFun()
@@ -1,4 +1,4 @@
-package dexStopInInlineInOtherFile
+package stopInInlineInOtherFileDex

 inline fun inlineFun() {
    var i = 1
@@ -0,0 +1,7 @@
+package stopInInlineInOtherFileDex
+
+fun main(args: Array<String>) {
+    inlineFun()
+}
+
+// ADDITIONAL_BREAKPOINT: stopInInlineInOtherFileDex.Other.kt: Breakpoint 1
@@ -120,7 +120,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
        }

        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
-        if (getTestName(true).startsWith("dex")) {
+        if (DexLikeBytecodePatchKt.needDexPatch(getTestName(true))) {
            NoStrataPositionManagerHelperKt.setEmulateDexDebugInTests(true);
        }
        super.setUp();
@@ -188,7 +188,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {

    @Override
    protected void tearDown() throws Exception {
-        if (getTestName(true).startsWith("dex")) {
+        if (DexLikeBytecodePatchKt.needDexPatch(getTestName(true))) {
            NoStrataPositionManagerHelperKt.setEmulateDexDebugInTests(false);
        }

@@ -229,12 +229,6 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            doStepIntoTest(fileName);
        }

-        @TestMetadata("dexInline.kt")
-        public void testDexInline() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/dexInline.kt");
-            doStepIntoTest(fileName);
-        }
-
        @TestMetadata("forLoop.kt")
        public void testForLoop() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.kt");
@@ -247,6 +241,12 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            doStepIntoTest(fileName);
        }

+        @TestMetadata("inlineDex.kt")
+        public void testInlineDex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineDex.kt");
+            doStepIntoTest(fileName);
+        }
+
        @TestMetadata("inlineOnly.kt")
        public void testInlineOnly() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineOnly.kt");
@@ -391,30 +391,6 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            doStepOverTest(fileName);
        }

-        @TestMetadata("dexInlineInClass.kt")
-        public void testDexInlineInClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.kt");
-            doStepOverTest(fileName);
-        }
-
-        @TestMetadata("dexInlineInObject.kt")
-        public void testDexInlineInObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.kt");
-            doStepOverTest(fileName);
-        }
-
-        @TestMetadata("dexStopInInlineFun.kt")
-        public void testDexStopInInlineFun() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineFun.kt");
-            doStepOverTest(fileName);
-        }
-
-        @TestMetadata("dexStopInInlineInOtherFile.kt")
-        public void testDexStopInInlineInOtherFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.kt");
-            doStepOverTest(fileName);
-        }
-
        @TestMetadata("ifCapturedVariableKt9118.kt")
        public void testIfCapturedVariableKt9118() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/ifCapturedVariableKt9118.kt");
@@ -433,6 +409,12 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            doStepOverTest(fileName);
        }

+        @TestMetadata("inlineInClassDex.kt")
+        public void testInlineInClassDex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.kt");
+            doStepOverTest(fileName);
+        }
+
        @TestMetadata("inlineInIfFalse.kt")
        public void testInlineInIfFalse() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfFalse.kt");
@@ -445,6 +427,12 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            doStepOverTest(fileName);
        }

+        @TestMetadata("inlineInObjectDex.kt")
+        public void testInlineInObjectDex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.kt");
+            doStepOverTest(fileName);
+        }
+
        @TestMetadata("noParameterLambdaArgumentCallInInline.kt")
        public void testNoParameterLambdaArgumentCallInInline() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/noParameterLambdaArgumentCallInInline.kt");
@@ -618,6 +606,18 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhileWithInline.kt");
            doStepOverTest(fileName);
        }
+
+        @TestMetadata("stopInInlineFunDex.kt")
+        public void testStopInInlineFunDex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineFunDex.kt");
+            doStepOverTest(fileName);
+        }
+
+        @TestMetadata("stopInInlineInOtherFileDex.kt")
+        public void testStopInInlineInOtherFileDex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.kt");
+            doStepOverTest(fileName);
+        }
    }

    @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/filters")
@@ -715,36 +715,6 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            doCustomTest(fileName);
        }

-        @TestMetadata("dexInlineInObjectSameFile.kt")
-        public void testDexInlineInObjectSameFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexInlineInObjectSameFile.kt");
-            doCustomTest(fileName);
-        }
-
-        @TestMetadata("dexManyFilesWithInlineCalls1.kt")
-        public void testDexManyFilesWithInlineCalls1() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.kt");
-            doCustomTest(fileName);
-        }
-
-        @TestMetadata("dexManyFilesWithInlineCalls2.kt")
-        public void testDexManyFilesWithInlineCalls2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.kt");
-            doCustomTest(fileName);
-        }
-
-        @TestMetadata("dexSeveralInlineCallsFromOtherFile.kt")
-        public void testDexSeveralInlineCallsFromOtherFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineCallsFromOtherFile.kt");
-            doCustomTest(fileName);
-        }
-
-        @TestMetadata("dexSeveralInlineFunctionsInOneFile.kt")
-        public void testDexSeveralInlineFunctionsInOneFile() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineFunctionsInOneFile.kt");
-            doCustomTest(fileName);
-        }
-
        @TestMetadata("funLiteral.kt")
        public void testFunLiteral() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.kt");
@@ -781,6 +751,24 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            doCustomTest(fileName);
        }

+        @TestMetadata("inlineInObjectSameFileDex.kt")
+        public void testInlineInObjectSameFileDex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObjectSameFileDex.kt");
+            doCustomTest(fileName);
+        }
+
+        @TestMetadata("manyFilesWithInlineCalls1Dex.kt")
+        public void testManyFilesWithInlineCalls1Dex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.kt");
+            doCustomTest(fileName);
+        }
+
+        @TestMetadata("manyFilesWithInlineCalls2Dex.kt")
+        public void testManyFilesWithInlineCalls2Dex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.kt");
+            doCustomTest(fileName);
+        }
+
        @TestMetadata("severalFunLiterals.kt")
        public void testSeveralFunLiterals() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.kt");
@@ -793,6 +781,18 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
            doCustomTest(fileName);
        }

+        @TestMetadata("severalInlineCallsFromOtherFileDex.kt")
+        public void testSeveralInlineCallsFromOtherFileDex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.kt");
+            doCustomTest(fileName);
+        }
+
+        @TestMetadata("severalInlineFunctionsInOneFileDex.kt")
+        public void testSeveralInlineFunctionsInOneFileDex() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineFunctionsInOneFileDex.kt");
+            doCustomTest(fileName);
+        }
+
        @TestMetadata("simpleConditionalBreakpoint.kt")
        public void testSimpleConditionalBreakpoint() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.kt");
@@ -22,8 +22,10 @@ import java.util.*

 val DEX_BEFORE_PATCH_EXTENSION = "before_dex"

+fun String.needDexPatch() = split('.').any { it.endsWith("Dex") }
+
 fun patchDexTests(dir: File) {
-    dir.listFiles({ file -> file.isDirectory && file.name.startsWith("dex") }).forEach { dir ->
+    dir.listFiles({ file -> file.isDirectory && file.name.needDexPatch() }).forEach { dir ->
        dir.listFiles { testOutputFile -> testOutputFile.extension == "class" }.forEach(::applyDexLikePatch)
    }
 }