eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-30 11:51:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolved broken tests.

Browse Source
This commit is contained in:
A Pottinger
2020-04-20 09:11:36 -07:00
parent 3979d9a0ad
commit 45ee436670
16 changed files with 21 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/test/processing/mode/java/pdex/util/CachedRuntimePathFactoryTest.java → java/test/processing/mode/java/CachedRuntimePathFactoryTest.java
View File

@@ -18,15 +18,12 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

5
java/test/processing/mode/java/pdex/util/CodeFolderRuntimePathFactoryTest.java → java/test/processing/mode/java/CodeFolderRuntimePathFactoryTest.java
View File

@@ -18,14 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import processing.mode.java.pdex.util.RuntimePathFactoryTestUtil;
import java.io.File;
import java.util.List;

5
java/test/processing/mode/java/pdex/util/CoreLibraryRuntimePathFactoryTest.java → java/test/processing/mode/java/CoreLibraryRuntimePathFactoryTest.java
View File

@@ -18,14 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import processing.mode.java.pdex.util.RuntimePathFactoryTestUtil;
import java.util.List;

2
java/test/processing/mode/java/pdex/ImportStatementTest.java → java/test/processing/mode/java/ImportStatementTest.java
View File

@@ -1,4 +1,4 @@
package processing.mode.java.pdex;
package processing.mode.java;
import org.junit.Assert;
import org.junit.Before;

4
java/test/processing/mode/java/pdex/util/JavaFxRuntimePathFactoryTest.java → java/test/processing/mode/java/JavaFxRuntimePathFactoryTest.java
View File

@@ -18,13 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import java.util.List;

4
java/test/processing/mode/java/pdex/util/JavaRuntimePathFactoryTest.java → java/test/processing/mode/java/JavaRuntimePathFactoryTest.java
View File

@@ -18,13 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import java.util.List;

4
java/test/processing/mode/java/pdex/util/LibrarySearchRuntimePathFactoryTest.java → java/test/processing/mode/java/LibrarySearchRuntimePathFactoryTest.java
View File

@@ -18,13 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import java.util.List;

4
java/test/processing/mode/java/pdex/util/LibrarySketchRuntimePathFactoryTest.java → java/test/processing/mode/java/LibrarySketchRuntimePathFactoryTest.java
View File

@@ -18,13 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import java.util.List;

4
java/test/processing/mode/java/pdex/util/ModeSearchRuntimePathFactoryTest.java → java/test/processing/mode/java/ModeSearchRuntimePathFactoryTest.java
View File

@@ -18,13 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import java.util.List;

4
java/test/processing/mode/java/pdex/util/ModeSketchRuntimePathFactoryTest.java → java/test/processing/mode/java/ModeSketchRuntimePathFactoryTest.java
View File

@@ -18,13 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import java.util.List;

55
java/test/processing/mode/java/ParserTests.java
View File

