mirror of
https://github.com/processing/processing4.git
synced 2026-01-30 11:51:54 +01:00
Refactor out preproc.issue.
Removed the preproc.issue package by relocating supporting classes for PreprocessIssueMessageSimplifier and PdeIssueEmitter as inner classes. This assists with https://github.com/processing/processing4/issues/10.
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -18,19 +20,19 @@ public class AssignmentMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify(" int x =");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify(" int x =");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPresentDiamond() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify(" List<Integer> x =");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify(" List<Integer> x =");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class {");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class {");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -18,13 +20,13 @@ public class BadIdentifierMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("test(a,01a");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("test(a,01a");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class {");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class {");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -18,25 +20,25 @@ public class BadParamMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("void test (int x,\ny) \n{");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("void test (int x,\ny) \n{");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPresentUnderscore() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("void test (int x,\ny_y) \n{");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("void test (int x,\ny_y) \n{");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPresentVarType() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("void test (int x,\nint) \n{");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("void test (int x,\nint) \n{");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("int x = y");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("int x = y");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,13 +21,13 @@ public class ExtraneousInputMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("extraneous input 'test' expecting ';'");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("extraneous input 'test' expecting ';'");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -18,13 +20,13 @@ public class KnownMissingMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("missing ';' at 'addCircle'");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("missing ';' at 'addCircle'");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.PreprocessIssueMessageSimplifier;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
public class MessageSimplifierUtilTest {
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,13 +21,13 @@ public class MismatchedInputMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("mismatched input 'final' expecting {'instanceof', ';', ',', '.', '>', '<', '==', '<=', '>=', '!=', '&&', '||', '++', '--', '+', '-', '*', '/', '&', '|', '^', '%', '::'}");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("mismatched input 'final' expecting {'instanceof', ';', ',', '.', '>', '<', '==', '<=', '>=', '!=', '&&', '||', '++', '--', '+', '-', '*', '/', '&', '|', '^', '%', '::'}");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,13 +20,13 @@ public class MissingChevMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class Test <a extends {");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class Test <a extends {");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class {");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class {");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,19 +20,19 @@ public class MissingClassNameMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresentExtends() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class extends Base\n{");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class extends Base\n{");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPresentNoExtends() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class \n{");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class \n{");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("int x = y");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("int x = y");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.issue.PreprocessIssueMessageSimplifier;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -20,13 +20,13 @@ public class MissingCurlyMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class Test {");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class Test {");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class Test { }");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class Test { }");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,13 +20,13 @@ public class MissingDoubleQuoteMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("String x = \" \" \"");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("String x = \" \" \"");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,13 +20,13 @@ public class MissingGenericTypeMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("<>'");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("<>'");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class {");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class {");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,13 +21,13 @@ public class MissingIdentifierMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("Missing identifier at ';'");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("Missing identifier at ';'");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("String x = \" \\\" \"");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,25 +20,25 @@ public class MissingMethodNameMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("void (int x) \n{");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("void (int x) \n{");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPresentNoSpace() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("test(int x) \n{");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("test(int x) \n{");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPresentUnderscore() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("void (int x_y) \n{");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("void (int x_y) \n{");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("int x = y");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("int x = y");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,13 +20,13 @@ public class MissingParenMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("int x = ((5 + 4) / 3");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("int x = ((5 + 4) / 3");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("int x = (y/5)/(\n4)");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("int x = (y/5)/(\n4)");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -18,13 +19,13 @@ public class MissingSingleQuoteMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("char x = '");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("char x = '");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("char x = '\\''");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("char x = '\\''");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package processing.mode.java.preproc.issue;
|
||||
package processing.mode.java.preproc;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@@ -19,13 +20,13 @@ public class MissingVariableNameMessageSimplifierStrategyTest {
|
||||
|
||||
@Test
|
||||
public void testPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("char = ';");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("char = ';");
|
||||
Assert.assertTrue(msg.isPresent());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNotPresent() {
|
||||
Optional<IssueMessageSimplification> msg = strategy.simplify("class test {");
|
||||
Optional<PdeIssueEmitter.IssueMessageSimplification> msg = strategy.simplify("class test {");
|
||||
Assert.assertTrue(msg.isEmpty());
|
||||
}
|
||||
|
||||
@@ -3,15 +3,13 @@ package processing.mode.java.preproc.util;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.IssueLocation;
|
||||
import processing.mode.java.preproc.issue.IssueLocationFactory;
|
||||
import processing.mode.java.preproc.issue.IssueMessageSimplification;
|
||||
import processing.mode.java.preproc.PdeIssueEmitter;
|
||||
|
||||
|
||||
public class IssueLocationFactoryTest {
|
||||
|
||||
private String source;
|
||||
private IssueLocation issueLocation;
|
||||
private PdeIssueEmitter.IssueLocation issueLocation;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
@@ -33,8 +31,8 @@ public class IssueLocationFactoryTest {
|
||||
|
||||
@Test
|
||||
public void getLineWithOffsetApplies() {
|
||||
issueLocation = IssueLocationFactory.getLineWithOffset(
|
||||
new IssueMessageSimplification("test message", true),
|
||||
issueLocation = PdeIssueEmitter.IssueLocationFactory.getLineWithOffset(
|
||||
new PdeIssueEmitter.IssueMessageSimplification("test message", true),
|
||||
15,
|
||||
0,
|
||||
source
|
||||
@@ -46,8 +44,8 @@ public class IssueLocationFactoryTest {
|
||||
|
||||
@Test
|
||||
public void getLineWithOffsetNotApplies() {
|
||||
issueLocation = IssueLocationFactory.getLineWithOffset(
|
||||
new IssueMessageSimplification("test message", false),
|
||||
issueLocation = PdeIssueEmitter.IssueLocationFactory.getLineWithOffset(
|
||||
new PdeIssueEmitter.IssueMessageSimplification("test message", false),
|
||||
15,
|
||||
0,
|
||||
source
|
||||
@@ -59,8 +57,8 @@ public class IssueLocationFactoryTest {
|
||||
|
||||
@Test
|
||||
public void getLineWithOffsetEndWhite() {
|
||||
issueLocation = IssueLocationFactory.getLineWithOffset(
|
||||
new IssueMessageSimplification("test message", true),
|
||||
issueLocation = PdeIssueEmitter.IssueLocationFactory.getLineWithOffset(
|
||||
new PdeIssueEmitter.IssueMessageSimplification("test message", true),
|
||||
14,
|
||||
0,
|
||||
"\n\n\n\n\n\n\n\n\n\n\nnoFill()\nellipse(50,50,50,50)\n"
|
||||
|
||||
@@ -2,7 +2,7 @@ package processing.mode.java.preproc.util;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import processing.mode.java.preproc.issue.PreprocessIssueMessageSimplifier;
|
||||
import processing.mode.java.preproc.PreprocessIssueMessageSimplifier;
|
||||
|
||||
|
||||
public class PreprocessIssueMessageSimplifierTest {
|
||||
|
||||
Reference in New Issue
Block a user