Skip to content

Commit

Permalink
Move testData/ to src/testData/
Browse files Browse the repository at this point in the history
  • Loading branch information
IotaBread committed Nov 22, 2021
1 parent 391c80f commit 09a61cb
Show file tree
Hide file tree
Showing 31 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
/.project
/build/
/test/
/testData/classes/
/src/testData/classes/
/bin/
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ generateGrammarSource {
sourceSets {
testData {
java {
srcDirs file("testData/src")
srcDirs file("src/testData/java")
compileClasspath = sourceSets.main.output + configurations.testCompileClasspath
runtimeClasspath = sourceSets.main.output + project.configurations.testRuntimeClasspath
}
}
}

compileTestDataJava {
destinationDir = file("testData/classes")
destinationDir = file("src/testData/classes")
sourceCompatibility = 17
targetCompatibility = 17
}
Expand Down
8 changes: 2 additions & 6 deletions src/test/java/org/quiltmc/chasm/TestsBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
Expand All @@ -13,9 +12,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand All @@ -26,7 +22,7 @@
import java.util.stream.Stream;

public abstract class TestsBase {
private static final Path TEST_DATA_DIR = Paths.get("testData");
private static final Path TEST_DATA_DIR = Paths.get("src/testData");
protected final List<TestDefinition> testDefinitions = new ArrayList<>();
protected ChasmProcessor processor;

Expand Down Expand Up @@ -85,7 +81,7 @@ protected final void registerNamed(String testClass, String name, String[] addit
}

@BeforeEach
public void setUp() throws MalformedURLException {
public void setUp() {
// Instantiate the processor
processor = new ChasmProcessor();
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 09a61cb

Please sign in to comment.