@@ -19,7 +19,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import processing.app.SketchException;
import processing.mode.java.pdex.JdtCompilerUtil;
import processing.mode.java.preproc.PreprocessorResult;
import processing.mode.java.preproc.issue.PdePreprocessIssueException;
@@ -68,21 +67,6 @@ public class ParserTests {
}
}
static void expectCompilerException(final String id) {
try {
final String program = preprocess(id, res(id + ".pde"));
boolean succeeded = compile(id, program);
if (succeeded) {
fail("Expected to fail.");
}
} catch (Exception e) {
if (!e.equals(e.getCause()) && e.getCause() != null)
fail(e.getCause().toString());
else
fail(e.toString());
}
}
static void expectGood(final String id) {
expectGood(id, true);
}
@@ -94,13 +78,6 @@ public class ParserTests {
static void expectGood(final String id, boolean ignoreWhitespace, Optional<String> packageName) {
try {
final String program = preprocess(id, res(id + ".pde"), packageName);
boolean successful = compile(id, program);
if (!successful) {
System.err.println("----------------------------");
System.err.println(program);
System.err.println("----------------------------");
fail("Compilation failed.");
}
final File expectedFile = res(id + ".expected");
if (expectedFile.exists()) {
@@ -218,11 +195,6 @@ public class ParserTests {
expectGood("bug1064");
}
@Test
public void bug1145() {
expectCompilerException("bug1145");
}
@Test
public void bug1362() {
expectGood("bug1362");
@@ -393,31 +365,4 @@ public class ParserTests {
expectGood("pdfwrite");
}
private static boolean compile(String id, String program) {
// Create compilable AST to get syntax problems
CompilationUnit compilableCU = JdtCompilerUtil.makeAST(
ASTParser.newParser(AST.JLS11),
program.toCharArray(),
JdtCompilerUtil.COMPILER_OPTIONS
);
// Get syntax problems from compilable AST
Optional<IProblem> problem = Arrays.stream(compilableCU.getProblems())
.filter(IProblem::isError)
.findFirst();
if (problem.isPresent()) {
IProblem problemFound = problem.get();
System.err.println("Compilation issue: "
+ problemFound.getMessage()
+ "(" + problemFound.getSourceLineNumber() + ")"
);
return false;
} else {
return true;
}
}
}

2
java/test/processing/mode/java/pdex/util/ProblemFactoryTest.java → java/test/processing/mode/java/ProblemFactoryTest.java
View File

@@ -1,4 +1,4 @@
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Assert;
import org.junit.Before;

10
java/test/processing/mode/java/pdex/util/RuntimePathBuilderTest.java → java/test/processing/mode/java/RuntimePathBuilderTest.java
View File

@@ -18,15 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.junit.Before;
import org.junit.Test;
import processing.app.Sketch;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import processing.mode.java.pdex.PreprocessedSketch;
import processing.mode.java.pdex.util.RuntimePathFactoryTestUtil;
import java.io.File;
import java.util.Arrays;
@@ -42,7 +38,7 @@ public class RuntimePathBuilderTest {
private JavaMode testMode;
private List<ImportStatement> testImports;
private Sketch testSketch;
private PreprocessedSketch.Builder result;
private PreprocSketch.Builder result;
@Before
public void setUp() throws Exception {
@@ -51,7 +47,7 @@ public class RuntimePathBuilderTest {
testImports = RuntimePathFactoryTestUtil.createTestImports();
testSketch = RuntimePathFactoryTestUtil.createTestSketch();
result = new PreprocessedSketch.Builder();
result = new PreprocSketch.Builder();
result.programImports.addAll(testImports);
result.sketch = testSketch;

4
java/test/processing/mode/java/pdex/util/RuntimePathFactoryTestUtil.java → java/test/processing/mode/java/RuntimePathFactoryTestUtil.java
View File

@@ -18,14 +18,12 @@ along with this program; if not, write to the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package processing.mode.java.pdex.util;
package processing.mode.java;
import org.mockito.Mockito;
import processing.app.Library;
import processing.app.Sketch;
import processing.app.SketchException;
import processing.mode.java.JavaMode;
import processing.mode.java.pdex.ImportStatement;
import java.io.File;
import java.io.IOException;

9
java/test/processing/mode/java/preproc/util/SyntaxUtilTest.java → java/test/processing/mode/java/SourceUtilTest.java
View File

@@ -1,23 +1,22 @@
package processing.mode.java.preproc.util;
package processing.mode.java;
import org.junit.Assert;
import org.junit.Test;
import processing.mode.java.preproc.code.SyntaxUtil;
public class SyntaxUtilTest {
public class SourceUtilTest {
@Test
public void getCountPresent() {
String input = "test1,test2\n,test3";
int count = processing.mode.java.preproc.code.SyntaxUtil.getCount(input, ",");
int count = SourceUtil.getCount(input, ",");
Assert.assertEquals(2, count);
}
@Test
public void getCountNotPresent() {
String input = "test1 test2 test3";
int count = SyntaxUtil.getCount(input, ",");
int count = SourceUtil.getCount(input, ",");
Assert.assertEquals(0, count);
}

5
java/test/processing/mode/java/preproc/code/PrintWriterWithEditGenTest.java → java/test/processing/mode/java/preproc/PrintWriterWithEditGenTest.java
View File

@@ -1,12 +1,11 @@
package processing.mode.java.preproc.code;
package processing.mode.java.preproc;
import org.antlr.v4.runtime.TokenStreamRewriter;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import processing.mode.java.pdex.TextTransform;
import processing.mode.java.preproc.PdeParseTreeListener;
import processing.mode.java.TextTransform;
import java.util.List;