[Complete tests] Class,Interface,Enum normal, extends, implements

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

@@ -968,7 +968,7 @@ public class JavaParser extends Parser<JavaElement> {
 				(bag, token) -> bag.set("implement", bag.<Token>get("implement").concat(token)))).then(clazz_implement_name);
 		clazz_implement_name.then((validator) -> validator.validate((token) -> token.getValue().equals("{")))
 			.<JavaElement>end((parent, bag) -> {
-				Class current = new Class((((AnnotableBuffer)parent).getAnnotationBuffer()), bag.get("name"), bag.get("extend"), bag.get("implements"));
+				Class current = new Class((((AnnotableBuffer)parent).getAnnotationBuffer()), bag.get("name"), bag.get("extend"), bag.get("implement"));
 				if(parent instanceof ClassContainer) ((ClassContainer)parent).addClass(current);
 				return current;
 			})
@@ -979,7 +979,7 @@ public class JavaParser extends Parser<JavaElement> {
 				.then(new RedirectStateTree<>(type, (global, local) -> global.set("extend", local.get())));
 		clazz_extend.then((validator) -> validator.validate((token) -> token.getValue().equals("{")))
 			.<JavaElement>end((parent, bag) -> {
-				Class current = new Class((((AnnotableBuffer)parent).getAnnotationBuffer()), bag.get("name"), bag.get("extend"), bag.get("implements"));
+				Class current = new Class((((AnnotableBuffer)parent).getAnnotationBuffer()), bag.get("name"), bag.get("extend"), bag.get("implement"));
 				if(parent instanceof ClassContainer) ((ClassContainer)parent).addClass(current);
 				return current;
 			})
@@ -1001,7 +1001,7 @@ public class JavaParser extends Parser<JavaElement> {
 						(bag, token) -> bag.set("name", token)));
 		StateTree<JavaElement> interface_start = interface_base.then((validator) -> validator.validate((token) -> token.getValue().equals("{")));
 		interface_start.<JavaElement>end((parent,bag) -> {
-			Interface current = new Interface((((AnnotableBuffer)parent).getAnnotationBuffer()), bag.get("name"));
+			Interface current = new Interface((((AnnotableBuffer)parent).getAnnotationBuffer()), bag.get("name"), bag.get("extend"));
 			if(parent instanceof ClassContainer) ((ClassContainer)parent).addClass(current);
 			return current;
 		})
@@ -1009,7 +1009,7 @@ public class JavaParser extends Parser<JavaElement> {
 			.unique((validator) -> validator.validate((token) -> token.getValue().equals("}"))).end((a,b) -> a);
 		
 		interface_base.then((validator) -> validator.validate((token) -> token.getValue().equals("extends")))
-			.then(new RedirectStateTree<>(type, (global, local) -> global.set(null)))
+			.then(new RedirectStateTree<>(type, (global, local) -> global.set("extend", local.get())))
 			.then(interface_start);
 		
 		StateTree<JavaElement> interface_mod = clazz_.then(new RedirectStateTree<>(modifier, (global, local) -> global.set("modifier", local)));
@@ -1029,7 +1029,7 @@ public class JavaParser extends Parser<JavaElement> {
 		
 		StateTree<JavaElement> enum_start = enum_base.then((validator) -> validator.validate((token) -> token.getValue().equals("{")));
 		enum_start.<JavaElement>end((parent,bag) -> {
-			Enumeration current = new Enumeration((((AnnotableBuffer)parent).getAnnotationBuffer()), bag.get("name"));
+			Enumeration current = new Enumeration((((AnnotableBuffer)parent).getAnnotationBuffer()), bag.get("name"), bag.get("implement"));
 			if(parent instanceof ClassContainer) ((ClassContainer)parent).addClass(current);
 			return current;
 		})

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

@@ -0,0 +1,38 @@
+package dev.peerat.parser.java.element;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.Test;
+
+import dev.peerat.parser.Parser;
+import dev.peerat.parser.java.JavaElement;
+import dev.peerat.parser.java.JavaFile;
+import dev.peerat.parser.java.JavaParser;
+
+public class BaseElementTests{
+	
+	private int size;
+	private List<Supplier<String>> texts = new ArrayList<>();
+	private List<Consumer<JavaFile>> checkers = new ArrayList<>();
+	
+	public void register(Supplier<String> text, Consumer<JavaFile> checker){
+		this.texts.add(text);
+		this.checkers.add(checker);
+		this.size++;
+	}
+	
+	@Test
+	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");
+	}
+
+}

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

@@ -0,0 +1,29 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.Class;
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class ClazzWithExtend extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public class Test extends MyTest{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Class);
+					Class clazz = (Class)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+					assertEquals("MyTest", clazz.getExtension().getValue());
+				});
+	}
+
+}

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

@@ -0,0 +1,30 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.Class;
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class ClazzWithExtendsAndImplements extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public class Test extends MyBigTest implements MyTest{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Class);
+					Class clazz = (Class)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+					assertEquals("MyBigTest", clazz.getExtension().getValue());
+					assertEquals("MyTest", clazz.getImplementations().getValue()); //where pouvoir en récuperer plusieurs ?
+				});
+	}
+
+}

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

@@ -0,0 +1,29 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.Class;
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class ClazzWithImplements extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public class Test implements MyTest{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Class);
+					Class clazz = (Class)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+					assertEquals("MyTest", clazz.getImplementations().getValue()); //where pouvoir en récuperer plusieurs ?
+				});
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.Class;
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class ClazzWithMod extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final class Test{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Class);
+					Class clazz = (Class)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+				});
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.Class;
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class ClazzWithoutMod extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "class Test{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Class);
+					Class clazz = (Class)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+				});
+	}
+
+}

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

@@ -0,0 +1,30 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.Class;
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.Enumeration;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class EnumWithImplements extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public enum Test implements MyTest{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Enumeration);
+					Enumeration clazz = (Enumeration)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+					assertEquals("MyTest", clazz.getExtension().getValue());
+				});
+	}
+
+}

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

@@ -0,0 +1,29 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.Class;
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.Enumeration;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class EnumWithMod extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final enum Test{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Enumeration);
+					Enumeration clazz = (Enumeration)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+				});
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.Enumeration;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class EnumWithoutMod extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "enum Test{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Enumeration);
+					Enumeration clazz = (Enumeration)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+				});
+	}
+
+}

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

@@ -0,0 +1,29 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.Interface;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class InterfaceWithExtends extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public interface Test extends MyTest{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Interface);
+					Interface clazz = (Interface)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+					assertEquals("MyTest", clazz.getExtension().getValue());
+				});
+	}
+
+}

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

@@ -0,0 +1,29 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.Class;
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.Interface;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class InterfaceWithMod extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "public static final interface Test{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Interface);
+					Interface clazz = (Interface)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+				});
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package dev.peerat.parser.java.element.clazz;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import dev.peerat.parser.java.ClassBase;
+import dev.peerat.parser.java.Interface;
+import dev.peerat.parser.java.element.BaseElementTests;
+
+public class InterfaceWithoutMod extends BaseElementTests{
+	
+	{
+		register(
+				() -> "package be.jeffcheasey88;"
+					+ ""
+					+ "interface Test{}",
+				(javafile) -> {
+					ClassBase clazzb = javafile.getMainClass();
+					assertNotNull(clazzb);
+					assertTrue(clazzb instanceof Interface);
+					Interface clazz = (Interface)clazzb;
+					assertEquals("Test", clazz.getName().getValue());
+					assertEquals(0, clazz.getElements().size());
+				});
+	}
+
+}