src/dev/peerat/parser/ElementBuilder.java

@@ -31,15 +31,14 @@ public interface ElementBuilder{
 			int character = 1;
 			int line = 1;
 			for(Token token : tokens){
-				while(line < token.getLineNumber()){
-					writer.write("\n");
-					line++;
-				}
 				while(character < token.getCharacterNumber()){
 					writer.write(" ");
 					character++;
 				}
-	
+				while(line < token.getLineNumber()){
+					writer.write("\n");
+					line++;
+				}
 				writer.write(token.getValue());
 				character+=token.getValue().length();
 			}

src/dev/peerat/parser/java/JavaParser.java

@@ -32,13 +32,11 @@ import dev.peerat.parser.java.Variable.VariableContainer;
 import dev.peerat.parser.java.operation.AssignOperation;
 import dev.peerat.parser.java.operation.BreakOperation;
 import dev.peerat.parser.java.operation.ContinueOperation;
-import dev.peerat.parser.java.operation.ForOperation;
 import dev.peerat.parser.java.operation.IfOperation;
 import dev.peerat.parser.java.operation.MethodCallOperation;
 import dev.peerat.parser.java.operation.ReturnOperation;
 import dev.peerat.parser.java.operation.SynchronizedOperation;
 import dev.peerat.parser.java.operation.ThrowOperation;
-import dev.peerat.parser.java.operation.WhileOperation;
 import dev.peerat.parser.state.BuilderStateTree;
 import dev.peerat.parser.state.InitialStateTree;
 import dev.peerat.parser.state.RedirectStateTree;
@@ -680,10 +678,35 @@ public class JavaParser extends Parser<JavaElement> {
 		
 		//OPERATION
 		StateTree<JavaElement> operation = new StateTree<>();
+		StateTree<JavaElement> operation_name = operation.then(new RedirectStateTree<>(value_container, (global, local) -> global.set(local.get())));
+		operation_name.then((validator) -> validator.validate((token) -> token.getValue().equals(";"))).end((parent,bag) -> {
+			Value action = bag.get();
+			if(action instanceof BiValue){
+				BiValue assign = (BiValue)action;
+				AssignOperation op = new AssignOperation(assign.left(), assign.right());
+				if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
+			}
+			if(action instanceof MethodCallValue){
+				MethodCallValue call = (MethodCallValue)action;
+				MethodCallOperation op = new MethodCallOperation((Value)null, call.getToken(), call.getParameters());
+				if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
+			}
+			return null;
+		});
 //		operation_name.then((validator) -> validator.validate((token) -> token.getValue().equals("=")))
 //			.then(new RedirectStateTree<>(value_container, (global, local) -> global.set("newer", local.get())))
 //			.then((validator) -> validator.validate((token) -> token.getValue().equals(";")))
 //			.end((parent, bag) -> parent);
+		StateTree<JavaElement> operation_call = operation_name.then((validator) -> validator.validate((token) -> token.getValue().equals(".")));
+		operation_call.then(operation_name);
+		StateTree<JavaElement> operation_begin = operation_name.then((validator) -> validator.validate((token) -> token.getValue().equals("(")));
+		StateTree<JavaElement> operation_end = operation_begin.then((validator) -> validator.validate((token) -> token.getValue().equals(")")));
+		operation_end.then(operation_call);
+		operation_end.then((validator) -> validator.validate((token) -> token.getValue().equals(";")))
+			.end((a,b) -> a);
+		StateTree<JavaElement> operation_value = operation_begin.then(new RedirectStateTree<>(value_container, (global, local) -> global.set(null)));
+		operation_value.then(operation_end);
+		operation_value.then((validator) -> validator.validate((token) -> token.getValue().equals(","))).then(operation_value);
 		
 		StateTree<JavaElement> operation_return = operation.then((validator) -> validator.validate((token) -> token.getValue().equals("return")));
 		operation_return.then(new RedirectStateTree<>(value_container, (global, local) -> global.set(local.get())))
@@ -758,6 +781,7 @@ public class JavaParser extends Parser<JavaElement> {
 			.end((a,b) -> a);
 		operation_catch.then(operation_finally);
 		operation_catch.then(operation_catch_named);
+			
 		
 		operation.then((validator) -> validator.validate((token) -> token.getValue().equals("continue")))
 			.then((validator) -> validator.validate((token) -> token.getValue().equals(";")))
@@ -770,7 +794,6 @@ public class JavaParser extends Parser<JavaElement> {
 		operation.then((validator) -> validator.validate((token) -> token.getValue().equals("break")))
 			.then((validator) -> validator.validate((token) -> token.getValue().equals(";")))
 			.end((parent,bag) -> {
-				System.out.println("break");
 				BreakOperation op = new BreakOperation();
 				if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
 				return null;
@@ -851,19 +874,10 @@ public class JavaParser extends Parser<JavaElement> {
 			.then(operation_for_second_part);
 		
 		StateTree<JavaElement> operation_for_end = operation_for_second_part.then((validator) -> validator.validate((token) -> token.getValue().equals(")")));
-		operation_for_end.<JavaElement>end((parent,bag) -> {
-			ForOperation op = new ForOperation(null, null, null, null);
-			if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
-			System.out.println("FOOOR");
-			return op;
-		}).then(operation);
+		operation_for_end.end((a,b) -> a);
 
 		operation_for_end.then((validator) -> validator.validate((token) -> token.getValue().equals("{")))
-			.<JavaElement>end((parent,bag) -> {
-				ForOperation op = new ForOperation(null, null, null, null);
-				if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
-				return op;
-			})
+			.end((a,b) -> a)
 			.multiple(function_container)
 			.unique((validator) -> validator.validate((token) -> token.getValue().equals("}")))
 			.end((a,b) -> a);
@@ -882,20 +896,16 @@ public class JavaParser extends Parser<JavaElement> {
 			.then(new RedirectStateTree<>(value_container, (global, local) -> global.set(null)))
 			.then((validator) -> validator.validate((token) -> token.getValue().equals(")")));
 		operation_while.then((validator) -> validator.validate((token) -> token.getValue().equals("{")))
-			.<JavaElement>end((parent,bag) -> {
-				WhileOperation op = new WhileOperation(null);
-				if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
-				return op;
-			})
+			.end((a,b) -> a)
 			.multiple(function_container)
 			.unique((validator) -> validator.validate((token) -> token.getValue().equals("}")))
 			.end((a,b) -> a);
 		
-		operation_while.<JavaElement>end((parent,bag) -> {
-			WhileOperation op = new WhileOperation(null);
-			if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
-			return op;
-		}).then(operation);
+		operation_while.then(new RedirectStateTree<>(operation, (global, local) -> global.set(null)))
+			.end((a,b) -> a);
+		
+		operation_while.then((validator) -> validator.validate((token) -> token.getValue().equals(";")))
+		.end((a,b) -> a);
 		
 		operation.then((validator) -> validator.validate((token) -> token.getValue().equals("synchronized")))
 			.then((validator) -> validator.validate((token) -> token.getValue().equals("(")))
@@ -911,33 +921,6 @@ public class JavaParser extends Parser<JavaElement> {
 			.unique((validator) -> validator.validate((token) -> token.getValue().equals("}")))
 			.end((a,b) -> a);
 		
-		StateTree<JavaElement> operation_name = operation.then(new RedirectStateTree<>(value_container, (global, local) -> global.set(local.get())));
-		operation_name.then((validator) -> validator.validate((token) -> token.getValue().equals(";"))).end((parent,bag) -> {
-			Value action = bag.get();
-			if(action instanceof BiValue){
-				BiValue assign = (BiValue)action;
-				AssignOperation op = new AssignOperation(assign.left(), assign.right());
-				if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
-			}
-			if(action instanceof MethodCallValue){
-				MethodCallValue call = (MethodCallValue)action;
-				MethodCallOperation op = new MethodCallOperation((Value)null, call.getToken(), call.getParameters());
-				if(parent instanceof OperationContainer) ((OperationContainer)parent).addOperation(op);
-			}
-			return null;
-		});
-		
-		StateTree<JavaElement> operation_call = operation_name.then((validator) -> validator.validate((token) -> token.getValue().equals(".")));
-		operation_call.then(operation_name);
-		StateTree<JavaElement> operation_begin = operation_name.then((validator) -> validator.validate((token) -> token.getValue().equals("(")));
-		StateTree<JavaElement> operation_end = operation_begin.then((validator) -> validator.validate((token) -> token.getValue().equals(")")));
-		operation_end.then(operation_call);
-		operation_end.then((validator) -> validator.validate((token) -> token.getValue().equals(";")))
-			.end((a,b) -> a);
-		StateTree<JavaElement> operation_value = operation_begin.then(new RedirectStateTree<>(value_container, (global, local) -> global.set(null)));
-		operation_value.then(operation_end);
-		operation_value.then((validator) -> validator.validate((token) -> token.getValue().equals(","))).then(operation_value);
-		
 		function_container.then(variable);
 		function_container.then(operation);
 		
@@ -977,7 +960,6 @@ public class JavaParser extends Parser<JavaElement> {
 				(token) -> token.getType().equals(TokenType.NAME),
 				(bag, token) -> bag.set("name", token)));
 		function_type.then(function_name);
-		function_mod.then(function_name);
 		StateTree<JavaElement> function_begin = function_name.then((validator) -> validator.validate((token) -> token.getValue().equals("(")));
 		StateTree<JavaElement> function_end = function_begin.then((validator) -> validator.validate((token) -> token.getValue().equals(")")));
 		function_end.then((validator) -> validator.validate((token) -> token.getValue().equals("{")))

src/dev/peerat/parser/java/operation/OperationBag.java

@@ -27,10 +27,6 @@ public class OperationBag extends Operation implements VariableContainer, Operat
 	public void addOperation(Operation operation){
 		this.elements.add(operation);
 	}
-	
-	public List<JavaElement> getElements(){
-		return this.elements;
-	}
 
 	@Override
 	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){

test/dev/peerat/parser/java/ClassTests.java

@@ -89,9 +89,9 @@ public class ClassTests{
 		return result;
 	}
 
-//	@Test
-//	void main() throws Exception{
-//		JavaElement result = testCase("public static class Test extends MyTest<List<String>> implements Ahbon{}");
-//	}
+	@Test
+	void main() throws Exception{
+		JavaElement result = testCase("public static class Test extends MyTest<List<String>> implements Ahbon{}");
+	}
 
 }

test/dev/peerat/parser/java/FunctionTests.java

@@ -149,9 +149,9 @@ public class FunctionTests {
 		return result;
 	}
 	
-//	@Test
-//	void main() throws Exception{
-//		JavaElement result = testCase("public static void main(String[] args){}");
-//	}
+	@Test
+	void main() throws Exception{
+		JavaElement result = testCase("public static void main(String[] args){}");
+	}
 
 }

test/dev/peerat/parser/java/OperationTests.java

@@ -427,10 +427,10 @@ public class OperationTests {
 		testCase("throw e;");
 	}
 	
-//	@Test
-//	void tryOp() throws Exception{
-//		testCase("try(Test test = new Test()){}");
-//	}
+	@Test
+	void tryOp() throws Exception{
+		testCase("try(Test test = new Test()){}");
+	}
 	
 	@Test
 	void whileOp() throws Exception{

test/dev/peerat/parser/java/element/BaseElementTests.java

@@ -6,6 +6,7 @@ import static org.junit.Assert.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import org.junit.jupiter.api.Test;
 
@@ -13,41 +14,32 @@ import dev.peerat.parser.Parser;
 import dev.peerat.parser.java.Class;
 import dev.peerat.parser.java.ClassBase;
 import dev.peerat.parser.java.Enumeration;
-import dev.peerat.parser.java.Function;
 import dev.peerat.parser.java.Interface;
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.JavaFile;
 import dev.peerat.parser.java.JavaParser;
-import dev.peerat.parser.java.Operation;
-import dev.peerat.parser.java.Variable;
 
 public class BaseElementTests{
 	
 	private int size;
-	private List<String> texts = new ArrayList<>();
+	private List<Supplier<String>> texts = new ArrayList<>();
 	private List<Consumer<JavaFile>> checkers = new ArrayList<>();
 	
-	public void register(String text, Consumer<JavaFile> checker){
+	public void register(Supplier<String> text, Consumer<JavaFile> checker){
 		this.texts.add(text);
 		this.checkers.add(checker);
 		this.size++;
 	}
 	
 	@Test
-	void main(){
-		String text = null;
-		try{
-			Parser<JavaElement> parser = new JavaParser();
-			for(int i = 0; i < size; i++){
-				JavaFile javaFile = new JavaFile();
-				parser.parse((text = texts.get(i)), javaFile);
-				checkers.get(i).accept(javaFile);
-			}
-			System.out.println("["+getClass().getSimpleName()+"] passed "+size+" tests");
-		}catch(Exception|AssertionError e){
-			System.err.println("["+getClass().getSimpleName()+"] failed "+text+" for cause "+e.getMessage());
-			e.printStackTrace();
+	void main() throws Exception{
+		Parser<JavaElement> parser = new JavaParser();
+		for(int i = 0; i < size; i++){
+			JavaFile javaFile = new JavaFile();
+			parser.parse(texts.get(i).get(), javaFile);
+			checkers.get(i).accept(javaFile);
 		}
+		System.out.println("passed "+size+" tests");
 	}
 
 	public Class checkClass(JavaFile javafile){
@@ -70,22 +62,4 @@ public class BaseElementTests{
 		assertTrue(clazzb instanceof Enumeration);
 		return (Enumeration)clazzb;
 	}
-	
-	public Function checkFunction(JavaElement element){
-		assertNotNull(element);
-		assertTrue(element instanceof Function);
-		return (Function)element;
-	}
-	
-	public Variable checkVariable(JavaElement element){
-		assertNotNull(element);
-		assertTrue(element instanceof Variable);
-		return (Variable)element;
-	}
-	
-	public Operation checkOperation(JavaElement element){
-		assertNotNull(element);
-		assertTrue(element instanceof Operation);
-		return (Operation)element;
-	}
 }

test/dev/peerat/parser/java/element/CITests.java

@@ -1,57 +0,0 @@
-package dev.peerat.parser.java.element;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import dev.peerat.parser.java.element.annotation.ClazzAnnotation;
-import dev.peerat.parser.java.element.clazz.ClazzWithExtend;
-import dev.peerat.parser.java.element.clazz.ClazzWithExtendsAndImplements;
-import dev.peerat.parser.java.element.clazz.ClazzWithImplements;
-import dev.peerat.parser.java.element.clazz.ClazzWithMod;
-import dev.peerat.parser.java.element.clazz.ClazzWithoutMod;
-import dev.peerat.parser.java.element.clazz.EnumWithImplements;
-import dev.peerat.parser.java.element.clazz.EnumWithMod;
-import dev.peerat.parser.java.element.clazz.EnumWithoutMod;
-import dev.peerat.parser.java.element.clazz.InterfaceWithExtends;
-import dev.peerat.parser.java.element.clazz.InterfaceWithMod;
-import dev.peerat.parser.java.element.clazz.InterfaceWithoutMod;
-import dev.peerat.parser.java.element.function.ConstructorFunction;
-import dev.peerat.parser.java.element.function.NormalFunction;
-import dev.peerat.parser.java.element.function.StaticFunction;
-import dev.peerat.parser.java.element.operation.AssignOperationTest;
-import dev.peerat.parser.java.element.operation.LoopOperationTests;
-import dev.peerat.parser.java.element.variable.VariableInClass;
-import dev.peerat.parser.java.element.variable.VariableInMethod;
-
-public class CITests{
-	
-	List<BaseElementTests> TESTS = Arrays.asList(
-			new ClazzAnnotation(),
-			new ClazzWithExtend(),
-			new ClazzWithExtendsAndImplements(),
-			new ClazzWithImplements(),
-			new ClazzWithMod(),
-			new ClazzWithoutMod(),
-			new EnumWithImplements(),
-			new EnumWithMod(),
-			new EnumWithoutMod(),
-			new InterfaceWithExtends(), 
-			new InterfaceWithMod(),
-			new InterfaceWithoutMod(),
-			new ConstructorFunction(),
-			new StaticFunction(),
-			new NormalFunction(),
-			new VariableInClass(),
-			new VariableInMethod(),
-			new AssignOperationTest(),
-			new LoopOperationTests()
-			);
-	
-	@Test
-	void main(){
-		for(BaseElementTests test : TESTS) test.main();
-	}
-
-}

test/dev/peerat/parser/java/element/annotation/ClazzAnnotation.java

@@ -22,10 +22,10 @@ public class ClazzAnnotation extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "@Test "
-				+ "public static class Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "@Test "
+					+ "public static class Test{}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<Annotation> annotations = clazz.getAnnotations();
@@ -37,10 +37,10 @@ public class ClazzAnnotation extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "@be.jeffcheasey88.Test "
-				+ "public static class Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "@be.jeffcheasey88.Test "
+					+ "public static class Test{}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<Annotation> annotations = clazz.getAnnotations();
@@ -52,10 +52,10 @@ public class ClazzAnnotation extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "@Test() "
-				+ "public static class Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "@Test() "
+					+ "public static class Test{}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<Annotation> annotations = clazz.getAnnotations();
@@ -67,10 +67,10 @@ public class ClazzAnnotation extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "@Test(\"Hello\") "
-				+ "public static class Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "@Test(\"Hello\") "
+					+ "public static class Test{}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<Annotation> annotations = clazz.getAnnotations();
@@ -88,10 +88,10 @@ public class ClazzAnnotation extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "@Test(offset=8) "
-				+ "public static class Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "@Test(offset=8) "
+					+ "public static class Test{}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<Annotation> annotations = clazz.getAnnotations();
@@ -107,10 +107,10 @@ public class ClazzAnnotation extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "@Test(offset=8,concat=\",\") "
-				+ "public static class Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "@Test(offset=8,concat=\",\") "
+					+ "public static class Test{}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<Annotation> annotations = clazz.getAnnotations();
@@ -123,10 +123,10 @@ public class ClazzAnnotation extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "@Test "
-				+ "public static interface Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "@Test "
+					+ "public static interface Test{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);
@@ -141,10 +141,10 @@ public class ClazzAnnotation extends BaseElementTests{
 				});
 
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "@Test "
-				+ "public static enum Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "@Test "
+					+ "public static enum Test{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/ClazzWithExtend.java

@@ -4,8 +4,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.jupiter.api.Test;
-
 import dev.peerat.parser.java.Class;
 import dev.peerat.parser.java.ClassBase;
 import dev.peerat.parser.java.element.BaseElementTests;
@@ -14,9 +12,9 @@ public class ClazzWithExtend extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public class Test extends MyTest{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public class Test extends MyTest{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/ClazzWithExtendsAndImplements.java

@@ -12,9 +12,9 @@ public class ClazzWithExtendsAndImplements extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public class Test extends MyBigTest implements MyTest{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public class Test extends MyBigTest implements MyTest{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/ClazzWithImplements.java

@@ -12,9 +12,9 @@ public class ClazzWithImplements extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public class Test implements MyTest{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public class Test implements MyTest{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/ClazzWithMod.java

@@ -12,9 +12,9 @@ public class ClazzWithMod extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/ClazzWithoutMod.java

@@ -12,9 +12,9 @@ public class ClazzWithoutMod extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "class Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "class Test{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/EnumWithImplements.java

@@ -13,9 +13,9 @@ public class EnumWithImplements extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public enum Test implements MyTest{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public enum Test implements MyTest{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/EnumWithMod.java

@@ -13,9 +13,9 @@ public class EnumWithMod extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final enum Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final enum Test{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/EnumWithoutMod.java

@@ -12,9 +12,9 @@ public class EnumWithoutMod extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "enum Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "enum Test{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/InterfaceWithExtends.java

@@ -12,9 +12,9 @@ public class InterfaceWithExtends extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public interface Test extends MyTest{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public interface Test extends MyTest{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/InterfaceWithMod.java

@@ -13,9 +13,9 @@ public class InterfaceWithMod extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final interface Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final interface Test{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/clazz/InterfaceWithoutMod.java

@@ -12,9 +12,9 @@ public class InterfaceWithoutMod extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "interface Test{}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "interface Test{}",
 				(javafile) -> {
 					ClassBase clazzb = javafile.getMainClass();
 					assertNotNull(clazzb);

test/dev/peerat/parser/java/element/function/ConstructorFunction.java

@@ -1,151 +0,0 @@
-package dev.peerat.parser.java.element.function;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.lang.reflect.Modifier;
-import java.util.List;
-
-import dev.peerat.parser.java.Class;
-import dev.peerat.parser.java.Function;
-import dev.peerat.parser.java.JavaElement;
-import dev.peerat.parser.java.Variable;
-import dev.peerat.parser.java.element.BaseElementTests;
-
-public class ConstructorFunction extends BaseElementTests{
-	
-	{
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    Test(){}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertNotNull(function.getName());
-					assertEquals(function.getName().getValue(), function.getReturnType().getValue());
-					assertEquals(0, function.getElements().size());
-					assertEquals(0, function.getModifier());
-					assertNull(function.getParameters());
-				});
-	
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    public Test(){}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertNotNull(function.getName());
-					assertEquals(0, function.getElements().size());
-					assertEquals(Modifier.PUBLIC, function.getModifier());
-					assertNull(function.getParameters());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    private Test(){}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertNotNull(function.getName());
-					assertEquals(0, function.getElements().size());
-					assertEquals(Modifier.PRIVATE, function.getModifier());
-					assertNull(function.getParameters());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    public Test(int i){}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertNotNull(function.getName());
-					assertEquals(0, function.getElements().size());
-					assertEquals(Modifier.PUBLIC, function.getModifier());
-					assertEquals(1, function.getParameters().size());
-					Variable param1 = checkVariable(function.getParameters().get(0));
-					assertEquals("i", param1.getName().getValue());
-					assertEquals("int", param1.getType().getValue());
-					assertNull(param1.getValue());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    public Test(int i, int j){}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertNotNull(function.getName());
-					assertEquals(0, function.getElements().size());
-					assertEquals(Modifier.PUBLIC, function.getModifier());
-					assertEquals(2, function.getParameters().size());
-					Variable param1 = checkVariable(function.getParameters().get(0));
-					Variable param2 = checkVariable(function.getParameters().get(1));
-					assertEquals("i", param1.getName().getValue());
-					assertEquals("int", param1.getType().getValue());
-					assertNull(param1.getValue());
-					assertEquals("j", param2.getName().getValue());
-					assertEquals("int", param2.getType().getValue());
-					assertNull(param2.getValue());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    public Test(int i, int j) throws Exception{}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertNotNull(function.getName());
-					assertEquals(0, function.getElements().size());
-					assertEquals(Modifier.PUBLIC, function.getModifier());
-					assertEquals(2, function.getParameters().size());
-					Variable param1 = checkVariable(function.getParameters().get(0));
-					Variable param2 = checkVariable(function.getParameters().get(1));
-					assertEquals("i", param1.getName().getValue());
-					assertEquals("int", param1.getType().getValue());
-					assertNull(param1.getValue());
-					assertEquals("j", param2.getName().getValue());
-					assertEquals("int", param2.getType().getValue());
-					assertNull(param2.getValue());
-					
-					assertNotNull(function.getThrowables());
-					assertEquals("Exception", function.getThrowables().get(0).getValue());
-				});
-	}
-}

test/dev/peerat/parser/java/element/function/NormalFunction.java

@@ -1,133 +0,0 @@
-package dev.peerat.parser.java.element.function;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.lang.reflect.Modifier;
-import java.util.List;
-
-import dev.peerat.parser.java.Class;
-import dev.peerat.parser.java.Function;
-import dev.peerat.parser.java.JavaElement;
-import dev.peerat.parser.java.Variable;
-import dev.peerat.parser.java.element.BaseElementTests;
-
-public class NormalFunction extends BaseElementTests{
-
-	{
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    void test(){}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertEquals("test", function.getName().getValue());
-					assertEquals("void", function.getReturnType().getValue());
-					assertEquals(0, function.getElements().size());
-					assertEquals(0, function.getModifier());
-					assertNull(function.getParameters());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    public void test(){}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertEquals("test", function.getName().getValue());
-					assertEquals("void", function.getReturnType().getValue());
-					assertEquals(0, function.getElements().size());
-					assertEquals(Modifier.PUBLIC, function.getModifier());
-					assertNull(function.getParameters());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    public void test(){ int i; }"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertEquals("test", function.getName().getValue());
-					assertEquals("void", function.getReturnType().getValue());
-					assertEquals(1, function.getElements().size());
-					assertEquals(Modifier.PUBLIC, function.getModifier());
-					assertNull(function.getParameters());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    public void test(int i, int j) throws Exception{}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertEquals("test", function.getName().getValue());
-					assertEquals("void", function.getReturnType().getValue());
-					assertEquals(0, function.getElements().size());
-					assertEquals(Modifier.PUBLIC, function.getModifier());
-					assertEquals(2, function.getParameters().size());
-					Variable param1 = checkVariable(function.getParameters().get(0));
-					Variable param2 = checkVariable(function.getParameters().get(1));
-					assertEquals("i", param1.getName().getValue());
-					assertEquals("int", param1.getType().getValue());
-					assertNull(param1.getValue());
-					assertEquals("j", param2.getName().getValue());
-					assertEquals("int", param2.getType().getValue());
-					assertNull(param2.getValue());
-					
-					assertNotNull(function.getThrowables());
-					assertEquals("Exception", function.getThrowables().get(0).getValue());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    void test(){} void test1(){}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(2, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertEquals("test", function.getName().getValue());
-					assertEquals("void", function.getReturnType().getValue());
-					assertEquals(0, function.getElements().size());
-					assertEquals(0, function.getModifier());
-					assertNull(function.getParameters());
-					
-					function = checkFunction(elements.get(1));
-					assertEquals("test1", function.getName().getValue());
-					assertEquals("void", function.getReturnType().getValue());
-					assertEquals(0, function.getElements().size());
-					assertEquals(0, function.getModifier());
-					assertNull(function.getParameters());
-				});
-	}
-	
-}

test/dev/peerat/parser/java/element/function/StaticFunction.java

@@ -1,53 +0,0 @@
-package dev.peerat.parser.java.element.function;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.lang.reflect.Modifier;
-import java.util.List;
-
-import dev.peerat.parser.java.Class;
-import dev.peerat.parser.java.Function;
-import dev.peerat.parser.java.JavaElement;
-import dev.peerat.parser.java.element.BaseElementTests;
-
-public class StaticFunction extends BaseElementTests{
-	
-	{
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    static{}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertNull(function.getName());
-					assertEquals(0, function.getElements().size());
-					assertEquals(Modifier.STATIC, function.getModifier());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    static{ int i; }"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					assertNull(function.getName());
-					assertEquals(1, function.getElements().size());
-					assertEquals(Modifier.STATIC, function.getModifier());
-					checkVariable(function.getElements().get(0));
-				});
-	}
-}

test/dev/peerat/parser/java/element/operation/AssignOperationTest.java

@@ -1,55 +0,0 @@
-package dev.peerat.parser.java.element.operation;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import dev.peerat.parser.java.Function;
-import dev.peerat.parser.java.Operation;
-import dev.peerat.parser.java.element.BaseElementTests;
-import dev.peerat.parser.java.operation.AssignOperation;
-
-public class AssignOperationTest extends BaseElementTests{
-	
-	{
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static class Test{ "
-				+ "    void test(){ "
-				+ "        int i = 3;"
-				+ "        i = 4;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Function function = checkFunction(checkClass(javafile).getElements().get(0));
-					assertEquals(2, function.getElements().size());
-					checkVariable(function.getElements().get(0));
-					Operation op = checkOperation(function.getElements().get(1));
-					assertTrue(op instanceof AssignOperation);
-					AssignOperation assign = (AssignOperation)op;
-					assertEquals("i", assign.left().getToken().getValue());
-					assertEquals("4", assign.right().getToken().getValue());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static class Test{ "
-				+ "    void test(){ "
-				+ "        int i = 3, j = 4;"
-				+ "        i = j;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Function function = checkFunction(checkClass(javafile).getElements().get(0));
-					assertEquals(3, function.getElements().size());
-					checkVariable(function.getElements().get(0));
-					checkVariable(function.getElements().get(1));
-					Operation op = checkOperation(function.getElements().get(2));
-					assertTrue(op instanceof AssignOperation);
-					AssignOperation assign = (AssignOperation)op;
-					assertEquals("i", assign.left().getToken().getValue());
-					assertEquals("j", assign.right().getToken().getValue());
-				});
-	}
-}

test/dev/peerat/parser/java/element/operation/LoopOperationTests.java

@@ -1,108 +0,0 @@
-package dev.peerat.parser.java.element.operation;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import dev.peerat.parser.java.Function;
-import dev.peerat.parser.java.Operation;
-import dev.peerat.parser.java.element.BaseElementTests;
-import dev.peerat.parser.java.operation.BreakOperation;
-import dev.peerat.parser.java.operation.ContinueOperation;
-import dev.peerat.parser.java.operation.ForOperation;
-import dev.peerat.parser.java.operation.ReturnOperation;
-import dev.peerat.parser.java.operation.WhileOperation;
-
-public class LoopOperationTests extends BaseElementTests{
-	
-	{
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static class Test{ "
-				+ "    void test(){ "
-				+ "       	for(;;) break;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Function function = checkFunction(checkClass(javafile).getElements().get(0));
-					assertEquals(1, function.getElements().size());
-					Operation op = checkOperation(function.getElements().get(0));
-					assertTrue(op instanceof ForOperation);
-					ForOperation forOp = (ForOperation)op;
-					Operation o = checkOperation(forOp.getElements().get(0));
-					assertTrue(o instanceof BreakOperation);
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static class Test{ "
-				+ "    void test(){ "
-				+ "       	for(;;){ break;}"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Function function = checkFunction(checkClass(javafile).getElements().get(0));
-					assertEquals(1, function.getElements().size());
-					Operation op = checkOperation(function.getElements().get(0));
-					assertTrue(op instanceof ForOperation);
-					ForOperation forOp = (ForOperation)op;
-					Operation o = checkOperation(forOp.getElements().get(0));
-					assertTrue(o instanceof BreakOperation);
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static class Test{ "
-				+ "    void test(){ "
-				+ "       	for(;;) continue;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Function function = checkFunction(checkClass(javafile).getElements().get(0));
-					assertEquals(1, function.getElements().size());
-					Operation op = checkOperation(function.getElements().get(0));
-					assertTrue(op instanceof ForOperation);
-					ForOperation forOp = (ForOperation)op;
-					Operation o = checkOperation(forOp.getElements().get(0));
-					assertTrue(o instanceof ContinueOperation);
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static class Test{ "
-				+ "    void test(){ "
-				+ "       	while(true) continue;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Function function = checkFunction(checkClass(javafile).getElements().get(0));
-					assertEquals(1, function.getElements().size());
-					Operation op = checkOperation(function.getElements().get(0));
-					assertTrue(op instanceof WhileOperation);
-					WhileOperation whileOp = (WhileOperation)op;
-					Operation o = checkOperation(whileOp.getElements().get(0));
-					assertTrue(o instanceof ContinueOperation);
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static class Test{ "
-				+ "    void test(){ "
-				+ "       	while(true) return;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Function function = checkFunction(checkClass(javafile).getElements().get(0));
-					assertEquals(1, function.getElements().size());
-					Operation op = checkOperation(function.getElements().get(0));
-					assertTrue(op instanceof WhileOperation);
-					WhileOperation whileOp = (WhileOperation)op;
-					Operation o = checkOperation(whileOp.getElements().get(0));
-					assertTrue(o instanceof ReturnOperation);
-				});
-	}
-}

test/dev/peerat/parser/java/element/variable/VariableInClass.java

@@ -17,11 +17,11 @@ public class VariableInClass extends BaseElementTests{
 	
 	{
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    int i;"
-				+ "}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{ "
+					+ "    int i;"
+					+ "}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<JavaElement> elements = clazz.getElements();
@@ -38,11 +38,11 @@ public class VariableInClass extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    private int i;"
-				+ "}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{ "
+					+ "    private int i;"
+					+ "}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<JavaElement> elements = clazz.getElements();
@@ -59,11 +59,11 @@ public class VariableInClass extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    private final int i;"
-				+ "}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{ "
+					+ "    private final int i;"
+					+ "}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<JavaElement> elements = clazz.getElements();
@@ -80,11 +80,11 @@ public class VariableInClass extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    private final int i = 4;"
-				+ "}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{ "
+					+ "    private final int i = 4;"
+					+ "}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<JavaElement> elements = clazz.getElements();
@@ -101,11 +101,11 @@ public class VariableInClass extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    private final int i = 4, j;"
-				+ "}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{ "
+					+ "    private final int i = 4, j;"
+					+ "}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<JavaElement> elements = clazz.getElements();
@@ -131,11 +131,11 @@ public class VariableInClass extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    private final int i = 4, j = 6;"
-				+ "}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{ "
+					+ "    private final int i = 4, j = 6;"
+					+ "}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<JavaElement> elements = clazz.getElements();
@@ -161,12 +161,12 @@ public class VariableInClass extends BaseElementTests{
 				});
 		
 		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    private final int i = 4, j = 6;"
-				+ "    List<String> list;"
-				+ "}",
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{ "
+					+ "    private final int i = 4, j = 6;"
+					+ "    List<String> list;"
+					+ "}",
 				(javafile) -> {
 					Class clazz = checkClass(javafile);
 					List<JavaElement> elements = clazz.getElements();

test/dev/peerat/parser/java/element/variable/VariableInMethod.java

@@ -1,164 +0,0 @@
-package dev.peerat.parser.java.element.variable;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.util.List;
-
-import dev.peerat.parser.java.Class;
-import dev.peerat.parser.java.Function;
-import dev.peerat.parser.java.JavaElement;
-import dev.peerat.parser.java.Variable;
-import dev.peerat.parser.java.element.BaseElementTests;
-
-public class VariableInMethod extends BaseElementTests{
-	
-	{
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    void test(){"
-				+ "    int i;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					elements = function.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Variable variable = checkVariable(elements.get(0));
-					assertEquals(0, variable.getModifier());
-					assertEquals("int", variable.getType().getValue());
-					assertEquals("i", variable.getName().getValue());
-					assertNull(variable.getValue());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    void test(){"
-				+ "    int i = 4;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					elements = function.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Variable variable = checkVariable(elements.get(0));
-					assertEquals(0, variable.getModifier());
-					assertEquals("int", variable.getType().getValue());
-					assertEquals("i", variable.getName().getValue());
-					assertEquals("4", variable.getValue().getToken().getValue());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    void test(){"
-				+ "    int i = 4, j;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					elements = function.getElements();
-					assertNotNull(elements);
-					assertEquals(2, elements.size());
-					Variable variable = checkVariable(elements.get(0));
-					assertEquals(0, variable.getModifier());
-					assertEquals("int", variable.getType().getValue());
-					assertEquals("i", variable.getName().getValue());
-					assertEquals("4", variable.getValue().getToken().getValue());
-					
-					variable = checkVariable(elements.get(1));
-					assertEquals(0, variable.getModifier());
-					assertEquals("int", variable.getType().getValue());
-					assertEquals("j", variable.getName().getValue());
-					assertNull(variable.getValue());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    void test(){"
-				+ "    int i = 4, j = 6;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					elements = function.getElements();
-					assertNotNull(elements);
-					assertEquals(2, elements.size());
-					Variable variable = checkVariable(elements.get(0));
-					assertEquals(0, variable.getModifier());
-					assertEquals("int", variable.getType().getValue());
-					assertEquals("i", variable.getName().getValue());
-					assertEquals("4", variable.getValue().getToken().getValue());
-					
-					variable = checkVariable(elements.get(1));
-					assertEquals(0, variable.getModifier());
-					assertEquals("int", variable.getType().getValue());
-					assertEquals("j", variable.getName().getValue());
-					assertEquals("6", variable.getValue().getToken().getValue());
-				});
-		
-		register(
-				"package be.jeffcheasey88;"
-				+ ""
-				+ "public static final class Test{ "
-				+ "    void test(){"
-				+ "    int i = 4, j = 6;"
-				+ "    List<String> list;"
-				+ "}"
-				+ "}",
-				(javafile) -> {
-					Class clazz = checkClass(javafile);
-					List<JavaElement> elements = clazz.getElements();
-					assertNotNull(elements);
-					assertEquals(1, elements.size());
-					Function function = checkFunction(elements.get(0));
-					elements = function.getElements();
-					assertNotNull(elements);
-					assertEquals(3, elements.size());
-					Variable variable = checkVariable(elements.get(0));
-					assertEquals(0, variable.getModifier());
-					assertEquals("int", variable.getType().getValue());
-					assertEquals("i", variable.getName().getValue());
-					assertEquals("4", variable.getValue().getToken().getValue());
-					
-					variable = checkVariable(elements.get(1));
-					assertEquals(0, variable.getModifier());
-					assertEquals("int", variable.getType().getValue());
-					assertEquals("j", variable.getName().getValue());
-					assertEquals("6", variable.getValue().getToken().getValue());
-					
-					variable = checkVariable(elements.get(2));
-					assertEquals(0, variable.getModifier());
-					assertEquals("List<String>", variable.getType().getValue());
-					assertEquals("list", variable.getName().getValue());
-					assertNull(variable.getValue());
-				});
-		
-	}
-}