Do not use FrankDocGroup annotation to test wrapper API

Author: Martijn Dirkse

frank-doc-doclet/src/test/java/org/frankframework/frankdoc/testtarget/doclet/interfaces/java5/annotation/ClassWithJava5Annotation.java

@@ -1,11 +1,9 @@
 package org.frankframework.frankdoc.testtarget.doclet.interfaces.java5.annotation;
 
-import org.frankframework.doc.FrankDocGroup;
-
 /**
  * @author martijn
  *
  */
-@FrankDocGroup(name = "ClassGroup")
+@MyAnnotation(name = "ClassGroup")
 public class ClassWithJava5Annotation implements InterfaceWithJavaDocTag {
 }

frank-doc-doclet/src/test/java/org/frankframework/frankdoc/testtarget/doclet/interfaces/java5/annotation/InterfaceWithJavaDocTag.java

@@ -1,11 +1,9 @@
 package org.frankframework.frankdoc.testtarget.doclet.interfaces.java5.annotation;
 
-import org.frankframework.doc.FrankDocGroup;
-
 /**
  * @author martijn
  *
  */
-@FrankDocGroup(name = "InterfaceGroup")
+@MyAnnotation(name = "InterfaceGroup")
 public interface InterfaceWithJavaDocTag {
 }

frank-doc-doclet/src/test/java/org/frankframework/frankdoc/testtarget/doclet/interfaces/java5/annotation/MyAnnotation.java

@@ -0,0 +1,27 @@
+/*
+Copyright 2021 WeAreFrank!
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package org.frankframework.frankdoc.testtarget.doclet.interfaces.java5.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MyAnnotation {
+	String name();
+	int order() default Integer.MAX_VALUE;
+}

frank-doc-doclet/src/test/java/org/frankframework/frankdoc/testtarget/doclet/interfaces/java5/annotation/ParentOverrider.java

@@ -1,11 +1,9 @@
 package org.frankframework.frankdoc.testtarget.doclet.interfaces.java5.annotation;
 
-import org.frankframework.doc.FrankDocGroup;
-
 /**
  * @author martijn
  *
  */
-@FrankDocGroup(name = "ParentOverriderGroup")
+@MyAnnotation(name = "ParentOverriderGroup")
 public class ParentOverrider extends ClassWithJava5Annotation implements InterfaceWithJavaDocTag {
 }

frank-doc-doclet/src/test/java/org/frankframework/frankdoc/wrapper/EasyDocletTest.java

@@ -1,5 +1,8 @@
 package org.frankframework.frankdoc.wrapper;
 
+import org.apache.logging.log4j.Logger;
+import org.frankframework.frankdoc.model.FrankElement;
+import org.frankframework.frankdoc.util.LogUtil;
 import org.junit.jupiter.api.Test;
 
 import javax.lang.model.element.Element;
@@ -9,16 +12,17 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EasyDocletTest {
+	private static Logger log = LogUtil.getLogger(EasyDocletTest.class);
 
 	@Test
 	public void test() throws Exception {
 		Set<? extends Element> typeElements = TestUtil.getIncludedElements("org.frankframework.frankdoc.testtarget.doclet");
-		assertEquals(50, typeElements.size());
-
+		log.info("Elements that are type elements:");
 		for (Element element : typeElements) {
 			if (element instanceof TypeElement) {
-				System.out.println(((TypeElement) element).getQualifiedName().toString());
+				log.info("    " + ((TypeElement) element).getQualifiedName().toString());
 			}
 		}
+		assertEquals(51, typeElements.size());
 	}
 }

frank-doc-doclet/src/test/java/org/frankframework/frankdoc/wrapper/FrankClassJava5AnnotationTest.java

@@ -12,7 +12,7 @@
 
 public class FrankClassJava5AnnotationTest {
 	private static final String PACKAGE = "org.frankframework.frankdoc.testtarget.doclet.interfaces.java5.annotation.";
-
+	private static final String TEST_ANNOTATION = "org.frankframework.frankdoc.testtarget.doclet.interfaces.java5.annotation.MyAnnotation";
 	public static Collection<Object[]> data() {
 		return Arrays.asList(new Object[][] {
 			{"ClassWithJava5Annotation", "ClassGroup"},
@@ -31,11 +31,11 @@ void testJavaAnnotationValue(String queriedClass, String expectedValue) throws E
 		FrankClass instance = repository.findClass(PACKAGE + queriedClass);
 		// TODO: Will rename this method and give it Java annotation class name as argument.
 		// This has to be done for similar methods in FrankMethod as well.
-		FrankAnnotation actualGroupAnnotation = instance.getAnnotationIncludingInherited(JAVADOC_GROUP_ANNOTATION);
+		FrankAnnotation actualAnnotation = instance.getAnnotationIncludingInherited(TEST_ANNOTATION);
 		if(expectedValue == null) {
-			assertNull(actualGroupAnnotation);
+			assertNull(actualAnnotation);
 		} else {
-			assertEquals(expectedValue, actualGroupAnnotation.getValueOf("name"));
+			assertEquals(expectedValue, actualAnnotation.getValueOf("name"));
 		}
 	}