From 303a6ffe462d8124db36e806c68d3e176a58e739 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Fri, 15 Jul 2016 10:22:50 +0300 Subject: [PATCH] translator: add tests, fix test framework --- translator/{run.sh => run_tests.sh} | 5 +++++ translator/src/test/kotlin/tests/input/if_1.txt | 2 ++ translator/src/test/kotlin/tests/input/while_1.txt | 1 + translator/src/test/kotlin/tests/output/if_1.txt | 2 ++ translator/src/test/kotlin/tests/output/while_1.txt | 1 + translator/src/test/kotlin/tests/source/if_1.kt | 9 +++++++++ translator/src/test/kotlin/tests/source/while_1.kt | 8 ++++++++ 7 files changed, 28 insertions(+) rename translator/{run.sh => run_tests.sh} (92%) create mode 100644 translator/src/test/kotlin/tests/input/if_1.txt create mode 100644 translator/src/test/kotlin/tests/input/while_1.txt create mode 100644 translator/src/test/kotlin/tests/output/if_1.txt create mode 100644 translator/src/test/kotlin/tests/output/while_1.txt create mode 100644 translator/src/test/kotlin/tests/source/if_1.kt create mode 100644 translator/src/test/kotlin/tests/source/while_1.kt diff --git a/translator/run.sh b/translator/run_tests.sh similarity index 92% rename from translator/run.sh rename to translator/run_tests.sh index 10b7baad87f..52ed393f11a 100755 --- a/translator/run.sh +++ b/translator/run_tests.sh @@ -1,3 +1,8 @@ +if [ ! -d "src/test/kotlin/tests/linked" ]; then + # Создать папку, только если ее не было + mkdir src/test/kotlin/tests/linked +fi + rm -f src/test/kotlin/tests/linked/* /usr/lib/jvm/default-java/bin/java -Didea.launcher.port=7540 -Didea.launcher.bin.path=/opt/idea-IU-145.1617.8/bin -Dfile.encoding=UTF-8 -classpath /usr/lib/jvm/default-java/jre/lib/charsets.jar:/usr/lib/jvm/default-java/jre/lib/ext/cldrdata.jar:/usr/lib/jvm/default-java/jre/lib/ext/dnsns.jar:/usr/lib/jvm/default-java/jre/lib/ext/icedtea-sound.jar:/usr/lib/jvm/default-java/jre/lib/ext/jaccess.jar:/usr/lib/jvm/default-java/jre/lib/ext/localedata.jar:/usr/lib/jvm/default-java/jre/lib/ext/nashorn.jar:/usr/lib/jvm/default-java/jre/lib/ext/sunec.jar:/usr/lib/jvm/default-java/jre/lib/ext/sunjce_provider.jar:/usr/lib/jvm/default-java/jre/lib/ext/sunpkcs11.jar:/usr/lib/jvm/default-java/jre/lib/ext/zipfs.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/jsse.jar:/usr/lib/jvm/default-java/jre/lib/management-agent.jar:/usr/lib/jvm/default-java/jre/lib/resources.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/home/user/Kotlin/carkot/translator/build/classes/test:/home/user/Kotlin/carkot/translator/build/classes/main:/home/user/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.0.1/68cddd9aec83d23f789f72bfdc933db245c4a635/kotlin-stdlib-1.0.1.jar:/home/user/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler/1.0.3/5dbeb14062996a5c2208861d6364cc97a21b06b8/kotlin-compiler-1.0.3.jar:/home/user/.gradle/caches/modules-2/files-2.1/junit/junit/4.11/4e031bb61df09069aeb2bffb4019e7a5034a4ee0/junit-4.11.jar:/home/user/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-runtime/1.0.1/124852ea8cdd3d89827923b5e79627e8a7c314b2/kotlin-runtime-1.0.1.jar:/home/user/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/opt/idea-IU-145.1617.8/lib/idea_rt.jar com.intellij.rt.execution.application.AppMain TestmainKt diff --git a/translator/src/test/kotlin/tests/input/if_1.txt b/translator/src/test/kotlin/tests/input/if_1.txt new file mode 100644 index 00000000000..8997171aa47 --- /dev/null +++ b/translator/src/test/kotlin/tests/input/if_1.txt @@ -0,0 +1,2 @@ +if_test_1(11) +if_test_1(0) \ No newline at end of file diff --git a/translator/src/test/kotlin/tests/input/while_1.txt b/translator/src/test/kotlin/tests/input/while_1.txt new file mode 100644 index 00000000000..64b173c0c49 --- /dev/null +++ b/translator/src/test/kotlin/tests/input/while_1.txt @@ -0,0 +1 @@ +while_test_1(6) \ No newline at end of file diff --git a/translator/src/test/kotlin/tests/output/if_1.txt b/translator/src/test/kotlin/tests/output/if_1.txt new file mode 100644 index 00000000000..0737472aa13 --- /dev/null +++ b/translator/src/test/kotlin/tests/output/if_1.txt @@ -0,0 +1,2 @@ +10 +0 \ No newline at end of file diff --git a/translator/src/test/kotlin/tests/output/while_1.txt b/translator/src/test/kotlin/tests/output/while_1.txt new file mode 100644 index 00000000000..9a037142aa3 --- /dev/null +++ b/translator/src/test/kotlin/tests/output/while_1.txt @@ -0,0 +1 @@ +10 \ No newline at end of file diff --git a/translator/src/test/kotlin/tests/source/if_1.kt b/translator/src/test/kotlin/tests/source/if_1.kt new file mode 100644 index 00000000000..fa035e98cf7 --- /dev/null +++ b/translator/src/test/kotlin/tests/source/if_1.kt @@ -0,0 +1,9 @@ +fun if_test_1(x: Int): Int { + var a = 0 + if (x > 5) { + a = 10 + } else { + + } + return a +} \ No newline at end of file diff --git a/translator/src/test/kotlin/tests/source/while_1.kt b/translator/src/test/kotlin/tests/source/while_1.kt new file mode 100644 index 00000000000..7a5836cf05c --- /dev/null +++ b/translator/src/test/kotlin/tests/source/while_1.kt @@ -0,0 +1,8 @@ +fun while_test_1(x: Int): Int { + var a = 5 + while (2 < 3) { + a = 10 + return a + } + return 5 +} \ No newline at end of file