From f0870b32360dd02aeb1706d248883639c50f6422 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 3 Oct 2018 15:53:33 -0400 Subject: [PATCH] Created test module --- build.gradle | 16 ++++++++++++++-- settings.gradle | 2 +- tests/build.gradle | 4 ++++ tests/src/test/java/Tests.java | 9 +++++++++ {packer => tools}/build.gradle | 0 .../src/io/anuke/mindustry/BundleLauncher.java | 0 .../src/io/anuke/mindustry/GenRegion.java | 0 .../src/io/anuke/mindustry/Generators.java | 0 .../src/io/anuke/mindustry/Image.java | 0 .../src/io/anuke/mindustry/ImageContext.java | 0 .../src/io/anuke/mindustry/PackerLauncher.java | 0 11 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 tests/build.gradle create mode 100644 tests/src/test/java/Tests.java rename {packer => tools}/build.gradle (100%) rename {packer => tools}/src/io/anuke/mindustry/BundleLauncher.java (100%) rename {packer => tools}/src/io/anuke/mindustry/GenRegion.java (100%) rename {packer => tools}/src/io/anuke/mindustry/Generators.java (100%) rename {packer => tools}/src/io/anuke/mindustry/Image.java (100%) rename {packer => tools}/src/io/anuke/mindustry/ImageContext.java (100%) rename {packer => tools}/src/io/anuke/mindustry/PackerLauncher.java (100%) diff --git a/build.gradle b/build.gradle index 539d6f8114..df4df532dc 100644 --- a/build.gradle +++ b/build.gradle @@ -105,7 +105,6 @@ project(":html") { apply plugin: "gwt" apply plugin: "war" - dependencies { compile project(":core") compileOnly project(":annotations") @@ -118,7 +117,20 @@ project(":html") { compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion" compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion:sources" } +} +project(":tests"){ + apply plugin: "java" + + dependencies { + compile project(":core") + testImplementation('org.junit.jupiter:junit-jupiter-api:5.1.0') + testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.1.0') + } + + test { + useJUnitPlatform() + } } project(":ios") { @@ -206,7 +218,7 @@ project(":server") { } } -project(":packer") { +project(":tools") { apply plugin: "java" dependencies { diff --git a/settings.gradle b/settings.gradle index 229cc3e27a..7a9c66207a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -include 'desktop', 'html', 'core', 'android', 'kryonet', 'server', 'ios', 'annotations', 'packer' +include 'desktop', 'html', 'core', 'android', 'kryonet', 'server', 'ios', 'annotations', 'tools', 'tests' if(System.properties["release"] == null || System.properties["release"].equals("false")){ if (new File(settingsDir, '../uCore').exists()) { diff --git a/tests/build.gradle b/tests/build.gradle new file mode 100644 index 0000000000..afd5e6ab73 --- /dev/null +++ b/tests/build.gradle @@ -0,0 +1,4 @@ +apply plugin: "java" + +sourceCompatibility = 1.8 +sourceSets.main.java.srcDirs = [ "src/" ] diff --git a/tests/src/test/java/Tests.java b/tests/src/test/java/Tests.java new file mode 100644 index 0000000000..569b52102d --- /dev/null +++ b/tests/src/test/java/Tests.java @@ -0,0 +1,9 @@ +import org.junit.jupiter.api.Test; + +public class Tests{ + + @Test + void testThings(){ + + } +} \ No newline at end of file diff --git a/packer/build.gradle b/tools/build.gradle similarity index 100% rename from packer/build.gradle rename to tools/build.gradle diff --git a/packer/src/io/anuke/mindustry/BundleLauncher.java b/tools/src/io/anuke/mindustry/BundleLauncher.java similarity index 100% rename from packer/src/io/anuke/mindustry/BundleLauncher.java rename to tools/src/io/anuke/mindustry/BundleLauncher.java diff --git a/packer/src/io/anuke/mindustry/GenRegion.java b/tools/src/io/anuke/mindustry/GenRegion.java similarity index 100% rename from packer/src/io/anuke/mindustry/GenRegion.java rename to tools/src/io/anuke/mindustry/GenRegion.java diff --git a/packer/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java similarity index 100% rename from packer/src/io/anuke/mindustry/Generators.java rename to tools/src/io/anuke/mindustry/Generators.java diff --git a/packer/src/io/anuke/mindustry/Image.java b/tools/src/io/anuke/mindustry/Image.java similarity index 100% rename from packer/src/io/anuke/mindustry/Image.java rename to tools/src/io/anuke/mindustry/Image.java diff --git a/packer/src/io/anuke/mindustry/ImageContext.java b/tools/src/io/anuke/mindustry/ImageContext.java similarity index 100% rename from packer/src/io/anuke/mindustry/ImageContext.java rename to tools/src/io/anuke/mindustry/ImageContext.java diff --git a/packer/src/io/anuke/mindustry/PackerLauncher.java b/tools/src/io/anuke/mindustry/PackerLauncher.java similarity index 100% rename from packer/src/io/anuke/mindustry/PackerLauncher.java rename to tools/src/io/anuke/mindustry/PackerLauncher.java