diff --git a/codeOptimizers/build.gradle b/codeOptimizers/build.gradle index 52e4faeae..2786568b4 100644 --- a/codeOptimizers/build.gradle +++ b/codeOptimizers/build.gradle @@ -16,12 +16,6 @@ dependencies { implementation project(':compilerAst') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" - - testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2' - testImplementation 'org.hamcrest:hamcrest:2.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2' - } sourceSets { @@ -33,22 +27,6 @@ sourceSets { srcDirs = ["${project.projectDir}/res"] } } - test { - java { - srcDirs = ["${project.projectDir}/test"] - } - } } -test { - // Enable JUnit 5 (Gradle 4.6+). - useJUnitPlatform() - - // Always run tests, even when nothing changed. - dependsOn 'cleanTest' - - // Show test results. - testLogging { - events "skipped", "failed" - } -} +// note: there are no unit tests in this module! diff --git a/codeOptimizers/codeOptimizers.iml b/codeOptimizers/codeOptimizers.iml index 589fe3d9b..a6dcf5f56 100644 --- a/codeOptimizers/codeOptimizers.iml +++ b/codeOptimizers/codeOptimizers.iml @@ -12,7 +12,5 @@ - - \ No newline at end of file diff --git a/codeOptimizers/test/readme.txt b/codeOptimizers/readme-tests.txt similarity index 52% rename from codeOptimizers/test/readme.txt rename to codeOptimizers/readme-tests.txt index c697d3e9d..b97671511 100644 --- a/codeOptimizers/test/readme.txt +++ b/codeOptimizers/readme-tests.txt @@ -1,2 +1,2 @@ Unittests for things in this module are located in the Compiler module instead, -for convenience sake - and to not spread the test cases around too much. +for convenience sake, and to not spread the test cases around too much. diff --git a/compilerInterfaces/build.gradle b/compilerInterfaces/build.gradle index dc55d631d..410bf26ae 100644 --- a/compilerInterfaces/build.gradle +++ b/compilerInterfaces/build.gradle @@ -15,12 +15,6 @@ dependencies { implementation project(':compilerAst') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" - - testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2' - testImplementation 'org.hamcrest:hamcrest:2.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2' - } sourceSets { @@ -32,23 +26,6 @@ sourceSets { srcDirs = ["${project.projectDir}/res"] } } - test { - java { - srcDirs = ["${project.projectDir}/test"] - } - } } - -test { - // Enable JUnit 5 (Gradle 4.6+). - useJUnitPlatform() - - // Always run tests, even when nothing changed. - dependsOn 'cleanTest' - - // Show test results. - testLogging { - events "skipped", "failed" - } -} +// note: there are no unit tests in this module! diff --git a/compilerInterfaces/compilerInterfaces.iml b/compilerInterfaces/compilerInterfaces.iml index dd702955a..949d98b7a 100644 --- a/compilerInterfaces/compilerInterfaces.iml +++ b/compilerInterfaces/compilerInterfaces.iml @@ -11,7 +11,5 @@ - - \ No newline at end of file diff --git a/compilerInterfaces/test/readme.txt b/compilerInterfaces/readme-tests.txt similarity index 52% rename from compilerInterfaces/test/readme.txt rename to compilerInterfaces/readme-tests.txt index c697d3e9d..b97671511 100644 --- a/compilerInterfaces/test/readme.txt +++ b/compilerInterfaces/readme-tests.txt @@ -1,2 +1,2 @@ Unittests for things in this module are located in the Compiler module instead, -for convenience sake - and to not spread the test cases around too much. +for convenience sake, and to not spread the test cases around too much. diff --git a/docs/source/todo.rst b/docs/source/todo.rst index 2383a1f05..862d7a33a 100644 --- a/docs/source/todo.rst +++ b/docs/source/todo.rst @@ -5,6 +5,7 @@ For next compiler release (7.3) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - replace all old asserts in compilerAst tests by kotest equivalents - remove kotlin.test and junit dependencies in compilerAst module +- migrate Compiler tests to KoTest library (this will close github issue #70) ... @@ -17,7 +18,6 @@ Blocked by Commander-x16 v39 release Future ^^^^^^ - fix the asm-labels problem (github issue #62) -- start migrating to KoTest library (github issue #70) - find a way to optimize asm-subroutine param passing where it now sometimes uses the evalstack? - [complicated?] find a way to optimize if-statement codegen so that "if var & %10000" doesn't use evalstack & subroutine call, but also that the simple case "if X {...}" remains fast - document the various compiler command line options in more detail. See "Compiling program code" in the docs