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

Merged supporting classes into PdeParseTreeListener.

Browse Source 
An explicit goal of @benfry is to reduce class count and this PR cleans up edits made within preproc to merge supporting classes and utility functions of PdeParseTreeListener into PdeParseTreeListener itself. This includes removal of ImportUtil per https://github.com/processing/processing4/issues/10.
This commit is contained in:
A Pottinger
2019-10-11 08:38:38 -07:00
parent d08048eca9
commit 96e4f0a203
8 changed files with 775 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
java/test/processing/mode/java/preproc/code/CodeEditOperationUtilTest.java
View File

@@ -1,103 +0,0 @@
package processing.mode.java.preproc.code;
import org.antlr.v4.runtime.BufferedTokenStream;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.TokenStream;
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 static org.junit.Assert.*;
public class CodeEditOperationUtilTest {
private TokenStreamRewriter tokenStreamRewriter;
private Token sampleStart;
private Token sampleEnd;
@Before
public void setUp() {
tokenStreamRewriter = Mockito.mock(TokenStreamRewriter.class);
sampleStart = Mockito.mock(Token.class);
Mockito.when(sampleStart.getStartIndex()).thenReturn(5);
Mockito.when(sampleStart.getText()).thenReturn("test");
sampleEnd = Mockito.mock(Token.class);
Mockito.when(sampleEnd.getStartIndex()).thenReturn(10);
Mockito.when(sampleEnd.getText()).thenReturn("testing");
}
@Test
public void createDeleteSingle() {
TextTransform.Edit edit = CodeEditOperationUtil.createDelete(sampleStart, tokenStreamRewriter);
Assert.assertNotNull(edit);
Mockito.verify(tokenStreamRewriter).delete(sampleStart);
}
@Test
public void createDeleteRange() {
TextTransform.Edit edit = CodeEditOperationUtil.createDelete(
sampleStart,
sampleEnd,
tokenStreamRewriter
);
Assert.assertNotNull(edit);
Mockito.verify(tokenStreamRewriter).delete(sampleStart, sampleEnd);
}
@Test
public void createInsertAfterLocation() {
TextTransform.Edit edit = CodeEditOperationUtil.createInsertAfter(
5,
"text",
tokenStreamRewriter
);
Assert.assertNotNull(edit);
Mockito.verify(tokenStreamRewriter).insertAfter(5, "text");
}
@Test
public void createInsertAfterToken() {
TextTransform.Edit edit = CodeEditOperationUtil.createInsertAfter(
sampleStart,
"text",
tokenStreamRewriter
);
Assert.assertNotNull(edit);
Mockito.verify(tokenStreamRewriter).insertAfter(sampleStart, "text");
}
@Test
public void createInsertBeforeToken() {
TextTransform.Edit edit = CodeEditOperationUtil.createInsertBefore(
sampleStart,
"text",
tokenStreamRewriter
);
Assert.assertNotNull(edit);
Mockito.verify(tokenStreamRewriter).insertBefore(sampleStart, "text");
}
@Test
public void createInsertBeforeLocation() {
TextTransform.Edit edit = CodeEditOperationUtil.createInsertBefore(
5,
5,
"text",
tokenStreamRewriter
);
Assert.assertNotNull(edit);
Mockito.verify(tokenStreamRewriter).insertBefore(5, "text");
}
}

17
java/test/processing/mode/java/preproc/code/PrintWriterWithEditGenTest.java
View File

@@ -6,6 +6,7 @@ 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 java.util.List;
@@ -24,7 +25,7 @@ public class PrintWriterWithEditGenTest {
@Test
public void addEmptyLineBefore() {
PrintWriterWithEditGen editGen = createGen(true);
PdeParseTreeListener.PrintWriterWithEditGen editGen = createGen(true);
editGen.addEmptyLine();
editGen.finish();
@@ -36,7 +37,7 @@ public class PrintWriterWithEditGenTest {
@Test
public void addCodeLineBefore() {
PrintWriterWithEditGen editGen = createGen(true);
PdeParseTreeListener.PrintWriterWithEditGen editGen = createGen(true);
editGen.addCodeLine("test");
editGen.finish();
@@ -48,7 +49,7 @@ public class PrintWriterWithEditGenTest {
@Test
public void addCodeBefore() {
PrintWriterWithEditGen editGen = createGen(true);
PdeParseTreeListener.PrintWriterWithEditGen editGen = createGen(true);
editGen.addCode("test");
editGen.finish();
@@ -60,7 +61,7 @@ public class PrintWriterWithEditGenTest {
@Test
public void addEmptyLineAfter() {
PrintWriterWithEditGen editGen = createGen(false);
PdeParseTreeListener.PrintWriterWithEditGen editGen = createGen(false);
editGen.addEmptyLine();
editGen.finish();
@@ -72,7 +73,7 @@ public class PrintWriterWithEditGenTest {
@Test
public void addCodeLineAfter() {
PrintWriterWithEditGen editGen = createGen(false);
PdeParseTreeListener.PrintWriterWithEditGen editGen = createGen(false);
editGen.addCodeLine("test");
editGen.finish();
@@ -84,7 +85,7 @@ public class PrintWriterWithEditGenTest {
@Test
public void addCodeAfter() {
PrintWriterWithEditGen editGen = createGen(false);
PdeParseTreeListener.PrintWriterWithEditGen editGen = createGen(false);
editGen.addCode("test");
editGen.finish();
@@ -94,8 +95,8 @@ public class PrintWriterWithEditGenTest {
Mockito.verify(tokenStreamRewriter).insertAfter(5, "test");
}
private PrintWriterWithEditGen createGen(boolean before) {
return new PrintWriterWithEditGen(
private PdeParseTreeListener.PrintWriterWithEditGen createGen(boolean before) {
return new PdeParseTreeListener.PrintWriterWithEditGen(
tokenStreamRewriter,
rewriteResultBuilder,
5,