From 67bbbf0faf2871f2b73948964059e5826804c3d7 Mon Sep 17 00:00:00 2001 From: Andreas Reichel Date: Mon, 8 May 2023 15:29:05 +0700 Subject: [PATCH] feat: JavaDoc 11/13 support Salvaged the project from https://github.com/MarkusBernhardt/xml-doclet with PR #17 and sanitized the build script and sources. Supports JavaDoc 11 up to JavaDoc 13. - Gradle Build, drop Maven - Format and Check sources - Publish to GitHub packages --- .gitignore | 5 + CHANGES.md | 2 +- README.md | 65 +- build.gradle | 259 +++ config/checkstyle/checkstyle.xml | 36 + config/checkstyle/checkstyle_checks.xml | 879 ++++++++ config/checkstyle/google_checks.xml | 358 +++ config/checkstyle/sun_checks.xml | 198 ++ config/checkstyle/suppressions.xml | 659 ++++++ .../formatter/eclipse-java-google-style.xml | 337 +++ config/pmd/ruleset.xml | 126 ++ config/spotbugs/spotBugsExcludeFilter.xml | 15 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 245 ++ gradlew.bat | 92 + pom.xml | 187 -- settings.gradle | 5 + .../xmldoclet/LoggingLevel.java | 40 +- .../xmldoclet/LoggingLevelEnum.java | 77 +- .../xmldoclet/LoggingOutputStream.java | 194 +- .../markusbernhardt/xmldoclet/Parser.java | 1017 ++++----- .../markusbernhardt/xmldoclet/XmlDoclet.java | 393 ++-- .../xmldoclet/AbstractTestParent.java | 286 ++- .../xmldoclet/AnnotationTest.java | 278 +-- .../markusbernhardt/xmldoclet/ClassTest.java | 1974 +++++++++-------- .../markusbernhardt/xmldoclet/EnumTest.java | 306 +-- .../markusbernhardt/xmldoclet/FieldTest.java | 384 ++-- .../xmldoclet/InterfaceTest.java | 674 +++--- .../markusbernhardt/xmldoclet/MethodTest.java | 789 +++---- .../xmldoclet/PrimitiveTest.java | 16 +- .../markusbernhardt/xmldoclet/TagTest.java | 82 +- .../xmldoclet/simpledata/Annotation10.java | 14 +- .../xmldoclet/simpledata/Annotation11.java | 14 +- .../xmldoclet/simpledata/Annotation12.java | 14 +- .../xmldoclet/simpledata/Annotation2.java | 2 +- .../xmldoclet/simpledata/Annotation3.java | 14 +- .../xmldoclet/simpledata/Annotation4.java | 2 +- .../xmldoclet/simpledata/Annotation5.java | 14 +- .../xmldoclet/simpledata/Annotation6.java | 14 +- .../xmldoclet/simpledata/Annotation7.java | 14 +- .../xmldoclet/simpledata/Annotation8.java | 16 +- .../xmldoclet/simpledata/Annotation9.java | 14 +- .../simpledata/AnnotationCascade.java | 14 +- .../simpledata/AnnotationCascadeChild.java | 37 +- .../xmldoclet/simpledata/Class10.java | 2 +- .../xmldoclet/simpledata/Class11.java | 2 +- .../xmldoclet/simpledata/Class12.java | 2 +- .../xmldoclet/simpledata/Class13.java | 5 +- .../xmldoclet/simpledata/Class14.java | 5 +- .../xmldoclet/simpledata/Class15.java | 5 +- .../xmldoclet/simpledata/Class16.java | 2 +- .../xmldoclet/simpledata/Class17.java | 4 +- .../xmldoclet/simpledata/Class18.java | 2 +- .../xmldoclet/simpledata/Class19.java | 2 +- .../xmldoclet/simpledata/Class2.java | 12 +- .../xmldoclet/simpledata/Class20.java | 2 +- .../xmldoclet/simpledata/Class21.java | 2 +- .../xmldoclet/simpledata/Class22.java | 2 +- .../xmldoclet/simpledata/Class23.java | 2 +- .../xmldoclet/simpledata/Class24.java | 2 +- .../xmldoclet/simpledata/Class3.java | 18 +- .../xmldoclet/simpledata/Class4.java | 10 +- .../xmldoclet/simpledata/Class5.java | 2 +- .../xmldoclet/simpledata/Class6.java | 2 +- .../xmldoclet/simpledata/Class7.java | 2 +- .../xmldoclet/simpledata/Class8.java | 2 +- .../xmldoclet/simpledata/Class9.java | 18 +- .../simpledata/ClassAnnotationCascade.java | 64 +- .../xmldoclet/simpledata/Enum1.java | 26 +- .../xmldoclet/simpledata/Enum2.java | 2 +- .../xmldoclet/simpledata/Enum3.java | 2 +- .../xmldoclet/simpledata/Enum4.java | 6 +- .../xmldoclet/simpledata/Enum5.java | 2 +- .../xmldoclet/simpledata/Enum6.java | 2 +- .../xmldoclet/simpledata/Field1.java | 78 +- .../xmldoclet/simpledata/Interface1.java | 2 +- .../xmldoclet/simpledata/Interface2.java | 14 +- .../xmldoclet/simpledata/Interface3.java | 2 +- .../xmldoclet/simpledata/Interface4.java | 2 +- .../xmldoclet/simpledata/Interface5.java | 8 +- .../xmldoclet/simpledata/Interface6.java | 5 +- .../xmldoclet/simpledata/Interface7.java | 5 +- .../xmldoclet/simpledata/Interface8.java | 5 +- .../xmldoclet/simpledata/Method1.java | 122 +- .../xmldoclet/simpledata/Method2.java | 184 +- .../xmldoclet/simpledata/Method3.java | 99 +- .../xmldoclet/simpledata/Tag1.java | 52 +- 88 files changed, 7027 insertions(+), 3929 deletions(-) create mode 100644 build.gradle create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 config/checkstyle/checkstyle_checks.xml create mode 100644 config/checkstyle/google_checks.xml create mode 100644 config/checkstyle/sun_checks.xml create mode 100644 config/checkstyle/suppressions.xml create mode 100644 config/formatter/eclipse-java-google-style.xml create mode 100644 config/pmd/ruleset.xml create mode 100644 config/spotbugs/spotBugsExcludeFilter.xml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index c708c36..3a10c63 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ /target +/build +/out /.settings /.classpath /.project +/.gradle +/.idea + diff --git a/CHANGES.md b/CHANGES.md index a96ffa2..1e8711b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -23,4 +23,4 @@ unreleased 1.0.0 ----- -* Initial release \ No newline at end of file +* Initial release diff --git a/README.md b/README.md index 32f7921..d74d95f 100644 --- a/README.md +++ b/README.md @@ -12,33 +12,33 @@ Usage If you are using maven you can use this library by adding the following report to your pom.xml: - ... - - org.apache.maven.plugins - maven-javadoc-plugin - - - xml-doclet - prepare-package - - javadoc - - - com.github.markusbernhardt.xmldoclet.XmlDoclet - -d ${project.build.directory} -filename ${project.artifactId}-${project.version}-javadoc.xml - false - - com.github.markusbernhardt - xml-doclet - 1.0.5 - - - - - - ... + ... + + org.apache.maven.plugins + maven-javadoc-plugin + + + xml-doclet + prepare-package + + javadoc + + + com.github.markusbernhardt.xmldoclet.XmlDoclet + -d ${project.build.directory} -filename ${project.artifactId}-${project.version}-javadoc.xml + false + + com.github.markusbernhardt + xml-doclet + 1.0.5 + + + + + + ... - + Use 'mvn package' with maven. If you are not using maven, you can use the [jar-with-dependencies](http://search.maven.org/remotecontent?filepath=com/github/markusbernhardt/xml-doclet/1.0.5/xml-doclet-1.0.5-jar-with-dependencies.jar), which contains all required libraries. @@ -50,10 +50,10 @@ A Makefile target to generate xml from both the production and test code: javadoc: - mkdir -p target/production target/test - CLASSPATH=$$(echo $$(find ~/.m2/repository/ -name '*.jar'|grep -v jdk14 )|sed 's/ /:/g')\ + mkdir -p target/production target/test + CLASSPATH=$$(echo $$(find ~/.m2/repository/ -name '*.jar'|grep -v jdk14 )|sed 's/ /:/g')\ javadoc -doclet com.github.markusbernhardt.xmldoclet.XmlDoclet -sourcepath src/main/java -d target/production org.rulez.demokracia.PDEngine - CLASSPATH=$$(echo $$(find ~/.m2/repository/ -name '*.jar'|grep -v jdk14 )|sed 's/ /:/g')\ + CLASSPATH=$$(echo $$(find ~/.m2/repository/ -name '*.jar'|grep -v jdk14 )|sed 's/ /:/g')\ javadoc -doclet com.github.markusbernhardt.xmldoclet.XmlDoclet -sourcepath src/test/java -d target/test org.rulez.demokracia.PDEngine If you want more control and feel adventurous you could you use this [jar](http://search.maven.org/remotecontent?filepath=com/github/markusbernhardt/xml-doclet/1.0.5/xml-doclet-1.0.5.jar) and provide all required libraries from this [list](DEPENDENCIES.md) on your own. @@ -63,13 +63,12 @@ Options -d Destination directory for output file. Default: . - + -docencoding Encoding of the output file. Default: UTF8 - + -dryrun Parse javadoc, but don't write output file. Default: false - + -filename Name of the output file. Default: javadoc.xml - diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..14e3b5c --- /dev/null +++ b/build.gradle @@ -0,0 +1,259 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'signing' + + id("com.github.gradlecommunity.jaxb2") version "3.1.0" + + id "com.github.spotbugs" version "latest.release" + id "com.diffplug.spotless" version "latest.release" + id 'pmd' + id 'checkstyle' +} + +repositories { + mavenLocal() + maven { + url = uri('https://oss.sonatype.org/content/repositories/snapshots') + } + + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + api 'commons-cli:commons-cli:+' + api 'org.slf4j:slf4j-api:+' + api 'javax.xml.bind:jaxb-api:2.+' + jaxb2 'org.glassfish.jaxb:jaxb-runtime:2.+' + jaxb2 'javax.activation:javax.activation-api:1.2.0' + testImplementation 'org.slf4j:slf4j-simple:+' + testImplementation 'junit:junit:+' +} + + +def getVersion = { boolean considerSnapshot -> + def major = 0 + def minor = 0 + def patch = 0 + def commit = "" + def snapshot ="" + new ByteArrayOutputStream().withStream { os -> + exec { + workingDir "$projectDir" + args = [ + "--no-pager" + , "describe" + , "--tags" + , "--always" + , "--dirty=-SNAPSHOT" + ] + executable "git" + standardOutput = os + } + def versionStr = os.toString().trim() + def matcher = versionStr =~ /(\d*)\.(\d*)-(\d*)-([a-zA-Z\d]*)/ + matcher.find() + + major = matcher[0][1] + minor = matcher[0][2] + patch = matcher[0][3] + commit = matcher[0][4] + + if (considerSnapshot && versionStr.endsWith("SNAPSHOT")) { + minor++ + snapshot = "-SNAPSHOT" + } + } + return "${major}.${minor}${snapshot}" +} +version = getVersion(true) +group = 'com.github.markusbernhardt' +description = 'XML Doclet' + + +publish { + dependsOn(check) +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + versionMapping { + usage('java-api') { + fromResolutionOf('runtimeClasspath') + } + usage('java-runtime') { + fromResolutionResult() + } + } + pom { + name = 'XML Doclet' + description = 'Doclet for writing XML file (instead of JavaDoc HTML)' + url = 'https://github.com/manticore-projects/xml-doclet' + licenses { + license { + name = 'The Apache Software License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + developers { + developer { + id = 'mbe' + name = 'Markus Bernhardt' + email = 'markus.bernhardt@me.comt' + } + developer { + id = 'are' + name = 'Andreas Reichel' + email = 'andreas@manticore-projects.com' + } + developer { + id = 'vha' + name = 'Vojtěch Habarta' + } + } + scm { + connection = 'scm:git:https://github.com/manticore-projects/xml-doclet.git' + developerConnection = 'scm:git:ssh://git@github.com:manticore-projects/xml-doclet.git' + url = 'https://github.com/manticore-projects/xml-doclet.git' + } + } + } + } + repositories { +// maven { +// name "ossrh" +// +// def releasesRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" +// def snapshotsRepoUrl= "https://oss.sonatype.org/service/local/staging/deploy/maven2" +// url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl +// credentials(PasswordCredentials) +// } + maven { + name = "GitHubPackages" + + url = uri("https://maven.pkg.github.com/manticore-projects/jsqlparser") + credentials(PasswordCredentials) + } + } +} + +signing { + sign publishing.publications.mavenJava +} + +java { + withSourcesJar() + withJavadocJar() + + sourceCompatibility(JavaVersion.VERSION_1_8) + targetCompatibility(JavaVersion.VERSION_1_8) + + // needed for XML-Doclet to work (since Doclet changed again with Java 13) + toolchain { + languageVersion.set(JavaLanguageVersion.of(11)) + } +} + +jaxb2 { + xjc { + 'xmldoclet-classes' { + basePackage = 'com.github.markusbernhardt.xmldoclet.xjc' + schema = 'src/main/xjc/javadoc.xsd' + encoding = 'UTF-8' + generatedSourcesDir = "${project.buildDir}/generated/java" + } + } +} + +javadoc { + if(JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } + options.addBooleanOption("Xdoclint:none", true) +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +tasks.withType(Javadoc) { + options.encoding = 'UTF-8' +} + + +spotbugsMain { + reports { + html { + enabled = true + destination = file("build/reports/spotbugs/main/spotbugs.html") + stylesheet = 'fancy-hist.xsl' + } + } +} + +spotbugs { + // fail only on P1 and without the net.sf.jsqlparser.parser.* + excludeFilter = file("config/spotbugs/spotBugsExcludeFilter.xml") + + // do not run over the test, although we should do that eventually + spotbugsTest.enabled = false +} + +pmd { + consoleOutput = false + //toolVersion = "6.46.0" + + sourceSets = [sourceSets.main] + + // clear the ruleset in order to use configured rules only + ruleSets = [] + + //rulesMinimumPriority = 1 + ruleSetFiles = files("config/pmd/ruleset.xml") + + pmdMain { + excludes = [ + "build/generated/*" + ] + } +} + +tasks.whenTaskAdded {task -> + if(task.name.contains("compileJaxb2Java")) { + task.enabled = false + } +} + +checkstyle { + sourceSets = [sourceSets.main, sourceSets.test] + configFile =rootProject.file('config/checkstyle/checkstyle.xml') +} + +spotless { + // optional: limit format enforcement to just the files changed by this feature branch + ratchetFrom 'origin/master' + + format 'misc', { + // define the files to apply `misc` to + target '*.rst', '*.md', '.gitignore' + // define the steps to apply to those files + trimTrailingWhitespace() + indentWithSpaces(4) // or spaces. Takes an integer argument if you don't like 4 + endWithNewline() + } + java { + indentWithSpaces(4) + eclipse().configFile('config/formatter/eclipse-java-google-style.xml') + } +} + +tasks.withType(Checkstyle) { + reports { + xml.required = false + html.required = true + } +} diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..c49a705 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/checkstyle_checks.xml b/config/checkstyle/checkstyle_checks.xml new file mode 100644 index 0000000..171ec58 --- /dev/null +++ b/config/checkstyle/checkstyle_checks.xml @@ -0,0 +1,879 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/google_checks.xml b/config/checkstyle/google_checks.xml new file mode 100644 index 0000000..153a045 --- /dev/null +++ b/config/checkstyle/google_checks.xml @@ -0,0 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/sun_checks.xml b/config/checkstyle/sun_checks.xml new file mode 100644 index 0000000..e5f5367 --- /dev/null +++ b/config/checkstyle/sun_checks.xml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml new file mode 100644 index 0000000..b5ddce5 --- /dev/null +++ b/config/checkstyle/suppressions.xml @@ -0,0 +1,659 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/formatter/eclipse-java-google-style.xml b/config/formatter/eclipse-java-google-style.xml new file mode 100644 index 0000000..5f9965d --- /dev/null +++ b/config/formatter/eclipse-java-google-style.xml @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/pmd/ruleset.xml b/config/pmd/ruleset.xml new file mode 100644 index 0000000..50dadbe --- /dev/null +++ b/config/pmd/ruleset.xml @@ -0,0 +1,126 @@ + + + + + + The default ruleset used by the Maven PMD Plugin, when no other ruleset is specified. + It contains the rules of the old (pre PMD 6.0.0) rulesets java-basic, java-empty, java-imports, + java-unnecessary, java-unusedcode. + + This ruleset might be used as a starting point for an own customized ruleset [0]. + + [0] https://pmd.github.io/latest/pmd_userdocs_making_rulesets.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/spotbugs/spotBugsExcludeFilter.xml b/config/spotbugs/spotBugsExcludeFilter.xml new file mode 100644 index 0000000..05e7d35 --- /dev/null +++ b/config/spotbugs/spotBugsExcludeFilter.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1962a79e29d3e0ab67b14947c167a862655af9b GIT binary patch literal 62076 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..37aef8d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..aeb74cb --- /dev/null +++ b/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index f237bea..0000000 --- a/pom.xml +++ /dev/null @@ -1,187 +0,0 @@ - - 4.0.0 - - - org.sonatype.oss - oss-parent - 9 - - - com.github.markusbernhardt - xml-doclet - 1.0.6-SNAPSHOT - jar - - XML Doclet - Javadoc to XML - https://github.com/MarkusBernhardt/xml-doclet - - - UTF-8 - true - true - 1.7 - - - - https://github.com/MarkusBernhardt/xml-doclet - scm:git://github.com/MarkusBernhardt/xml-doclet.git - scm:git:ssh://git@github.com/MarkusBernhardt/xml-doclet.git - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - Markus Bernhardt - markus.bernhardt@me.com - - - - - - Georg Tsakumagos - tsakumagos@gmail.com - - - - - - com.sun - tools - ${java.version} - system - ${java.home}/../lib/tools.jar - - - commons-cli - commons-cli - 1.2 - - - - org.slf4j - slf4j-api - 1.7.12 - - - - org.slf4j - slf4j-simple - 1.7.12 - test - - - junit - junit - 4.12 - test - - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.12.3 - - - generate-sources - - generate - - - - - true - true - com.github.markusbernhardt.xmldoclet.xjc - src/main/xjc - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - true - true - javac - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.5 - - - jar-with-dependencies - - - - - make-assembly - package - - single - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0.0,) - - enforce - - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - http://java.sun.com/javase/7/docs/api/ - - - - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..8554ee8 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'xml-doclet' diff --git a/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingLevel.java b/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingLevel.java index beca044..481d949 100644 --- a/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingLevel.java +++ b/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingLevel.java @@ -1,21 +1,19 @@ -package com.github.markusbernhardt.xmldoclet; - -import org.slf4j.Logger; - -/** - * Public interface for a logging level class. - * - * @author markus - */ -public interface LoggingLevel { - - /** - * Intefrace mehtod. - * - * @param log - * the logger to log to - * @param message - * the message to log to the given logger. - */ - public void log(Logger log, String message); -} +package com.github.markusbernhardt.xmldoclet; + +import org.slf4j.Logger; + +/** + * Public interface for a logging level class. + * + * @author markus + */ +public interface LoggingLevel { + + /** + * Intefrace mehtod. + * + * @param log the logger to log to + * @param message the message to log to the given logger. + */ + void log(Logger log, String message); +} diff --git a/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingLevelEnum.java b/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingLevelEnum.java index b4c4cbc..f244f5a 100644 --- a/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingLevelEnum.java +++ b/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingLevelEnum.java @@ -1,39 +1,38 @@ -package com.github.markusbernhardt.xmldoclet; - -import org.slf4j.Logger; - -/** - * Enumeration implementing the LoggingLevel interface and sending all messages - * to a SLF4j logger. - * - * @author markus - */ -public enum LoggingLevelEnum implements LoggingLevel { - /** - * Log level: INFO - */ - INFO { - @Override - public void log(Logger log, String message) { - log.info(message); - } - }, - /** - * Log level: WARN - */ - WARN { - @Override - public void log(Logger log, String message) { - log.warn(message); - } - }, - /** - * Log level: ERROR - */ - ERROR { - @Override - public void log(Logger log, String message) { - log.error(message); - } - }; -} \ No newline at end of file +package com.github.markusbernhardt.xmldoclet; + +import org.slf4j.Logger; + +/** + * Enumeration implementing the LoggingLevel interface and sending all messages to a SLF4j logger. + * + * @author markus + */ +public enum LoggingLevelEnum implements LoggingLevel { + /** + * Log level: INFO + */ + INFO { + @Override + public void log(Logger log, String message) { + log.info(message); + } + }, + /** + * Log level: WARN + */ + WARN { + @Override + public void log(Logger log, String message) { + log.warn(message); + } + }, + /** + * Log level: ERROR + */ + ERROR { + @Override + public void log(Logger log, String message) { + log.error(message); + } + }; +} diff --git a/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingOutputStream.java b/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingOutputStream.java index d22f384..067e096 100644 --- a/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingOutputStream.java +++ b/src/main/java/com/github/markusbernhardt/xmldoclet/LoggingOutputStream.java @@ -1,99 +1,95 @@ -package com.github.markusbernhardt.xmldoclet; - -import java.io.IOException; - -import org.slf4j.Logger; - -class LoggingOutputStream extends java.io.OutputStream { - - protected Logger log; - protected LoggingLevelEnum loggingLevel; - - /** - * Used to maintain the contract of {@link #close()}. - */ - protected boolean hasBeenClosed = false; - - /** - * The internal buffer where data is stored. - */ - protected StringBuffer buffer = new StringBuffer(); - - /** - * Creates the LoggingOutputStream to flush to the given Category. - * - * @param log - * the Logger to write to - * - * @param loggingLevel - * the log level - * - * @exception IllegalArgumentException - * if cat == null or priority == null - */ - public LoggingOutputStream(Logger log, LoggingLevelEnum loggingLevel) throws IllegalArgumentException { - if (log == null) { - throw new IllegalArgumentException("log == null"); - } - - this.loggingLevel = loggingLevel; - this.log = log; - } - - /** - * Closes this output stream and releases any system resources associated - * with this stream. The general contract of close is that it - * closes the output stream. A closed stream cannot perform output - * operations and cannot be reopened. - */ - @Override - public void close() { - flush(); - hasBeenClosed = true; - } - - /** - * Writes the specified byte to this output stream. The general contract for - * write is that one byte is written to the output stream. The - * byte to be written is the eight low-order bits of the argument - * b. The 24 high-order bits of b are ignored. - * - * @param b - * the byte to write - */ - @Override - public void write(final int b) throws IOException { - if (hasBeenClosed) { - throw new IOException("The stream has been closed."); - } - - byte[] bytes = new byte[1]; - bytes[0] = (byte) (b & 0xff); - String s = new String(bytes); - if (s.equals("\n")) { - flush(); - } else { - buffer.append(s); - } - } - - /** - * Flushes this output stream and forces any buffered output bytes to be - * written out. The general contract of flush is that calling - * it is an indication that, if any bytes previously written have been - * buffered by the implementation of the output stream, such bytes should - * immediately be written to their intended destination. - */ - @Override - public void flush() { - String message = buffer.toString().trim(); - if (message.length() > 0) { - loggingLevel.log(log, message); - } - reset(); - } - - private void reset() { - buffer = new StringBuffer(); - } -} \ No newline at end of file +package com.github.markusbernhardt.xmldoclet; + +import java.io.IOException; +import java.nio.charset.Charset; + +import org.slf4j.Logger; + +class LoggingOutputStream extends java.io.OutputStream { + + protected Logger log; + protected LoggingLevelEnum loggingLevel; + + /** + * Used to maintain the contract of {@link #close()}. + */ + protected boolean hasBeenClosed = false; + + /** + * The internal buffer where data is stored. + */ + protected StringBuffer buffer = new StringBuffer(); + + /** + * Creates the LoggingOutputStream to flush to the given Category. + * + * @param log the Logger to write to + * + * @param loggingLevel the log level + * + * @exception IllegalArgumentException if cat == null or priority == null + */ + public LoggingOutputStream(Logger log, LoggingLevelEnum loggingLevel) + throws IllegalArgumentException { + if (log == null) { + throw new IllegalArgumentException("log == null"); + } + + this.loggingLevel = loggingLevel; + this.log = log; + } + + /** + * Closes this output stream and releases any system resources associated with this stream. The + * general contract of close is that it closes the output stream. A closed stream + * cannot perform output operations and cannot be reopened. + */ + @Override + public void close() { + flush(); + hasBeenClosed = true; + } + + /** + * Writes the specified byte to this output stream. The general contract for write + * is that one byte is written to the output stream. The byte to be written is the eight + * low-order bits of the argument b. The 24 high-order bits of b are + * ignored. + * + * @param b the byte to write + */ + @Override + public void write(final int b) throws IOException { + if (hasBeenClosed) { + throw new IOException("The stream has been closed."); + } + + byte[] bytes = new byte[1]; + bytes[0] = (byte) (b & 0xff); + String s = new String(bytes, Charset.defaultCharset()); + if (s.equals("\n")) { + flush(); + } else { + buffer.append(s); + } + } + + /** + * Flushes this output stream and forces any buffered output bytes to be written out. The + * general contract of flush is that calling it is an indication that, if any bytes + * previously written have been buffered by the implementation of the output stream, such bytes + * should immediately be written to their intended destination. + */ + @Override + public void flush() { + String message = buffer.toString().trim(); + if (message.length() > 0) { + loggingLevel.log(log, message); + } + reset(); + } + + private void reset() { + buffer = new StringBuffer(); + } +} diff --git a/src/main/java/com/github/markusbernhardt/xmldoclet/Parser.java b/src/main/java/com/github/markusbernhardt/xmldoclet/Parser.java index f60c4fc..8d22262 100644 --- a/src/main/java/com/github/markusbernhardt/xmldoclet/Parser.java +++ b/src/main/java/com/github/markusbernhardt/xmldoclet/Parser.java @@ -44,517 +44,526 @@ import com.sun.javadoc.WildcardType; /** - * The main parser class. It scans the given Doclet document root and creates - * the XML tree. + * The main parser class. It scans the given Doclet document root and creates the XML tree. * * @author markus */ public class Parser { - private final static Logger log = LoggerFactory.getLogger(Parser.class); - - protected Map packages = new TreeMap(); - - protected ObjectFactory objectFactory = new ObjectFactory(); - - /** - * The entry point into parsing the javadoc. - * - * @param rootDoc - * The RootDoc intstance obtained via the doclet API - * @return The root node, containing everything parsed from javadoc doclet - */ - public Root parseRootDoc(RootDoc rootDoc) { - Root rootNode = objectFactory.createRoot(); - - for (ClassDoc classDoc : rootDoc.classes()) { - PackageDoc packageDoc = classDoc.containingPackage(); - - Package packageNode = packages.get(packageDoc.name()); - if (packageNode == null) { - packageNode = parsePackage(packageDoc); - packages.put(packageDoc.name(), packageNode); - rootNode.getPackage().add(packageNode); - } - - if (classDoc instanceof AnnotationTypeDoc) { - packageNode.getAnnotation().add(parseAnnotationTypeDoc((AnnotationTypeDoc) classDoc)); - } else if (classDoc.isEnum()) { - packageNode.getEnum().add(parseEnum(classDoc)); - } else if (classDoc.isInterface()) { - packageNode.getInterface().add(parseInterface(classDoc)); - } else { - packageNode.getClazz().add(parseClass(classDoc)); - } - } - - return rootNode; - } - - protected Package parsePackage(PackageDoc packageDoc) { - Package packageNode = objectFactory.createPackage(); - packageNode.setName(packageDoc.name()); - String comment = packageDoc.commentText(); - if (comment.length() > 0) { - packageNode.setComment(comment); - } - - for (Tag tag : packageDoc.tags()) { - packageNode.getTag().add(parseTag(tag)); - } - - return packageNode; - } - - /** - * Parse an annotation. - * - * @param annotationTypeDoc - * A AnnotationTypeDoc instance - * @return the annotation node - */ - protected Annotation parseAnnotationTypeDoc(AnnotationTypeDoc annotationTypeDoc) { - Annotation annotationNode = objectFactory.createAnnotation(); - annotationNode.setName(annotationTypeDoc.name()); - annotationNode.setQualified(annotationTypeDoc.qualifiedName()); - String comment = annotationTypeDoc.commentText(); - if (comment.length() > 0) { - annotationNode.setComment(comment); - } - annotationNode.setIncluded(annotationTypeDoc.isIncluded()); - annotationNode.setScope(parseScope(annotationTypeDoc)); - - for (AnnotationTypeElementDoc annotationTypeElementDoc : annotationTypeDoc.elements()) { - annotationNode.getElement().add(parseAnnotationTypeElementDoc(annotationTypeElementDoc)); - } - - for (AnnotationDesc annotationDesc : annotationTypeDoc.annotations()) { - annotationNode.getAnnotation().add(parseAnnotationDesc(annotationDesc, annotationTypeDoc.qualifiedName())); - } - - for (Tag tag : annotationTypeDoc.tags()) { - annotationNode.getTag().add(parseTag(tag)); - } - - return annotationNode; - } - - /** - * Parse the elements of an annotation - * - * @param annotationTypeElementDoc - * A AnnotationTypeElementDoc instance - * @return the annotation element node - */ - protected AnnotationElement parseAnnotationTypeElementDoc(AnnotationTypeElementDoc annotationTypeElementDoc) { - AnnotationElement annotationElementNode = objectFactory.createAnnotationElement(); - annotationElementNode.setName(annotationTypeElementDoc.name()); - annotationElementNode.setQualified(annotationTypeElementDoc.qualifiedName()); - annotationElementNode.setType(parseTypeInfo(annotationTypeElementDoc.returnType())); - - AnnotationValue value = annotationTypeElementDoc.defaultValue(); - if (value != null) { - annotationElementNode.setDefault(value.toString()); - } - - return annotationElementNode; - } - - /** - * Parses annotation instances of an annotable program element - * - * @param annotationDesc - * annotationDesc - * @param programElement - * programElement - * @return representation of annotations - */ - protected AnnotationInstance parseAnnotationDesc(AnnotationDesc annotationDesc, String programElement) { - AnnotationInstance annotationInstanceNode = objectFactory.createAnnotationInstance(); - - try { - AnnotationTypeDoc annotTypeInfo = annotationDesc.annotationType(); - annotationInstanceNode.setName(annotTypeInfo.name()); - annotationInstanceNode.setQualified(annotTypeInfo.qualifiedTypeName()); - } catch (ClassCastException castException) { - log.error("Unable to obtain type data about an annotation found on: " + programElement); - log.error("Add to the classpath the class/jar that defines this annotation."); - } - - for (AnnotationDesc.ElementValuePair elementValuesPair : annotationDesc.elementValues()) { - AnnotationArgument annotationArgumentNode = objectFactory.createAnnotationArgument(); - annotationArgumentNode.setName(elementValuesPair.element().name()); - - Type annotationArgumentType = elementValuesPair.element().returnType(); - annotationArgumentNode.setType(parseTypeInfo(annotationArgumentType)); - annotationArgumentNode.setPrimitive(annotationArgumentType.isPrimitive()); - annotationArgumentNode.setArray(annotationArgumentType.dimension().length() > 0); - - Object objValue = elementValuesPair.value().value(); - if (objValue instanceof AnnotationValue[]) { - for (AnnotationValue annotationValue : (AnnotationValue[]) objValue) { - if (annotationValue.value() instanceof AnnotationDesc) { + private final static Logger LOGGER = LoggerFactory.getLogger(Parser.class); + + protected Map packages = new TreeMap(); + + protected ObjectFactory objectFactory = new ObjectFactory(); + + /** + * The entry point into parsing the javadoc. + * + * @param rootDoc The RootDoc intstance obtained via the doclet API + * @return The root node, containing everything parsed from javadoc doclet + */ + public Root parseRootDoc(RootDoc rootDoc) { + Root rootNode = objectFactory.createRoot(); + + for (ClassDoc classDoc : rootDoc.classes()) { + PackageDoc packageDoc = classDoc.containingPackage(); + + Package packageNode = packages.get(packageDoc.name()); + if (packageNode == null) { + packageNode = parsePackage(packageDoc); + packages.put(packageDoc.name(), packageNode); + rootNode.getPackage().add(packageNode); + } + + if (classDoc instanceof AnnotationTypeDoc) { + packageNode.getAnnotation() + .add(parseAnnotationTypeDoc((AnnotationTypeDoc) classDoc)); + } else if (classDoc.isEnum()) { + packageNode.getEnum().add(parseEnum(classDoc)); + } else if (classDoc.isInterface()) { + packageNode.getInterface().add(parseInterface(classDoc)); + } else { + packageNode.getClazz().add(parseClass(classDoc)); + } + } + + return rootNode; + } + + protected Package parsePackage(PackageDoc packageDoc) { + Package packageNode = objectFactory.createPackage(); + packageNode.setName(packageDoc.name()); + String comment = packageDoc.commentText(); + if (comment.length() > 0) { + packageNode.setComment(comment); + } + + for (Tag tag : packageDoc.tags()) { + packageNode.getTag().add(parseTag(tag)); + } + + return packageNode; + } + + /** + * Parse an annotation. + * + * @param annotationTypeDoc A AnnotationTypeDoc instance + * @return the annotation node + */ + protected Annotation parseAnnotationTypeDoc(AnnotationTypeDoc annotationTypeDoc) { + Annotation annotationNode = objectFactory.createAnnotation(); + annotationNode.setName(annotationTypeDoc.name()); + annotationNode.setQualified(annotationTypeDoc.qualifiedName()); + String comment = annotationTypeDoc.commentText(); + if (comment.length() > 0) { + annotationNode.setComment(comment); + } + annotationNode.setIncluded(annotationTypeDoc.isIncluded()); + annotationNode.setScope(parseScope(annotationTypeDoc)); + + for (AnnotationTypeElementDoc annotationTypeElementDoc : annotationTypeDoc.elements()) { + annotationNode.getElement() + .add(parseAnnotationTypeElementDoc(annotationTypeElementDoc)); + } + + for (AnnotationDesc annotationDesc : annotationTypeDoc.annotations()) { + annotationNode.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, annotationTypeDoc.qualifiedName())); + } + + for (Tag tag : annotationTypeDoc.tags()) { + annotationNode.getTag().add(parseTag(tag)); + } + + return annotationNode; + } + + /** + * Parse the elements of an annotation + * + * @param annotationTypeElementDoc A AnnotationTypeElementDoc instance + * @return the annotation element node + */ + protected AnnotationElement parseAnnotationTypeElementDoc( + AnnotationTypeElementDoc annotationTypeElementDoc) { + AnnotationElement annotationElementNode = objectFactory.createAnnotationElement(); + annotationElementNode.setName(annotationTypeElementDoc.name()); + annotationElementNode.setQualified(annotationTypeElementDoc.qualifiedName()); + annotationElementNode.setType(parseTypeInfo(annotationTypeElementDoc.returnType())); + + AnnotationValue value = annotationTypeElementDoc.defaultValue(); + if (value != null) { + annotationElementNode.setDefault(value.toString()); + } + + return annotationElementNode; + } + + /** + * Parses annotation instances of an annotable program element + * + * @param annotationDesc annotationDesc + * @param programElement programElement + * @return representation of annotations + */ + protected AnnotationInstance parseAnnotationDesc(AnnotationDesc annotationDesc, + String programElement) { + AnnotationInstance annotationInstanceNode = objectFactory.createAnnotationInstance(); + + try { + AnnotationTypeDoc annotTypeInfo = annotationDesc.annotationType(); + annotationInstanceNode.setName(annotTypeInfo.name()); + annotationInstanceNode.setQualified(annotTypeInfo.qualifiedTypeName()); + } catch (ClassCastException castException) { + LOGGER.error( + "Unable to obtain type data about an annotation found on: " + programElement); + LOGGER.error("Add to the classpath the class/jar that defines this annotation."); + } + + for (AnnotationDesc.ElementValuePair elementValuesPair : annotationDesc.elementValues()) { + AnnotationArgument annotationArgumentNode = objectFactory.createAnnotationArgument(); + annotationArgumentNode.setName(elementValuesPair.element().name()); + + Type annotationArgumentType = elementValuesPair.element().returnType(); + annotationArgumentNode.setType(parseTypeInfo(annotationArgumentType)); + annotationArgumentNode.setPrimitive(annotationArgumentType.isPrimitive()); + annotationArgumentNode.setArray(annotationArgumentType.dimension().length() > 0); + + Object objValue = elementValuesPair.value().value(); + if (objValue instanceof AnnotationValue[]) { + for (AnnotationValue annotationValue : (AnnotationValue[]) objValue) { + if (annotationValue.value() instanceof AnnotationDesc) { AnnotationDesc annoDesc = (AnnotationDesc) annotationValue.value(); - annotationArgumentNode.getAnnotation().add(parseAnnotationDesc(annoDesc, programElement)); + annotationArgumentNode.getAnnotation() + .add(parseAnnotationDesc(annoDesc, programElement)); } else { annotationArgumentNode.getValue().add(annotationValue.value().toString()); } - } - } else if (objValue instanceof FieldDoc) { - annotationArgumentNode.getValue().add(((FieldDoc) objValue).name()); - } else if (objValue instanceof ClassDoc) { - annotationArgumentNode.getValue().add(((ClassDoc) objValue).qualifiedTypeName()); - } else { - annotationArgumentNode.getValue().add(objValue.toString()); - } - annotationInstanceNode.getArgument().add(annotationArgumentNode); - } - - return annotationInstanceNode; - } - - protected Enum parseEnum(ClassDoc classDoc) { - Enum enumNode = objectFactory.createEnum(); - enumNode.setName(classDoc.name()); - enumNode.setQualified(classDoc.qualifiedName()); - String comment = classDoc.commentText(); - if (comment.length() > 0) { - enumNode.setComment(comment); - } - enumNode.setIncluded(classDoc.isIncluded()); - enumNode.setScope(parseScope(classDoc)); - - Type superClassType = classDoc.superclassType(); - if (superClassType != null) { - enumNode.setClazz(parseTypeInfo(superClassType)); - } - - for (Type interfaceType : classDoc.interfaceTypes()) { - enumNode.getInterface().add(parseTypeInfo(interfaceType)); - } - - for (FieldDoc field : classDoc.enumConstants()) { - enumNode.getConstant().add(parseEnumConstant(field)); - } - - for (AnnotationDesc annotationDesc : classDoc.annotations()) { - enumNode.getAnnotation().add(parseAnnotationDesc(annotationDesc, classDoc.qualifiedName())); - } - - for (Tag tag : classDoc.tags()) { - enumNode.getTag().add(parseTag(tag)); - } - - return enumNode; - } - - /** - * Parses an enum type definition - * - * @param fieldDoc - * @return - */ - protected EnumConstant parseEnumConstant(FieldDoc fieldDoc) { - EnumConstant enumConstant = objectFactory.createEnumConstant(); - enumConstant.setName(fieldDoc.name()); - String comment = fieldDoc.commentText(); - if (comment.length() > 0) { - enumConstant.setComment(comment); - } - - for (AnnotationDesc annotationDesc : fieldDoc.annotations()) { - enumConstant.getAnnotation().add(parseAnnotationDesc(annotationDesc, fieldDoc.qualifiedName())); - } - - for (Tag tag : fieldDoc.tags()) { - enumConstant.getTag().add(parseTag(tag)); - } - - return enumConstant; - } - - protected Interface parseInterface(ClassDoc classDoc) { - - Interface interfaceNode = objectFactory.createInterface(); - interfaceNode.setName(classDoc.name()); - interfaceNode.setQualified(classDoc.qualifiedName()); - String comment = classDoc.commentText(); - if (comment.length() > 0) { - interfaceNode.setComment(comment); - } - interfaceNode.setIncluded(classDoc.isIncluded()); - interfaceNode.setScope(parseScope(classDoc)); - - for (TypeVariable typeVariable : classDoc.typeParameters()) { - interfaceNode.getGeneric().add(parseTypeParameter(typeVariable)); - } - - for (Type interfaceType : classDoc.interfaceTypes()) { - interfaceNode.getInterface().add(parseTypeInfo(interfaceType)); - } - - for (MethodDoc method : classDoc.methods()) { - interfaceNode.getMethod().add(parseMethod(method)); - } - - for (AnnotationDesc annotationDesc : classDoc.annotations()) { - interfaceNode.getAnnotation().add(parseAnnotationDesc(annotationDesc, classDoc.qualifiedName())); - } - - for (Tag tag : classDoc.tags()) { - interfaceNode.getTag().add(parseTag(tag)); - } - - for (FieldDoc field : classDoc.fields()) { - interfaceNode.getField().add(parseField(field)); - } - - return interfaceNode; - } - - protected Class parseClass(ClassDoc classDoc) { - - Class classNode = objectFactory.createClass(); - classNode.setName(classDoc.name()); - classNode.setQualified(classDoc.qualifiedName()); - String comment = classDoc.commentText(); - if (comment.length() > 0) { - classNode.setComment(comment); - } - classNode.setAbstract(classDoc.isAbstract()); - classNode.setError(classDoc.isError()); - classNode.setException(classDoc.isException()); - classNode.setExternalizable(classDoc.isExternalizable()); - classNode.setIncluded(classDoc.isIncluded()); - classNode.setSerializable(classDoc.isSerializable()); - classNode.setScope(parseScope(classDoc)); - - for (TypeVariable typeVariable : classDoc.typeParameters()) { - classNode.getGeneric().add(parseTypeParameter(typeVariable)); - } - - Type superClassType = classDoc.superclassType(); - if (superClassType != null) { - classNode.setClazz(parseTypeInfo(superClassType)); - } - - for (Type interfaceType : classDoc.interfaceTypes()) { - classNode.getInterface().add(parseTypeInfo(interfaceType)); - } - - for (MethodDoc method : classDoc.methods()) { - classNode.getMethod().add(parseMethod(method)); - } - - for (AnnotationDesc annotationDesc : classDoc.annotations()) { - classNode.getAnnotation().add(parseAnnotationDesc(annotationDesc, classDoc.qualifiedName())); - } - - for (ConstructorDoc constructor : classDoc.constructors()) { - classNode.getConstructor().add(parseConstructor(constructor)); - } - - for (FieldDoc field : classDoc.fields()) { - classNode.getField().add(parseField(field)); - } - - for (Tag tag : classDoc.tags()) { - classNode.getTag().add(parseTag(tag)); - } - - return classNode; - } - - protected Constructor parseConstructor(ConstructorDoc constructorDoc) { - Constructor constructorNode = objectFactory.createConstructor(); - - constructorNode.setName(constructorDoc.name()); - constructorNode.setQualified(constructorDoc.qualifiedName()); - String comment = constructorDoc.commentText(); - if (comment.length() > 0) { - constructorNode.setComment(comment); - } - constructorNode.setScope(parseScope(constructorDoc)); - constructorNode.setIncluded(constructorDoc.isIncluded()); - constructorNode.setFinal(constructorDoc.isFinal()); - constructorNode.setNative(constructorDoc.isNative()); - constructorNode.setStatic(constructorDoc.isStatic()); - constructorNode.setSynchronized(constructorDoc.isSynchronized()); - constructorNode.setVarArgs(constructorDoc.isVarArgs()); - constructorNode.setSignature(constructorDoc.signature()); - - for (Parameter parameter : constructorDoc.parameters()) { - constructorNode.getParameter().add(parseMethodParameter(parameter)); - } - - for (Type exceptionType : constructorDoc.thrownExceptionTypes()) { - constructorNode.getException().add(parseTypeInfo(exceptionType)); - } - - for (AnnotationDesc annotationDesc : constructorDoc.annotations()) { - constructorNode.getAnnotation().add(parseAnnotationDesc(annotationDesc, constructorDoc.qualifiedName())); - } - - for (Tag tag : constructorDoc.tags()) { - constructorNode.getTag().add(parseTag(tag)); - } - - return constructorNode; - } - - protected Method parseMethod(MethodDoc methodDoc) { - Method methodNode = objectFactory.createMethod(); - - methodNode.setName(methodDoc.name()); - methodNode.setQualified(methodDoc.qualifiedName()); - String comment = methodDoc.commentText(); - if (comment.length() > 0) { - methodNode.setComment(comment); - } - methodNode.setScope(parseScope(methodDoc)); - methodNode.setAbstract(methodDoc.isAbstract()); - methodNode.setIncluded(methodDoc.isIncluded()); - methodNode.setFinal(methodDoc.isFinal()); - methodNode.setNative(methodDoc.isNative()); - methodNode.setStatic(methodDoc.isStatic()); - methodNode.setSynchronized(methodDoc.isSynchronized()); - methodNode.setVarArgs(methodDoc.isVarArgs()); - methodNode.setSignature(methodDoc.signature()); - methodNode.setReturn(parseTypeInfo(methodDoc.returnType())); - - for (Parameter parameter : methodDoc.parameters()) { - methodNode.getParameter().add(parseMethodParameter(parameter)); - } - - for (Type exceptionType : methodDoc.thrownExceptionTypes()) { - methodNode.getException().add(parseTypeInfo(exceptionType)); - } - - for (AnnotationDesc annotationDesc : methodDoc.annotations()) { - methodNode.getAnnotation().add(parseAnnotationDesc(annotationDesc, methodDoc.qualifiedName())); - } - - for (Tag tag : methodDoc.tags()) { - methodNode.getTag().add(parseTag(tag)); - } - - return methodNode; - } - - protected MethodParameter parseMethodParameter(Parameter parameter) { - MethodParameter parameterMethodNode = objectFactory.createMethodParameter(); - parameterMethodNode.setName(parameter.name()); - parameterMethodNode.setType(parseTypeInfo(parameter.type())); - - for (AnnotationDesc annotationDesc : parameter.annotations()) { - parameterMethodNode.getAnnotation().add(parseAnnotationDesc(annotationDesc, parameter.typeName())); - } - - return parameterMethodNode; - } - - protected Field parseField(FieldDoc fieldDoc) { - Field fieldNode = objectFactory.createField(); - fieldNode.setType(parseTypeInfo(fieldDoc.type())); - fieldNode.setName(fieldDoc.name()); - fieldNode.setQualified(fieldDoc.qualifiedName()); - String comment = fieldDoc.commentText(); - if (comment.length() > 0) { - fieldNode.setComment(comment); - } - fieldNode.setScope(parseScope(fieldDoc)); - fieldNode.setFinal(fieldDoc.isFinal()); - fieldNode.setStatic(fieldDoc.isStatic()); - fieldNode.setVolatile(fieldDoc.isVolatile()); - fieldNode.setTransient(fieldDoc.isTransient()); - fieldNode.setConstant(fieldDoc.constantValueExpression()); - - for (AnnotationDesc annotationDesc : fieldDoc.annotations()) { - fieldNode.getAnnotation().add(parseAnnotationDesc(annotationDesc, fieldDoc.qualifiedName())); - } - - for (Tag tag : fieldDoc.tags()) { - fieldNode.getTag().add(parseTag(tag)); - } - - return fieldNode; - } - - protected TypeInfo parseTypeInfo(Type type) { - TypeInfo typeInfoNode = objectFactory.createTypeInfo(); - typeInfoNode.setQualified(type.qualifiedTypeName()); - String dimension = type.dimension(); - if (dimension.length() > 0) { - typeInfoNode.setDimension(dimension); - } - - WildcardType wildcard = type.asWildcardType(); - if (wildcard != null) { - typeInfoNode.setWildcard(parseWildcard(wildcard)); - } - - ParameterizedType parameterized = type.asParameterizedType(); - if (parameterized != null) { - for (Type typeArgument : parameterized.typeArguments()) { - typeInfoNode.getGeneric().add(parseTypeInfo(typeArgument)); - } - } - - return typeInfoNode; - } - - protected Wildcard parseWildcard(WildcardType wildcard) { - Wildcard wildcardNode = objectFactory.createWildcard(); - - for (Type extendType : wildcard.extendsBounds()) { - wildcardNode.getExtendsBound().add(parseTypeInfo(extendType)); - } - - for (Type superType : wildcard.superBounds()) { - wildcardNode.getSuperBound().add(parseTypeInfo(superType)); - } - - return wildcardNode; - } - - /** - * Parse type variables for generics - * - * @param typeVariable - * @return - */ - protected TypeParameter parseTypeParameter(TypeVariable typeVariable) { - TypeParameter typeParameter = objectFactory.createTypeParameter(); - typeParameter.setName(typeVariable.typeName()); - - for (Type bound : typeVariable.bounds()) { - typeParameter.getBound().add(bound.qualifiedTypeName()); - } - - return typeParameter; - } - - protected TagInfo parseTag(Tag tagDoc) { - TagInfo tagNode = objectFactory.createTagInfo(); - tagNode.setName(tagDoc.kind()); - tagNode.setText(tagDoc.text()); - return tagNode; - } - - /** - * Returns string representation of scope - * - * @param doc - * @return - */ - protected String parseScope(ProgramElementDoc doc) { - if (doc.isPrivate()) { - return "private"; - } else if (doc.isProtected()) { - return "protected"; - } else if (doc.isPublic()) { - return "public"; - } - return ""; - } + } + } else if (objValue instanceof FieldDoc) { + annotationArgumentNode.getValue().add(((FieldDoc) objValue).name()); + } else if (objValue instanceof ClassDoc) { + annotationArgumentNode.getValue().add(((ClassDoc) objValue).qualifiedTypeName()); + } else { + annotationArgumentNode.getValue().add(objValue.toString()); + } + annotationInstanceNode.getArgument().add(annotationArgumentNode); + } + + return annotationInstanceNode; + } + + protected Enum parseEnum(ClassDoc classDoc) { + Enum enumNode = objectFactory.createEnum(); + enumNode.setName(classDoc.name()); + enumNode.setQualified(classDoc.qualifiedName()); + String comment = classDoc.commentText(); + if (comment.length() > 0) { + enumNode.setComment(comment); + } + enumNode.setIncluded(classDoc.isIncluded()); + enumNode.setScope(parseScope(classDoc)); + + Type superClassType = classDoc.superclassType(); + if (superClassType != null) { + enumNode.setClazz(parseTypeInfo(superClassType)); + } + + for (Type interfaceType : classDoc.interfaceTypes()) { + enumNode.getInterface().add(parseTypeInfo(interfaceType)); + } + + for (FieldDoc field : classDoc.enumConstants()) { + enumNode.getConstant().add(parseEnumConstant(field)); + } + + for (AnnotationDesc annotationDesc : classDoc.annotations()) { + enumNode.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, classDoc.qualifiedName())); + } + + for (Tag tag : classDoc.tags()) { + enumNode.getTag().add(parseTag(tag)); + } + + return enumNode; + } + + /** + * Parses an enum type definition + * + * @param fieldDoc + * @return + */ + protected EnumConstant parseEnumConstant(FieldDoc fieldDoc) { + EnumConstant enumConstant = objectFactory.createEnumConstant(); + enumConstant.setName(fieldDoc.name()); + String comment = fieldDoc.commentText(); + if (comment.length() > 0) { + enumConstant.setComment(comment); + } + + for (AnnotationDesc annotationDesc : fieldDoc.annotations()) { + enumConstant.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, fieldDoc.qualifiedName())); + } + + for (Tag tag : fieldDoc.tags()) { + enumConstant.getTag().add(parseTag(tag)); + } + + return enumConstant; + } + + protected Interface parseInterface(ClassDoc classDoc) { + + Interface interfaceNode = objectFactory.createInterface(); + interfaceNode.setName(classDoc.name()); + interfaceNode.setQualified(classDoc.qualifiedName()); + String comment = classDoc.commentText(); + if (comment.length() > 0) { + interfaceNode.setComment(comment); + } + interfaceNode.setIncluded(classDoc.isIncluded()); + interfaceNode.setScope(parseScope(classDoc)); + + for (TypeVariable typeVariable : classDoc.typeParameters()) { + interfaceNode.getGeneric().add(parseTypeParameter(typeVariable)); + } + + for (Type interfaceType : classDoc.interfaceTypes()) { + interfaceNode.getInterface().add(parseTypeInfo(interfaceType)); + } + + for (MethodDoc method : classDoc.methods()) { + interfaceNode.getMethod().add(parseMethod(method)); + } + + for (AnnotationDesc annotationDesc : classDoc.annotations()) { + interfaceNode.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, classDoc.qualifiedName())); + } + + for (Tag tag : classDoc.tags()) { + interfaceNode.getTag().add(parseTag(tag)); + } + + for (FieldDoc field : classDoc.fields()) { + interfaceNode.getField().add(parseField(field)); + } + + return interfaceNode; + } + + protected Class parseClass(ClassDoc classDoc) { + + Class classNode = objectFactory.createClass(); + classNode.setName(classDoc.name()); + classNode.setQualified(classDoc.qualifiedName()); + String comment = classDoc.commentText(); + if (comment.length() > 0) { + classNode.setComment(comment); + } + classNode.setAbstract(classDoc.isAbstract()); + classNode.setError(classDoc.isError()); + classNode.setException(classDoc.isException()); + classNode.setExternalizable(classDoc.isExternalizable()); + classNode.setIncluded(classDoc.isIncluded()); + classNode.setSerializable(classDoc.isSerializable()); + classNode.setScope(parseScope(classDoc)); + + for (TypeVariable typeVariable : classDoc.typeParameters()) { + classNode.getGeneric().add(parseTypeParameter(typeVariable)); + } + + Type superClassType = classDoc.superclassType(); + if (superClassType != null) { + classNode.setClazz(parseTypeInfo(superClassType)); + } + + for (Type interfaceType : classDoc.interfaceTypes()) { + classNode.getInterface().add(parseTypeInfo(interfaceType)); + } + + for (MethodDoc method : classDoc.methods()) { + classNode.getMethod().add(parseMethod(method)); + } + + for (AnnotationDesc annotationDesc : classDoc.annotations()) { + classNode.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, classDoc.qualifiedName())); + } + + for (ConstructorDoc constructor : classDoc.constructors()) { + classNode.getConstructor().add(parseConstructor(constructor)); + } + + for (FieldDoc field : classDoc.fields()) { + classNode.getField().add(parseField(field)); + } + + for (Tag tag : classDoc.tags()) { + classNode.getTag().add(parseTag(tag)); + } + + return classNode; + } + + protected Constructor parseConstructor(ConstructorDoc constructorDoc) { + Constructor constructorNode = objectFactory.createConstructor(); + + constructorNode.setName(constructorDoc.name()); + constructorNode.setQualified(constructorDoc.qualifiedName()); + String comment = constructorDoc.commentText(); + if (comment.length() > 0) { + constructorNode.setComment(comment); + } + constructorNode.setScope(parseScope(constructorDoc)); + constructorNode.setIncluded(constructorDoc.isIncluded()); + constructorNode.setFinal(constructorDoc.isFinal()); + constructorNode.setNative(constructorDoc.isNative()); + constructorNode.setStatic(constructorDoc.isStatic()); + constructorNode.setSynchronized(constructorDoc.isSynchronized()); + constructorNode.setVarArgs(constructorDoc.isVarArgs()); + constructorNode.setSignature(constructorDoc.signature()); + + for (Parameter parameter : constructorDoc.parameters()) { + constructorNode.getParameter().add(parseMethodParameter(parameter)); + } + + for (Type exceptionType : constructorDoc.thrownExceptionTypes()) { + constructorNode.getException().add(parseTypeInfo(exceptionType)); + } + + for (AnnotationDesc annotationDesc : constructorDoc.annotations()) { + constructorNode.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, constructorDoc.qualifiedName())); + } + + for (Tag tag : constructorDoc.tags()) { + constructorNode.getTag().add(parseTag(tag)); + } + + return constructorNode; + } + + protected Method parseMethod(MethodDoc methodDoc) { + Method methodNode = objectFactory.createMethod(); + + methodNode.setName(methodDoc.name()); + methodNode.setQualified(methodDoc.qualifiedName()); + String comment = methodDoc.commentText(); + if (comment.length() > 0) { + methodNode.setComment(comment); + } + methodNode.setScope(parseScope(methodDoc)); + methodNode.setAbstract(methodDoc.isAbstract()); + methodNode.setIncluded(methodDoc.isIncluded()); + methodNode.setFinal(methodDoc.isFinal()); + methodNode.setNative(methodDoc.isNative()); + methodNode.setStatic(methodDoc.isStatic()); + methodNode.setSynchronized(methodDoc.isSynchronized()); + methodNode.setVarArgs(methodDoc.isVarArgs()); + methodNode.setSignature(methodDoc.signature()); + methodNode.setReturn(parseTypeInfo(methodDoc.returnType())); + + for (Parameter parameter : methodDoc.parameters()) { + methodNode.getParameter().add(parseMethodParameter(parameter)); + } + + for (Type exceptionType : methodDoc.thrownExceptionTypes()) { + methodNode.getException().add(parseTypeInfo(exceptionType)); + } + + for (AnnotationDesc annotationDesc : methodDoc.annotations()) { + methodNode.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, methodDoc.qualifiedName())); + } + + for (Tag tag : methodDoc.tags()) { + methodNode.getTag().add(parseTag(tag)); + } + + return methodNode; + } + + protected MethodParameter parseMethodParameter(Parameter parameter) { + MethodParameter parameterMethodNode = objectFactory.createMethodParameter(); + parameterMethodNode.setName(parameter.name()); + parameterMethodNode.setType(parseTypeInfo(parameter.type())); + + for (AnnotationDesc annotationDesc : parameter.annotations()) { + parameterMethodNode.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, parameter.typeName())); + } + + return parameterMethodNode; + } + + protected Field parseField(FieldDoc fieldDoc) { + Field fieldNode = objectFactory.createField(); + fieldNode.setType(parseTypeInfo(fieldDoc.type())); + fieldNode.setName(fieldDoc.name()); + fieldNode.setQualified(fieldDoc.qualifiedName()); + String comment = fieldDoc.commentText(); + if (comment.length() > 0) { + fieldNode.setComment(comment); + } + fieldNode.setScope(parseScope(fieldDoc)); + fieldNode.setFinal(fieldDoc.isFinal()); + fieldNode.setStatic(fieldDoc.isStatic()); + fieldNode.setVolatile(fieldDoc.isVolatile()); + fieldNode.setTransient(fieldDoc.isTransient()); + fieldNode.setConstant(fieldDoc.constantValueExpression()); + + for (AnnotationDesc annotationDesc : fieldDoc.annotations()) { + fieldNode.getAnnotation() + .add(parseAnnotationDesc(annotationDesc, fieldDoc.qualifiedName())); + } + + for (Tag tag : fieldDoc.tags()) { + fieldNode.getTag().add(parseTag(tag)); + } + + return fieldNode; + } + + protected TypeInfo parseTypeInfo(Type type) { + TypeInfo typeInfoNode = objectFactory.createTypeInfo(); + typeInfoNode.setQualified(type.qualifiedTypeName()); + String dimension = type.dimension(); + if (dimension.length() > 0) { + typeInfoNode.setDimension(dimension); + } + + WildcardType wildcard = type.asWildcardType(); + if (wildcard != null) { + typeInfoNode.setWildcard(parseWildcard(wildcard)); + } + + ParameterizedType parameterized = type.asParameterizedType(); + if (parameterized != null) { + for (Type typeArgument : parameterized.typeArguments()) { + typeInfoNode.getGeneric().add(parseTypeInfo(typeArgument)); + } + } + + return typeInfoNode; + } + + protected Wildcard parseWildcard(WildcardType wildcard) { + Wildcard wildcardNode = objectFactory.createWildcard(); + + for (Type extendType : wildcard.extendsBounds()) { + wildcardNode.getExtendsBound().add(parseTypeInfo(extendType)); + } + + for (Type superType : wildcard.superBounds()) { + wildcardNode.getSuperBound().add(parseTypeInfo(superType)); + } + + return wildcardNode; + } + + /** + * Parse type variables for generics + * + * @param typeVariable + * @return + */ + protected TypeParameter parseTypeParameter(TypeVariable typeVariable) { + TypeParameter typeParameter = objectFactory.createTypeParameter(); + typeParameter.setName(typeVariable.typeName()); + + for (Type bound : typeVariable.bounds()) { + typeParameter.getBound().add(bound.qualifiedTypeName()); + } + + return typeParameter; + } + + protected TagInfo parseTag(Tag tagDoc) { + TagInfo tagNode = objectFactory.createTagInfo(); + tagNode.setName(tagDoc.kind()); + tagNode.setText(tagDoc.text()); + return tagNode; + } + + /** + * Returns string representation of scope + * + * @param doc + * @return + */ + protected String parseScope(ProgramElementDoc doc) { + if (doc.isPrivate()) { + return "private"; + } else if (doc.isProtected()) { + return "protected"; + } else if (doc.isPublic()) { + return "public"; + } + return ""; + } } diff --git a/src/main/java/com/github/markusbernhardt/xmldoclet/XmlDoclet.java b/src/main/java/com/github/markusbernhardt/xmldoclet/XmlDoclet.java index 99b029e..5bd296f 100644 --- a/src/main/java/com/github/markusbernhardt/xmldoclet/XmlDoclet.java +++ b/src/main/java/com/github/markusbernhardt/xmldoclet/XmlDoclet.java @@ -6,6 +6,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -38,224 +39,218 @@ */ public class XmlDoclet { - private final static Logger log = LoggerFactory.getLogger(Parser.class); + private final static Logger LOGGER = LoggerFactory.getLogger(Parser.class); - /** - * The parsed object model. Used in unit tests. - */ - public static Root root; + /** + * The parsed object model. Used in unit tests. + */ + public static Root root; - /** - * The Options instance to parse command line strings. - */ - public final static Options options; + /** + * The Options instance to parse command line strings. + */ + public final static Options OPTIONS; - static { - options = new Options(); + static { + OPTIONS = new Options(); - OptionBuilder.withArgName("directory"); - OptionBuilder.isRequired(false); - OptionBuilder.hasArg(); - OptionBuilder.withDescription("Destination directory for output file.\nDefault: ."); - options.addOption(OptionBuilder.create("d")); + OptionBuilder.withArgName("directory"); + OptionBuilder.isRequired(false); + OptionBuilder.hasArg(); + OptionBuilder.withDescription("Destination directory for output file.\nDefault: ."); + OPTIONS.addOption(OptionBuilder.create("d")); - OptionBuilder.withArgName("encoding"); - OptionBuilder.isRequired(false); - OptionBuilder.hasArg(); - OptionBuilder.withDescription("Encoding of the output file.\nDefault: UTF8"); - options.addOption(OptionBuilder.create("docencoding")); + OptionBuilder.withArgName("encoding"); + OptionBuilder.isRequired(false); + OptionBuilder.hasArg(); + OptionBuilder.withDescription("Encoding of the output file.\nDefault: UTF8"); + OPTIONS.addOption(OptionBuilder.create("docencoding")); - OptionBuilder.withArgName("dryrun"); - OptionBuilder.isRequired(false); - OptionBuilder.hasArgs(0); - OptionBuilder.withDescription("Parse javadoc, but don't write output file.\nDefault: false"); - options.addOption(OptionBuilder.create("dryrun")); + OptionBuilder.withArgName("dryrun"); + OptionBuilder.isRequired(false); + OptionBuilder.hasArgs(0); + OptionBuilder + .withDescription("Parse javadoc, but don't write output file.\nDefault: false"); + OPTIONS.addOption(OptionBuilder.create("dryrun")); - OptionBuilder.withArgName("filename"); - OptionBuilder.isRequired(false); - OptionBuilder.hasArg(); - OptionBuilder.withDescription("Name of the output file.\nDefault: javadoc.xml"); - options.addOption(OptionBuilder.create("filename")); - } + OptionBuilder.withArgName("filename"); + OptionBuilder.isRequired(false); + OptionBuilder.hasArg(); + OptionBuilder.withDescription("Name of the output file.\nDefault: javadoc.xml"); + OPTIONS.addOption(OptionBuilder.create("filename")); + } - /** - * Check for doclet-added options. Returns the number of arguments you must - * specify on the command line for the given option. For example, "-d docs" - * would return 2. - *

- * This method is required if the doclet contains any options. If this - * method is missing, Javadoc will print an invalid flag error for every - * option. - * - * @see com.sun.javadoc.Doclet#optionLength(String) - * - * @param optionName - * The name of the option. - * @return number of arguments on the command line for an option including - * the option name itself. Zero return means option not known. - * Negative value means error occurred. - */ - public static int optionLength(String optionName) { - Option option = options.getOption(optionName); - if (option == null) { - return 0; - } - return option.getArgs() + 1; - } + /** + * Check for doclet-added options. Returns the number of arguments you must specify on the + * command line for the given option. For example, "-d docs" would return 2. + *

+ * This method is required if the doclet contains any options. If this method is missing, + * Javadoc will print an invalid flag error for every option. + * + * @see com.sun.javadoc.Doclet#optionLength(String) + * + * @param optionName The name of the option. + * @return number of arguments on the command line for an option including the option name + * itself. Zero return means option not known. Negative value means error occurred. + */ + public static int optionLength(String optionName) { + Option option = OPTIONS.getOption(optionName); + if (option == null) { + return 0; + } + return option.getArgs() + 1; + } - /** - * Check that options have the correct arguments. - *

- * This method is not required, but is recommended, as every option will be - * considered valid if this method is not present. It will default - * gracefully (to true) if absent. - *

- * Printing option related error messages (using the provided - * DocErrorReporter) is the responsibility of this method. - * - * @see com.sun.javadoc.Doclet#validOptions(String[][], DocErrorReporter) - * - * @param optionsArrayArray - * The two dimensional array of options. - * @param reporter - * The error reporter. - * - * @return true if the options are valid. - */ - public static boolean validOptions(String optionsArrayArray[][], DocErrorReporter reporter) { - return null != parseCommandLine(optionsArrayArray); - } + /** + * Check that options have the correct arguments. + *

+ * This method is not required, but is recommended, as every option will be considered valid if + * this method is not present. It will default gracefully (to true) if absent. + *

+ * Printing option related error messages (using the provided DocErrorReporter) is the + * responsibility of this method. + * + * @see com.sun.javadoc.Doclet#validOptions(String[][], DocErrorReporter) + * + * @param optionsArrayArray The two dimensional array of options. + * @param reporter The error reporter. + * + * @return true if the options are valid. + */ + public static boolean validOptions(String optionsArrayArray[][], DocErrorReporter reporter) { + return null != parseCommandLine(optionsArrayArray); + } - /** - * Processes the JavaDoc documentation. - *

- * This method is required for all doclets. - * - * @see com.sun.javadoc.Doclet#start(RootDoc) - * - * @param rootDoc - * The root of the documentation tree. - * - * @return true if processing was successful. - */ - public static boolean start(RootDoc rootDoc) { - CommandLine commandLine = parseCommandLine(rootDoc.options()); - Parser parser = new Parser(); - root = parser.parseRootDoc(rootDoc); - save(commandLine, root); - return true; - } + /** + * Processes the JavaDoc documentation. + *

+ * This method is required for all doclets. + * + * @see com.sun.javadoc.Doclet#start(RootDoc) + * + * @param rootDoc The root of the documentation tree. + * + * @return true if processing was successful. + */ + public static boolean start(RootDoc rootDoc) { + CommandLine commandLine = parseCommandLine(rootDoc.options()); + Parser parser = new Parser(); + root = parser.parseRootDoc(rootDoc); + save(commandLine, root); + return true; + } - /** - * Save XML object model to a file via JAXB. - * - * @param commandLine - * the parsed command line arguments - * @param root - * the document root - */ - public static void save(CommandLine commandLine, Root root) { - if (commandLine.hasOption("dryrun")) { - return; - } + /** + * Save XML object model to a file via JAXB. + * + * @param commandLine the parsed command line arguments + * @param root the document root + */ + public static void save(CommandLine commandLine, Root root) { + if (commandLine.hasOption("dryrun")) { + return; + } - FileOutputStream fileOutputStream = null; - BufferedOutputStream bufferedOutputStream = null; - try { - JAXBContext contextObj = JAXBContext.newInstance(Root.class); + FileOutputStream fileOutputStream = null; + BufferedOutputStream bufferedOutputStream = null; + try { + JAXBContext contextObj = JAXBContext.newInstance(Root.class); - Marshaller marshaller = contextObj.createMarshaller(); - marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); - if (commandLine.hasOption("docencoding")) { - marshaller.setProperty(Marshaller.JAXB_ENCODING, commandLine.getOptionValue("docencoding")); - } + Marshaller marshaller = contextObj.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); + if (commandLine.hasOption("docencoding")) { + marshaller.setProperty(Marshaller.JAXB_ENCODING, + commandLine.getOptionValue("docencoding")); + } - String filename = "javadoc.xml"; - if (commandLine.hasOption("filename")) { - filename = commandLine.getOptionValue("filename"); - } - if (commandLine.hasOption("d")) { - filename = commandLine.getOptionValue("d") + File.separator + filename; - } + String filename = "javadoc.xml"; + if (commandLine.hasOption("filename")) { + filename = commandLine.getOptionValue("filename"); + } + if (commandLine.hasOption("d")) { + filename = commandLine.getOptionValue("d") + File.separator + filename; + } - fileOutputStream = new FileOutputStream(filename); - bufferedOutputStream = new BufferedOutputStream(fileOutputStream, 1024 * 1024); + fileOutputStream = new FileOutputStream(filename); + bufferedOutputStream = new BufferedOutputStream(fileOutputStream, 1024 * 1024); - marshaller.marshal(root, bufferedOutputStream); - bufferedOutputStream.flush(); - fileOutputStream.flush(); + marshaller.marshal(root, bufferedOutputStream); + bufferedOutputStream.flush(); + fileOutputStream.flush(); - } catch (JAXBException e) { - log.error(e.getMessage(), e); - } catch (FileNotFoundException e) { - log.error(e.getMessage(), e); - } catch (IOException e) { - log.error(e.getMessage(), e); - } finally { - try { - if (bufferedOutputStream != null) { - bufferedOutputStream.close(); - } - if (fileOutputStream != null) { - fileOutputStream.close(); - } - } catch (IOException e) { - log.error(e.getMessage(), e); - } - } - } + } catch (JAXBException e) { + LOGGER.error(e.getMessage(), e); + } catch (FileNotFoundException e) { + LOGGER.error(e.getMessage(), e); + } catch (IOException e) { + LOGGER.error(e.getMessage(), e); + } finally { + try { + if (bufferedOutputStream != null) { + bufferedOutputStream.close(); + } + if (fileOutputStream != null) { + fileOutputStream.close(); + } + } catch (IOException e) { + LOGGER.error(e.getMessage(), e); + } + } + } - /** - * Return the version of the Java Programming Language supported by this - * doclet. - *

- * This method is required by any doclet supporting a language version newer - * than 1.1. - *

- * This Doclet supports Java 5. - * - * @see com.sun.javadoc.Doclet#languageVersion() - * - * @return LanguageVersion#JAVA_1_5 - */ - public static LanguageVersion languageVersion() { - return LanguageVersion.JAVA_1_5; - } + /** + * Return the version of the Java Programming Language supported by this doclet. + *

+ * This method is required by any doclet supporting a language version newer than 1.1. + *

+ * This Doclet supports Java 5. + * + * @see com.sun.javadoc.Doclet#languageVersion() + * + * @return LanguageVersion#JAVA_1_5 + */ + public static LanguageVersion languageVersion() { + return LanguageVersion.JAVA_1_5; + } - /** - * Parse the given options. - * - * @param optionsArrayArray - * The two dimensional array of options. - * @return the parsed command line arguments. - */ - public static CommandLine parseCommandLine(String[][] optionsArrayArray) { - try { - List argumentList = new ArrayList(); - for (String[] optionsArray : optionsArrayArray) { - argumentList.addAll(Arrays.asList(optionsArray)); - } + /** + * Parse the given options. + * + * @param optionsArrayArray The two dimensional array of options. + * @return the parsed command line arguments. + */ + public static CommandLine parseCommandLine(String[][] optionsArrayArray) { + try { + List argumentList = new ArrayList(); + for (String[] optionsArray : optionsArrayArray) { + argumentList.addAll(Arrays.asList(optionsArray)); + } - CommandLineParser commandLineParser = new BasicParser() { - @Override - protected void processOption(final String arg, @SuppressWarnings("rawtypes") final ListIterator iter) - throws ParseException { - boolean hasOption = getOptions().hasOption(arg); - if (hasOption) { - super.processOption(arg, iter); - } - } - }; - CommandLine commandLine = commandLineParser.parse(options, argumentList.toArray(new String[] {})); - return commandLine; - } catch (ParseException e) { - LoggingOutputStream loggingOutputStream = new LoggingOutputStream(log, LoggingLevelEnum.INFO); - PrintWriter printWriter = new PrintWriter(loggingOutputStream); + CommandLineParser commandLineParser = new BasicParser() { + @Override + protected void processOption(final String arg, + @SuppressWarnings("rawtypes") final ListIterator iter) + throws ParseException { + boolean hasOption = getOptions().hasOption(arg); + if (hasOption) { + super.processOption(arg, iter); + } + } + }; + CommandLine commandLine = + commandLineParser.parse(OPTIONS, argumentList.toArray(new String[] {})); + return commandLine; + } catch (ParseException e) { + LoggingOutputStream loggingOutputStream = + new LoggingOutputStream(LOGGER, LoggingLevelEnum.INFO); + PrintWriter printWriter = + new PrintWriter(loggingOutputStream, true, Charset.defaultCharset()); - HelpFormatter helpFormatter = new HelpFormatter(); - helpFormatter.printHelp(printWriter, 74, "javadoc -doclet " + XmlDoclet.class.getName() + " [options]", - null, options, 1, 3, null, false); - return null; - } - } + HelpFormatter helpFormatter = new HelpFormatter(); + helpFormatter.printHelp(printWriter, 74, + "javadoc -doclet " + XmlDoclet.class.getName() + " [options]", + null, OPTIONS, 1, 3, null, false); + return null; + } + } } diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/AbstractTestParent.java b/src/test/java/com/github/markusbernhardt/xmldoclet/AbstractTestParent.java index 4a0b392..8c9783f 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/AbstractTestParent.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/AbstractTestParent.java @@ -18,156 +18,140 @@ */ public class AbstractTestParent { - private final static Logger log = LoggerFactory.getLogger(AbstractTestParent.class); - - /** - * Processes the source code using javadoc. - * - * @param extendedClassPath - * Any classpath information required to help along javadoc. - * Javadoc will actualy compile the source code you specify; so - * if there are any jars or classes that are referenced by the - * source code to process, then including those compiled items in - * the classpath will give you more complete data in the - * resulting XML. - * @param sourcePaths - * Usually sourcePaths is specified in conjuction with - * either/both packages & subpackages. The sourcepaths value - * should be the path of the source files right before the - * standard package-based folder layout of projects begins. For - * example, if you have code that exists in package foo.bar, and - * your code is physically in /MyFolder/foo/bar/ , then the - * sourcePaths would be /MyFolder - * @param packages - * Use if you want to detail specific packages to process - * (contrast with subpackages, which is probably the easiest/most - * brute force way of using xml-doclet). If you have within your - * code two packages, foo.bar and bar.foo, but only wanted - * foo.bar processed, then specify just 'foo.bar' for this - * argument. - * @param sourceFiles - * You can specify source files individually. This usually is - * used instead of sourcePaths/subPackages/packages. If you use - * this parameter, specify the full path of any java file you - * want processed. - * @param subPackages - * You can specify 'subPackages', which simply gives one an easy - * way to specify the root package, and have javadoc recursively - * look through everything under that package. So for instance, - * if you had foo.bar, foo.bar.bar, and bar.foo, specifying 'foo' - * will process foo.bar and foo.bar.bar packages, but not bar.foo - * (unless you specify 'bar' as a subpackage, too) - * @param additionalArguments - * Additional Arguments. - * @return XStream compatible data structure - */ - public Root executeJavadoc(String extendedClassPath, String[] sourcePaths, String[] packages, String[] sourceFiles, - String[] subPackages, String[] additionalArguments) { - try { - OutputStream errors = new LoggingOutputStream(log, LoggingLevelEnum.ERROR); - OutputStream warnings = new LoggingOutputStream(log, LoggingLevelEnum.WARN); - OutputStream notices = new LoggingOutputStream(log, LoggingLevelEnum.INFO); - - PrintWriter errorWriter = new PrintWriter(errors, false); - PrintWriter warningWriter = new PrintWriter(warnings, false); - PrintWriter noticeWriter = new PrintWriter(notices, false); - - // aggregate arguments and packages - ArrayList argumentList = new ArrayList(); - - // by setting this to 'private', nothing is omitted in the parsing - argumentList.add("-private"); - - String classPath = System.getProperty("java.class.path", "."); - if (extendedClassPath != null) { - classPath += File.pathSeparator + extendedClassPath; - } - argumentList.add("-classpath"); - argumentList.add(classPath); - - if (sourcePaths != null) { - String concatedSourcePaths = join(File.pathSeparator, sourcePaths); - if (concatedSourcePaths.length() > 0) { - argumentList.add("-sourcepath"); - argumentList.add(concatedSourcePaths); - } - } - - if (subPackages != null) { - String concatedSubPackages = join(";", subPackages); - if (concatedSubPackages.length() > 0) { - argumentList.add("-subpackages"); - argumentList.add(concatedSubPackages); - } - } - - if (packages != null) { - argumentList.addAll(Arrays.asList(packages)); - } - - if (sourceFiles != null) { - argumentList.addAll(Arrays.asList(sourceFiles)); - } - - if (additionalArguments != null) { - argumentList.addAll(Arrays.asList(additionalArguments)); - } - - log.info("Executing doclet with arguments: " + join(" ", argumentList)); - - String[] arguments = argumentList.toArray(new String[] {}); - com.sun.tools.javadoc.Main.execute("xml-doclet", errorWriter, warningWriter, noticeWriter, - XmlDoclet.class.getName(), arguments); - - errors.close(); - warnings.close(); - notices.close(); - - log.info("done with doclet processing"); - } catch (Exception e) { - log.error("doclet exception", e); - } catch (Error e) { - log.error("doclet error", e); - } - - return XmlDoclet.root; - } - - /** - * Helper method to concat strings. - * - * @param glue - * the seperator. - * @param strings - * the strings to concat. - * @return concated string - */ - public static String join(String glue, String[] strings) { - return join(glue, Arrays.asList(strings)); - } - - /** - * Helper method to concat strings. - * - * @param glue - * the seperator. - * @param strings - * the strings to concat. - * @return concated string - */ - public static String join(String glue, Iterable strings) { - if (strings == null) { - return null; - } - - StringBuilder stringBuilder = new StringBuilder(); - String verkett = ""; - for (String string : strings) { - stringBuilder.append(verkett); - stringBuilder.append(string); - verkett = glue; - } - return stringBuilder.toString(); - } + private final static Logger LOGGER = LoggerFactory.getLogger(AbstractTestParent.class); + + /** + * Processes the source code using javadoc. + * + * @param extendedClassPath Any classpath information required to help along javadoc. Javadoc + * will actualy compile the source code you specify; so if there are any jars or classes + * that are referenced by the source code to process, then including those compiled items + * in the classpath will give you more complete data in the resulting XML. + * @param sourcePaths Usually sourcePaths is specified in conjuction with either/both packages & + * subpackages. The sourcepaths value should be the path of the source files right before + * the standard package-based folder layout of projects begins. For example, if you have + * code that exists in package foo.bar, and your code is physically in /MyFolder/foo/bar/ + * , then the sourcePaths would be /MyFolder + * @param packages Use if you want to detail specific packages to process (contrast with + * subpackages, which is probably the easiest/most brute force way of using xml-doclet). + * If you have within your code two packages, foo.bar and bar.foo, but only wanted + * foo.bar processed, then specify just 'foo.bar' for this argument. + * @param sourceFiles You can specify source files individually. This usually is used instead of + * sourcePaths/subPackages/packages. If you use this parameter, specify the full path of + * any java file you want processed. + * @param subPackages You can specify 'subPackages', which simply gives one an easy way to + * specify the root package, and have javadoc recursively look through everything under + * that package. So for instance, if you had foo.bar, foo.bar.bar, and bar.foo, + * specifying 'foo' will process foo.bar and foo.bar.bar packages, but not bar.foo + * (unless you specify 'bar' as a subpackage, too) + * @param additionalArguments Additional Arguments. + * @return XStream compatible data structure + */ + public Root executeJavadoc(String extendedClassPath, String[] sourcePaths, String[] packages, + String[] sourceFiles, + String[] subPackages, String[] additionalArguments) { + try { + OutputStream errors = new LoggingOutputStream(LOGGER, LoggingLevelEnum.ERROR); + OutputStream warnings = new LoggingOutputStream(LOGGER, LoggingLevelEnum.WARN); + OutputStream notices = new LoggingOutputStream(LOGGER, LoggingLevelEnum.INFO); + + PrintWriter errorWriter = new PrintWriter(errors, false); + PrintWriter warningWriter = new PrintWriter(warnings, false); + PrintWriter noticeWriter = new PrintWriter(notices, false); + + // aggregate arguments and packages + ArrayList argumentList = new ArrayList(); + + // by setting this to 'private', nothing is omitted in the parsing + argumentList.add("-private"); + + String classPath = System.getProperty("java.class.path", "."); + if (extendedClassPath != null) { + classPath += File.pathSeparator + extendedClassPath; + } + argumentList.add("-classpath"); + argumentList.add(classPath); + + if (sourcePaths != null) { + String concatedSourcePaths = join(File.pathSeparator, sourcePaths); + if (concatedSourcePaths.length() > 0) { + argumentList.add("-sourcepath"); + argumentList.add(concatedSourcePaths); + } + } + + if (subPackages != null) { + String concatedSubPackages = join(";", subPackages); + if (concatedSubPackages.length() > 0) { + argumentList.add("-subpackages"); + argumentList.add(concatedSubPackages); + } + } + + if (packages != null) { + argumentList.addAll(Arrays.asList(packages)); + } + + if (sourceFiles != null) { + argumentList.addAll(Arrays.asList(sourceFiles)); + } + + if (additionalArguments != null) { + argumentList.addAll(Arrays.asList(additionalArguments)); + } + + LOGGER.info("Executing doclet with arguments: " + join(" ", argumentList)); + + String[] arguments = argumentList.toArray(new String[] {}); + com.sun.tools.javadoc.Main.execute("xml-doclet", errorWriter, warningWriter, + noticeWriter, + XmlDoclet.class.getName(), arguments); + + errors.close(); + warnings.close(); + notices.close(); + + LOGGER.info("done with doclet processing"); + } catch (Exception e) { + LOGGER.error("doclet exception", e); + } catch (Error e) { + LOGGER.error("doclet error", e); + } + + return XmlDoclet.root; + } + + /** + * Helper method to concat strings. + * + * @param glue the seperator. + * @param strings the strings to concat. + * @return concated string + */ + public static String join(String glue, String[] strings) { + return join(glue, Arrays.asList(strings)); + } + + /** + * Helper method to concat strings. + * + * @param glue the seperator. + * @param strings the strings to concat. + * @return concated string + */ + public static String join(String glue, Iterable strings) { + if (strings == null) { + return null; + } + + StringBuilder stringBuilder = new StringBuilder(); + String verkett = ""; + for (String string : strings) { + stringBuilder.append(verkett); + stringBuilder.append(string); + verkett = glue; + } + return stringBuilder.toString(); + } } diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/AnnotationTest.java b/src/test/java/com/github/markusbernhardt/xmldoclet/AnnotationTest.java index e86e414..11474c0 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/AnnotationTest.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/AnnotationTest.java @@ -19,137 +19,147 @@ */ @SuppressWarnings("deprecation") public class AnnotationTest extends AbstractTestParent { - /** - * Rigourous Parser :-) - */ - @Test - public void testSampledoc() { - executeJavadoc(null, new String[] { "./src/test/java" }, null, null, new String[] { "com" }, - new String[] { "-dryrun" }); - } - - /** - * testing an annotation with nothing defined - */ - @Test - public void testAnnotation1() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation1.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Annotation annotationNode = packageNode.getAnnotation().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertEquals(packageNode.getComment(), null); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 1); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(annotationNode.getComment(), "Annotation1"); - assertEquals(annotationNode.getName(), Annotation1.class.getSimpleName()); - assertEquals(annotationNode.getQualified(), Annotation1.class.getName()); - assertEquals(annotationNode.getScope(), "public"); - assertEquals(annotationNode.getAnnotation().size(), 0); - assertEquals(annotationNode.getElement().size(), 0); - assertTrue(annotationNode.isIncluded()); - } - - /** - * testing an annotation with an annotation decorating it - */ - @Test - public void testAnnotation2() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation2.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Annotation annotationNode = packageNode.getAnnotation().get(0); - AnnotationInstance annotationInstance = annotationNode.getAnnotation().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertEquals(packageNode.getComment(), null); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 1); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(annotationNode.getComment(), "Annotation2"); - assertEquals(annotationNode.getName(), Annotation2.class.getSimpleName()); - assertEquals(annotationNode.getQualified(), Annotation2.class.getName()); - assertEquals(annotationNode.getScope(), "public"); - assertEquals(annotationNode.getAnnotation().size(), 1); - assertEquals(annotationNode.getElement().size(), 0); - assertTrue(annotationNode.isIncluded()); - - // test annotation 'deprecated' on class - assertEquals(annotationInstance.getQualified(), "java.lang.Deprecated"); - assertEquals(annotationInstance.getName(), "Deprecated"); - assertEquals(annotationInstance.getArgument().size(), 0); - } - - /** - * testing an annotation with one element field - */ - @Test - public void testAnnotation3() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation3.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Annotation annotationNode = packageNode.getAnnotation().get(0); - AnnotationElement element = annotationNode.getElement().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertEquals(packageNode.getComment(), null); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 1); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(annotationNode.getComment(), "Annotation3"); - assertEquals(annotationNode.getName(), Annotation3.class.getSimpleName()); - assertEquals(annotationNode.getQualified(), Annotation3.class.getName()); - assertEquals(annotationNode.getScope(), "public"); - assertEquals(annotationNode.getAnnotation().size(), 0); - assertEquals(annotationNode.getElement().size(), 1); - assertTrue(annotationNode.isIncluded()); - - // test annotation element - assertEquals(element.getName(), "id"); - assertEquals(element.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Annotation3.id"); - assertEquals(element.getType().getQualified(), "int"); - assertEquals(element.getDefault(), Integer.toString(3)); - } - - /** - * testing an annotation with non-public definition - */ - @Test - public void testAnnotation4() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation4.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Annotation annotationNode = packageNode.getAnnotation().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertEquals(packageNode.getComment(), null); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 1); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(annotationNode.getComment(), "Annotation4"); - assertEquals(annotationNode.getName(), "Annotation4"); - assertEquals(annotationNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Annotation4"); - assertEquals(annotationNode.getScope(), ""); - assertEquals(annotationNode.getAnnotation().size(), 0); - assertEquals(annotationNode.getElement().size(), 0); - assertTrue(annotationNode.isIncluded()); - } -} \ No newline at end of file + /** + * Rigourous Parser :-) + */ + @Test + public void testSampledoc() { + executeJavadoc(null, new String[] {"./src/test/java"}, null, null, new String[] {"com"}, + new String[] {"-dryrun"}); + } + + /** + * testing an annotation with nothing defined + */ + @Test + public void testAnnotation1() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation1.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Annotation annotationNode = packageNode.getAnnotation().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertEquals(packageNode.getComment(), null); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 1); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(annotationNode.getComment(), "Annotation1"); + assertEquals(annotationNode.getName(), Annotation1.class.getSimpleName()); + assertEquals(annotationNode.getQualified(), Annotation1.class.getName()); + assertEquals(annotationNode.getScope(), "public"); + assertEquals(annotationNode.getAnnotation().size(), 0); + assertEquals(annotationNode.getElement().size(), 0); + assertTrue(annotationNode.isIncluded()); + } + + /** + * testing an annotation with an annotation decorating it + */ + @Test + public void testAnnotation2() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation2.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Annotation annotationNode = packageNode.getAnnotation().get(0); + AnnotationInstance annotationInstance = annotationNode.getAnnotation().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertEquals(packageNode.getComment(), null); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 1); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(annotationNode.getComment(), "Annotation2"); + assertEquals(annotationNode.getName(), Annotation2.class.getSimpleName()); + assertEquals(annotationNode.getQualified(), Annotation2.class.getName()); + assertEquals(annotationNode.getScope(), "public"); + assertEquals(annotationNode.getAnnotation().size(), 1); + assertEquals(annotationNode.getElement().size(), 0); + assertTrue(annotationNode.isIncluded()); + + // test annotation 'deprecated' on class + assertEquals(annotationInstance.getQualified(), "java.lang.Deprecated"); + assertEquals(annotationInstance.getName(), "Deprecated"); + assertEquals(annotationInstance.getArgument().size(), 0); + } + + /** + * testing an annotation with one element field + */ + @Test + public void testAnnotation3() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation3.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Annotation annotationNode = packageNode.getAnnotation().get(0); + AnnotationElement element = annotationNode.getElement().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertEquals(packageNode.getComment(), null); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 1); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(annotationNode.getComment(), "Annotation3"); + assertEquals(annotationNode.getName(), Annotation3.class.getSimpleName()); + assertEquals(annotationNode.getQualified(), Annotation3.class.getName()); + assertEquals(annotationNode.getScope(), "public"); + assertEquals(annotationNode.getAnnotation().size(), 0); + assertEquals(annotationNode.getElement().size(), 1); + assertTrue(annotationNode.isIncluded()); + + // test annotation element + assertEquals(element.getName(), "id"); + assertEquals(element.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Annotation3.id"); + assertEquals(element.getType().getQualified(), "int"); + assertEquals(element.getDefault(), Integer.toString(3)); + } + + /** + * testing an annotation with non-public definition + */ + @Test + public void testAnnotation4() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation4.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Annotation annotationNode = packageNode.getAnnotation().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertEquals(packageNode.getComment(), null); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 1); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(annotationNode.getComment(), "Annotation4"); + assertEquals(annotationNode.getName(), "Annotation4"); + assertEquals(annotationNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Annotation4"); + assertEquals(annotationNode.getScope(), ""); + assertEquals(annotationNode.getAnnotation().size(), 0); + assertEquals(annotationNode.getElement().size(), 0); + assertTrue(annotationNode.isIncluded()); + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/ClassTest.java b/src/test/java/com/github/markusbernhardt/xmldoclet/ClassTest.java index dbd3731..e5b4e4a 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/ClassTest.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/ClassTest.java @@ -1,961 +1,1013 @@ -package com.github.markusbernhardt.xmldoclet; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import com.github.markusbernhardt.xmldoclet.simpledata.Annotation3; -import com.github.markusbernhardt.xmldoclet.simpledata.AnnotationCascadeChild; -import com.github.markusbernhardt.xmldoclet.simpledata.Class1; -import com.github.markusbernhardt.xmldoclet.simpledata.Class2; -import com.github.markusbernhardt.xmldoclet.simpledata.Class3; -import com.github.markusbernhardt.xmldoclet.simpledata.Class4; -import com.github.markusbernhardt.xmldoclet.simpledata.Class5; -import com.github.markusbernhardt.xmldoclet.simpledata.Class6; -import com.github.markusbernhardt.xmldoclet.simpledata.Class7; -import com.github.markusbernhardt.xmldoclet.simpledata.Class8; -import com.github.markusbernhardt.xmldoclet.simpledata.Class9; -import com.github.markusbernhardt.xmldoclet.simpledata.ClassAnnotationCascade; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; -import com.github.markusbernhardt.xmldoclet.xjc.Class; -import com.github.markusbernhardt.xmldoclet.xjc.Constructor; -import com.github.markusbernhardt.xmldoclet.xjc.Field; -import com.github.markusbernhardt.xmldoclet.xjc.Method; -import com.github.markusbernhardt.xmldoclet.xjc.Package; -import com.github.markusbernhardt.xmldoclet.xjc.Root; -import com.github.markusbernhardt.xmldoclet.xjc.TypeInfo; -import com.github.markusbernhardt.xmldoclet.xjc.TypeParameter; - -/** - * Unit test group for Classes - */ -@SuppressWarnings("deprecation") -public class ClassTest extends AbstractTestParent { - - /** - * Testing nested Annotations - * @see ClassAnnotationCascade - */ - @Test - public void testClassAnnotationCascade() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/ClassAnnotationCascade.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertEquals(packageNode.getComment(), null); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getClazz().size(), 1); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - - assertEquals("ClassAnnotationCascade", classNode.getComment()); - assertEquals("ClassAnnotationCascade", classNode.getName()); - - assertEquals(ClassAnnotationCascade.class.getName(), classNode.getQualified()); - - assertEquals(classNode.getAnnotation().size(), 1); - AnnotationInstance annotationNode = classNode.getAnnotation().get(0); - - assertEquals("AnnotationCascade", annotationNode.getName() ); - assertEquals(1, annotationNode.getArgument().size()); - - AnnotationArgument annotationArgNode = annotationNode.getArgument().get(0); - - // Two nested annotations in child attribute - assertEquals("children", annotationArgNode.getName()); - assertEquals(0, annotationArgNode.getValue().size()); - assertEquals(2, annotationArgNode.getAnnotation().size()); - - AnnotationInstance annonNodePrimitive = annotationArgNode.getAnnotation().get(0); - AnnotationInstance annonNodeNested = annotationArgNode.getAnnotation().get(1); - - // Equal attribs - assertEquals(AnnotationCascadeChild.class.getSimpleName(), annonNodePrimitive.getName()); - assertEquals(AnnotationCascadeChild.class.getSimpleName(), annonNodeNested.getName()); - assertEquals(AnnotationCascadeChild.class.getName(), annonNodePrimitive.getQualified()); - assertEquals(AnnotationCascadeChild.class.getName(), annonNodeNested.getQualified()); - assertEquals(2, annonNodePrimitive.getArgument().size()); - assertEquals(2, annonNodeNested.getArgument().size()); - assertEquals("name", annonNodePrimitive.getArgument().get(0).getName()); - assertEquals("name", annonNodeNested.getArgument().get(0).getName()); - - // Primitive - AnnotationArgument annArgNodePrimitive = annonNodePrimitive.getArgument().get(1); - assertEquals("dummyData", annArgNodePrimitive.getName()); - assertEquals("java.lang.String", annArgNodePrimitive.getType().getQualified()); - assertEquals(0, annArgNodePrimitive.getAnnotation().size()); - assertEquals(3, annArgNodePrimitive.getValue().size()); - assertEquals("A", annArgNodePrimitive.getValue().get(0)); - assertEquals("B", annArgNodePrimitive.getValue().get(1)); - assertEquals("C", annArgNodePrimitive.getValue().get(2)); - - // Nested - AnnotationArgument annArgNodeNested = annonNodeNested.getArgument().get(1); - assertEquals("subAnnotations", annArgNodeNested.getName()); - assertEquals(Annotation3.class.getName(), annArgNodeNested.getType().getQualified()); - assertEquals(3, annArgNodeNested.getAnnotation().size()); - assertEquals(0, annArgNodeNested.getValue().size()); - assertEquals(Annotation3.class.getSimpleName(), annArgNodeNested.getAnnotation().get(0).getName()); - assertEquals(Annotation3.class.getName(), annArgNodeNested.getAnnotation().get(1).getQualified()); - assertEquals(1, annArgNodeNested.getAnnotation().get(2).getArgument().size()); - - assertEquals("666", annArgNodeNested.getAnnotation().get(2).getArgument().get(0).getValue().get(0)); - } - - - /** - * Rigourous Parser :-) - */ - @Test - public void testSampledoc() { - executeJavadoc(".", new String[] { "./src/test/java" }, null, null, new String[] { "com" }, - new String[] { "-dryrun" }); - } - - /** - * testing a class with nothing defined EMPIRICAL OBSERVATION: The default - * constructor created by the java compiler is not marked synthetic. um - * what? - */ - @Test - public void testClass1() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class1.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class1"); - assertEquals(classNode.getName(), Class1.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class1.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - } - - /** - * testing a class with 1 constructor - */ - @Test - public void testClass2() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class2.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - Constructor constructor = classNode.getConstructor().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class2"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), Class2.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class2.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - - assertEquals(constructor.getComment(), "Constructor1"); - assertEquals(constructor.getName(), "Class2"); - assertEquals(constructor.getParameter().size(), 0); - assertEquals(constructor.getAnnotation().size(), 0); - } - - /** - * testing a class with 1 method - */ - @Test - public void testClass3() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class3.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - Method method = classNode.getMethod().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class3"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), Class3.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class3.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getMethod().size(), 1); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - - assertEquals(method.getComment(), "method1"); - assertEquals(method.getName(), "method1"); - assertEquals(method.getSignature(), "()"); - assertFalse(method.isFinal()); - assertFalse(method.isNative()); - assertFalse(method.isStatic()); - assertFalse(method.isSynchronized()); - assertFalse(method.isVarArgs()); - assertEquals(method.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Class3.method1"); - assertEquals(method.getScope(), "public"); - assertEquals(method.getAnnotation().size(), 0); - assertEquals(method.getParameter().size(), 0); - assertEquals(method.getException().size(), 0); - - TypeInfo returnNode = method.getReturn(); - assertEquals(returnNode.getQualified(), "int"); - assertNull(returnNode.getDimension()); - assertEquals(returnNode.getGeneric().size(), 0); - assertNull(returnNode.getWildcard()); - } - - /** - * testing a class with 1 field - */ - @Test - public void testClass4() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class4.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - Field field = classNode.getField().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class4"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), Class4.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class4.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getField().size(), 1); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - - // test field - assertEquals(field.getComment(), "field1"); - assertEquals(field.getName(), "field1"); - assertEquals(field.getScope(), "public"); - assertEquals(field.getType().getQualified(), "int"); - assertNull(field.getType().getDimension()); - assertEquals(field.getType().getGeneric().size(), 0); - assertNull(field.getType().getWildcard()); - assertFalse(field.isStatic()); - assertFalse(field.isTransient()); - assertFalse(field.isVolatile()); - assertFalse(field.isFinal()); - assertNull(field.getConstant()); - assertEquals(field.getAnnotation().size(), 0); - } - - /** - * testing a class that extends another class with 1 method - */ - @Test - public void testClass5() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class5.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class3.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 2); - - assertEquals(classNode.getComment(), "Class5"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), Class5.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class5.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Class3"); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - } - - /** - * testing a class that implements one interface - */ - @Test - public void testClass6() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class6.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - TypeInfo interfaceNode = classNode.getInterface().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class6"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), Class6.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class6.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 1); - assertEquals(classNode.getInterface().size(), 1); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - - // the particular interface chosen for this test also will change this - // flag to true! - assertTrue(classNode.isSerializable()); - - // verify interface - assertEquals(interfaceNode.getQualified(), java.io.Serializable.class.getName()); - } - - /** - * testing one annotation instance on the class - */ - @Test - public void testClass7() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class7.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance annotationNode = classNode.getAnnotation().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class7"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), Class7.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class7.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 1); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - - // test annotation 'deprecated' on class - assertEquals(annotationNode.getQualified(), "java.lang.Deprecated"); - assertEquals(annotationNode.getName(), "Deprecated"); - assertEquals(annotationNode.getArgument().size(), 0); - } - - /** - * testing abstract keyword on class - */ - @Test - public void testClass8() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class8.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class8"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), Class8.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class8.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertTrue(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - } - - /** - * testing java.io.Externalizable interface on class - */ - @Test - public void testClass9() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class9.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class9"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), Class9.class.getSimpleName()); - assertEquals(classNode.getQualified(), Class9.class.getName()); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getMethod().size(), 2); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 1); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertTrue(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertTrue(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - } - - /** - * testing difference of scope modifier on class - */ - @Test - public void testClass10() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class10.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class10"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), "Class10"); - assertEquals(classNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Class10"); - assertEquals(classNode.getScope(), ""); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - } - - /** - * testing if isException is populated correctly - */ - @Test - public void testClass11() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class11.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class11"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), "Class11"); - assertEquals(classNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Class11"); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 1); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), java.lang.Exception.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertTrue(classNode.isSerializable()); - assertTrue(classNode.isException()); - assertFalse(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - } - - /** - * testing if isError is populated correctly - */ - @Test - public void testClass12() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class12.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class12"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), "Class12"); - assertEquals(classNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Class12"); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 1); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), java.lang.Error.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertTrue(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertTrue(classNode.isError()); - assertEquals(classNode.getGeneric().size(), 0); - } - - /** - * testing if type variables can be determined - */ - @Test - public void testClass13() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class13.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - TypeParameter typeParameter = classNode.getGeneric().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class13"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), "Class13"); - assertEquals(classNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Class13"); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getGeneric().size(), 1); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - - // check the 'fun' type var - assertEquals(typeParameter.getName(), "Fun"); - assertEquals(typeParameter.getBound().size(), 0); - } - - /** - * testing if a single bounds can be determined - */ - @Test - public void testClass14() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class14.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - TypeParameter typeParameter = classNode.getGeneric().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class14"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), "Class14"); - assertEquals(classNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Class14"); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getGeneric().size(), 1); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - - // check the 'fun' type var - - assertEquals(typeParameter.getName(), "Fun"); - assertEquals(typeParameter.getBound().size(), 1); - assertEquals(typeParameter.getBound().get(0), Number.class.getName()); - } - - /** - * testing if a multiple bounds can be determined - */ - @Test - public void testClass15() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class15.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - TypeParameter typeParameter = classNode.getGeneric().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getComment(), "Class15"); - assertEquals(classNode.getConstructor().size(), 1); - assertEquals(classNode.getName(), "Class15"); - assertEquals(classNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Class15"); - assertEquals(classNode.getScope(), "public"); - assertEquals(classNode.getGeneric().size(), 1); - assertEquals(classNode.getMethod().size(), 0); - assertEquals(classNode.getField().size(), 0); - assertEquals(classNode.getAnnotation().size(), 0); - assertEquals(classNode.getInterface().size(), 0); - assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); - assertFalse(classNode.isAbstract()); - assertFalse(classNode.isExternalizable()); - assertTrue(classNode.isIncluded()); - assertFalse(classNode.isSerializable()); - assertFalse(classNode.isException()); - assertFalse(classNode.isError()); - - // check the 'fun' type var - assertEquals(typeParameter.getName(), "Fun"); - assertEquals(typeParameter.getBound().size(), 2); - assertEquals(typeParameter.getBound().get(0), Number.class.getName()); - assertEquals(typeParameter.getBound().get(1), Runnable.class.getName()); - } - - /** - * testing integer annotation argument - */ - @Test - public void testClass16() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class16.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation3.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getName(), "id"); - assertEquals(argument.getType().getQualified(), "int"); - assertEquals(argument.getValue().size(), 1); - assertEquals(argument.getValue().get(0), "3"); - assertTrue(argument.isPrimitive()); - assertFalse(argument.isArray()); - } - - /** - * testing integer array annotation argument - */ - @Test - public void testClass17() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class17.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation5.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getType().getQualified(), "int"); - assertEquals(argument.getValue().size(), 2); - assertEquals(argument.getValue().get(0), "1"); - assertEquals(argument.getValue().get(1), "2"); - assertTrue(argument.isPrimitive()); - assertTrue(argument.isArray()); - } - - /** - * testing integer array annotation argument - */ - @Test - public void testClass18() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class18.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation6.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getType().getQualified(), "java.lang.String"); - assertEquals(argument.getValue().size(), 1); - assertEquals(argument.getValue().get(0), "hey"); - assertFalse(argument.isPrimitive()); - assertFalse(argument.isArray()); - } - - /** - * testing enum annotation argument - */ - @Test - public void testClass19() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class19.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation7.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum1.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getType().getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Enum1"); - assertEquals(argument.getValue().size(), 1); - assertEquals(argument.getValue().get(0), "a"); - assertFalse(argument.isPrimitive()); - assertFalse(argument.isArray()); - } - - /** - * testing class annotation argument - */ - @Test - public void testClass20() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class20.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation8.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getType().getQualified(), "java.lang.Class"); - assertEquals(argument.getValue().size(), 1); - assertEquals(argument.getValue().get(0), "java.lang.String"); - assertFalse(argument.isPrimitive()); - assertFalse(argument.isArray()); - } - - /** - * testing character annotation argument - */ - @Test - public void testClass21() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class21.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation10.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getType().getQualified(), "char"); - assertEquals(argument.getValue().size(), 1); - assertEquals(argument.getValue().get(0), Integer.toString((int) 'a')); - assertTrue(argument.isPrimitive()); - assertFalse(argument.isArray()); - } - - /** - * testing 0 character annotation argument - */ - @Test - public void testClass22() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class22.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation10.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getType().getQualified(), "char"); - assertEquals(argument.getValue().size(), 1); - assertEquals(argument.getValue().get(0), Integer.toString(0)); - assertTrue(argument.isPrimitive()); - assertFalse(argument.isArray()); - } - - /** - * testing boolean annotation argument - */ - @Test - public void testClass23() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class23.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation11.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getType().getQualified(), "boolean"); - assertEquals(argument.getValue().size(), 1); - assertEquals(argument.getValue().get(0), Boolean.TRUE.toString()); - assertTrue(argument.isPrimitive()); - assertFalse(argument.isArray()); - } - - /** - * testing empty int array annotation argument - */ - @Test - public void testClass24() { - String[] sourceFiles = new String[] { - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class24.java", - "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation5.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - AnnotationInstance instance = classNode.getAnnotation().get(0); - AnnotationArgument argument = instance.getArgument().get(0); - assertEquals(argument.getType().getQualified(), "int"); - assertEquals(argument.getValue().size(), 0); - assertTrue(argument.isPrimitive()); - assertTrue(argument.isArray()); - } -} +package com.github.markusbernhardt.xmldoclet; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import com.github.markusbernhardt.xmldoclet.simpledata.Annotation3; +import com.github.markusbernhardt.xmldoclet.simpledata.AnnotationCascadeChild; +import com.github.markusbernhardt.xmldoclet.simpledata.Class1; +import com.github.markusbernhardt.xmldoclet.simpledata.Class2; +import com.github.markusbernhardt.xmldoclet.simpledata.Class3; +import com.github.markusbernhardt.xmldoclet.simpledata.Class4; +import com.github.markusbernhardt.xmldoclet.simpledata.Class5; +import com.github.markusbernhardt.xmldoclet.simpledata.Class6; +import com.github.markusbernhardt.xmldoclet.simpledata.Class7; +import com.github.markusbernhardt.xmldoclet.simpledata.Class8; +import com.github.markusbernhardt.xmldoclet.simpledata.Class9; +import com.github.markusbernhardt.xmldoclet.simpledata.ClassAnnotationCascade; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; +import com.github.markusbernhardt.xmldoclet.xjc.Class; +import com.github.markusbernhardt.xmldoclet.xjc.Constructor; +import com.github.markusbernhardt.xmldoclet.xjc.Field; +import com.github.markusbernhardt.xmldoclet.xjc.Method; +import com.github.markusbernhardt.xmldoclet.xjc.Package; +import com.github.markusbernhardt.xmldoclet.xjc.Root; +import com.github.markusbernhardt.xmldoclet.xjc.TypeInfo; +import com.github.markusbernhardt.xmldoclet.xjc.TypeParameter; + +/** + * Unit test group for Classes + */ +@SuppressWarnings("deprecation") +public class ClassTest extends AbstractTestParent { + + /** + * Testing nested Annotations + * + * @see ClassAnnotationCascade + */ + @Test + public void testClassAnnotationCascade() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/ClassAnnotationCascade.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertEquals(packageNode.getComment(), null); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getClazz().size(), 1); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + + assertEquals("ClassAnnotationCascade", classNode.getComment()); + assertEquals("ClassAnnotationCascade", classNode.getName()); + + assertEquals(ClassAnnotationCascade.class.getName(), classNode.getQualified()); + + assertEquals(classNode.getAnnotation().size(), 1); + AnnotationInstance annotationNode = classNode.getAnnotation().get(0); + + assertEquals("AnnotationCascade", annotationNode.getName()); + assertEquals(1, annotationNode.getArgument().size()); + + AnnotationArgument annotationArgNode = annotationNode.getArgument().get(0); + + // Two nested annotations in child attribute + assertEquals("children", annotationArgNode.getName()); + assertEquals(0, annotationArgNode.getValue().size()); + assertEquals(2, annotationArgNode.getAnnotation().size()); + + AnnotationInstance annonNodePrimitive = annotationArgNode.getAnnotation().get(0); + AnnotationInstance annonNodeNested = annotationArgNode.getAnnotation().get(1); + + // Equal attribs + assertEquals(AnnotationCascadeChild.class.getSimpleName(), annonNodePrimitive.getName()); + assertEquals(AnnotationCascadeChild.class.getSimpleName(), annonNodeNested.getName()); + assertEquals(AnnotationCascadeChild.class.getName(), annonNodePrimitive.getQualified()); + assertEquals(AnnotationCascadeChild.class.getName(), annonNodeNested.getQualified()); + assertEquals(2, annonNodePrimitive.getArgument().size()); + assertEquals(2, annonNodeNested.getArgument().size()); + assertEquals("name", annonNodePrimitive.getArgument().get(0).getName()); + assertEquals("name", annonNodeNested.getArgument().get(0).getName()); + + // Primitive + AnnotationArgument annArgNodePrimitive = annonNodePrimitive.getArgument().get(1); + assertEquals("dummyData", annArgNodePrimitive.getName()); + assertEquals("java.lang.String", annArgNodePrimitive.getType().getQualified()); + assertEquals(0, annArgNodePrimitive.getAnnotation().size()); + assertEquals(3, annArgNodePrimitive.getValue().size()); + assertEquals("A", annArgNodePrimitive.getValue().get(0)); + assertEquals("B", annArgNodePrimitive.getValue().get(1)); + assertEquals("C", annArgNodePrimitive.getValue().get(2)); + + // Nested + AnnotationArgument annArgNodeNested = annonNodeNested.getArgument().get(1); + assertEquals("subAnnotations", annArgNodeNested.getName()); + assertEquals(Annotation3.class.getName(), annArgNodeNested.getType().getQualified()); + assertEquals(3, annArgNodeNested.getAnnotation().size()); + assertEquals(0, annArgNodeNested.getValue().size()); + assertEquals(Annotation3.class.getSimpleName(), + annArgNodeNested.getAnnotation().get(0).getName()); + assertEquals(Annotation3.class.getName(), + annArgNodeNested.getAnnotation().get(1).getQualified()); + assertEquals(1, annArgNodeNested.getAnnotation().get(2).getArgument().size()); + + assertEquals("666", + annArgNodeNested.getAnnotation().get(2).getArgument().get(0).getValue().get(0)); + } + + + /** + * Rigourous Parser :-) + */ + @Test + public void testSampledoc() { + executeJavadoc(".", new String[] {"./src/test/java"}, null, null, new String[] {"com"}, + new String[] {"-dryrun"}); + } + + /** + * testing a class with nothing defined EMPIRICAL OBSERVATION: The default constructor created + * by the java compiler is not marked synthetic. um what? + */ + @Test + public void testClass1() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class1.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class1"); + assertEquals(classNode.getName(), Class1.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class1.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + } + + /** + * testing a class with 1 constructor + */ + @Test + public void testClass2() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class2.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + Constructor constructor = classNode.getConstructor().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class2"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), Class2.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class2.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + + assertEquals(constructor.getComment(), "Constructor1"); + assertEquals(constructor.getName(), "Class2"); + assertEquals(constructor.getParameter().size(), 0); + assertEquals(constructor.getAnnotation().size(), 0); + } + + /** + * testing a class with 1 method + */ + @Test + public void testClass3() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class3.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + Method method = classNode.getMethod().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class3"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), Class3.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class3.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getMethod().size(), 1); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + + assertEquals(method.getComment(), "method1"); + assertEquals(method.getName(), "method1"); + assertEquals(method.getSignature(), "()"); + assertFalse(method.isFinal()); + assertFalse(method.isNative()); + assertFalse(method.isStatic()); + assertFalse(method.isSynchronized()); + assertFalse(method.isVarArgs()); + assertEquals(method.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Class3.method1"); + assertEquals(method.getScope(), "public"); + assertEquals(method.getAnnotation().size(), 0); + assertEquals(method.getParameter().size(), 0); + assertEquals(method.getException().size(), 0); + + TypeInfo returnNode = method.getReturn(); + assertEquals(returnNode.getQualified(), "int"); + assertNull(returnNode.getDimension()); + assertEquals(returnNode.getGeneric().size(), 0); + assertNull(returnNode.getWildcard()); + } + + /** + * testing a class with 1 field + */ + @Test + public void testClass4() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class4.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + Field field = classNode.getField().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class4"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), Class4.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class4.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getField().size(), 1); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + + // test field + assertEquals(field.getComment(), "field1"); + assertEquals(field.getName(), "field1"); + assertEquals(field.getScope(), "public"); + assertEquals(field.getType().getQualified(), "int"); + assertNull(field.getType().getDimension()); + assertEquals(field.getType().getGeneric().size(), 0); + assertNull(field.getType().getWildcard()); + assertFalse(field.isStatic()); + assertFalse(field.isTransient()); + assertFalse(field.isVolatile()); + assertFalse(field.isFinal()); + assertNull(field.getConstant()); + assertEquals(field.getAnnotation().size(), 0); + } + + /** + * testing a class that extends another class with 1 method + */ + @Test + public void testClass5() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class5.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class3.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 2); + + assertEquals(classNode.getComment(), "Class5"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), Class5.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class5.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Class3"); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + } + + /** + * testing a class that implements one interface + */ + @Test + public void testClass6() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class6.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + TypeInfo interfaceNode = classNode.getInterface().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class6"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), Class6.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class6.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 1); + assertEquals(classNode.getInterface().size(), 1); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + + // the particular interface chosen for this test also will change this + // flag to true! + assertTrue(classNode.isSerializable()); + + // verify interface + assertEquals(interfaceNode.getQualified(), java.io.Serializable.class.getName()); + } + + /** + * testing one annotation instance on the class + */ + @Test + public void testClass7() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class7.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance annotationNode = classNode.getAnnotation().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class7"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), Class7.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class7.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 1); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + + // test annotation 'deprecated' on class + assertEquals(annotationNode.getQualified(), "java.lang.Deprecated"); + assertEquals(annotationNode.getName(), "Deprecated"); + assertEquals(annotationNode.getArgument().size(), 0); + } + + /** + * testing abstract keyword on class + */ + @Test + public void testClass8() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class8.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class8"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), Class8.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class8.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertTrue(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + } + + /** + * testing java.io.Externalizable interface on class + */ + @Test + public void testClass9() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class9.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class9"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), Class9.class.getSimpleName()); + assertEquals(classNode.getQualified(), Class9.class.getName()); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getMethod().size(), 2); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 1); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertTrue(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertTrue(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + } + + /** + * testing difference of scope modifier on class + */ + @Test + public void testClass10() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class10.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class10"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), "Class10"); + assertEquals(classNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Class10"); + assertEquals(classNode.getScope(), ""); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + } + + /** + * testing if isException is populated correctly + */ + @Test + public void testClass11() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class11.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class11"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), "Class11"); + assertEquals(classNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Class11"); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 1); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), java.lang.Exception.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertTrue(classNode.isSerializable()); + assertTrue(classNode.isException()); + assertFalse(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + } + + /** + * testing if isError is populated correctly + */ + @Test + public void testClass12() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class12.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class12"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), "Class12"); + assertEquals(classNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Class12"); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 1); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), java.lang.Error.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertTrue(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertTrue(classNode.isError()); + assertEquals(classNode.getGeneric().size(), 0); + } + + /** + * testing if type variables can be determined + */ + @Test + public void testClass13() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class13.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + TypeParameter typeParameter = classNode.getGeneric().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class13"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), "Class13"); + assertEquals(classNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Class13"); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getGeneric().size(), 1); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + + // check the 'fun' type var + assertEquals(typeParameter.getName(), "Fun"); + assertEquals(typeParameter.getBound().size(), 0); + } + + /** + * testing if a single bounds can be determined + */ + @Test + public void testClass14() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class14.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + TypeParameter typeParameter = classNode.getGeneric().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class14"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), "Class14"); + assertEquals(classNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Class14"); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getGeneric().size(), 1); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + + // check the 'fun' type var + + assertEquals(typeParameter.getName(), "Fun"); + assertEquals(typeParameter.getBound().size(), 1); + assertEquals(typeParameter.getBound().get(0), Number.class.getName()); + } + + /** + * testing if a multiple bounds can be determined + */ + @Test + public void testClass15() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class15.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + TypeParameter typeParameter = classNode.getGeneric().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getComment(), "Class15"); + assertEquals(classNode.getConstructor().size(), 1); + assertEquals(classNode.getName(), "Class15"); + assertEquals(classNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Class15"); + assertEquals(classNode.getScope(), "public"); + assertEquals(classNode.getGeneric().size(), 1); + assertEquals(classNode.getMethod().size(), 0); + assertEquals(classNode.getField().size(), 0); + assertEquals(classNode.getAnnotation().size(), 0); + assertEquals(classNode.getInterface().size(), 0); + assertEquals(classNode.getClazz().getQualified(), Object.class.getName()); + assertFalse(classNode.isAbstract()); + assertFalse(classNode.isExternalizable()); + assertTrue(classNode.isIncluded()); + assertFalse(classNode.isSerializable()); + assertFalse(classNode.isException()); + assertFalse(classNode.isError()); + + // check the 'fun' type var + assertEquals(typeParameter.getName(), "Fun"); + assertEquals(typeParameter.getBound().size(), 2); + assertEquals(typeParameter.getBound().get(0), Number.class.getName()); + assertEquals(typeParameter.getBound().get(1), Runnable.class.getName()); + } + + /** + * testing integer annotation argument + */ + @Test + public void testClass16() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class16.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation3.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getName(), "id"); + assertEquals(argument.getType().getQualified(), "int"); + assertEquals(argument.getValue().size(), 1); + assertEquals(argument.getValue().get(0), "3"); + assertTrue(argument.isPrimitive()); + assertFalse(argument.isArray()); + } + + /** + * testing integer array annotation argument + */ + @Test + public void testClass17() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class17.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation5.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getType().getQualified(), "int"); + assertEquals(argument.getValue().size(), 2); + assertEquals(argument.getValue().get(0), "1"); + assertEquals(argument.getValue().get(1), "2"); + assertTrue(argument.isPrimitive()); + assertTrue(argument.isArray()); + } + + /** + * testing integer array annotation argument + */ + @Test + public void testClass18() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class18.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation6.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getType().getQualified(), "java.lang.String"); + assertEquals(argument.getValue().size(), 1); + assertEquals(argument.getValue().get(0), "hey"); + assertFalse(argument.isPrimitive()); + assertFalse(argument.isArray()); + } + + /** + * testing enum annotation argument + */ + @Test + public void testClass19() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class19.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation7.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum1.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getType().getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Enum1"); + assertEquals(argument.getValue().size(), 1); + assertEquals(argument.getValue().get(0), "a"); + assertFalse(argument.isPrimitive()); + assertFalse(argument.isArray()); + } + + /** + * testing class annotation argument + */ + @Test + public void testClass20() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class20.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation8.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getType().getQualified(), "java.lang.Class"); + assertEquals(argument.getValue().size(), 1); + assertEquals(argument.getValue().get(0), "java.lang.String"); + assertFalse(argument.isPrimitive()); + assertFalse(argument.isArray()); + } + + /** + * testing character annotation argument + */ + @Test + public void testClass21() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class21.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation10.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getType().getQualified(), "char"); + assertEquals(argument.getValue().size(), 1); + assertEquals(argument.getValue().get(0), Integer.toString((int) 'a')); + assertTrue(argument.isPrimitive()); + assertFalse(argument.isArray()); + } + + /** + * testing 0 character annotation argument + */ + @Test + public void testClass22() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class22.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation10.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getType().getQualified(), "char"); + assertEquals(argument.getValue().size(), 1); + assertEquals(argument.getValue().get(0), Integer.toString(0)); + assertTrue(argument.isPrimitive()); + assertFalse(argument.isArray()); + } + + /** + * testing boolean annotation argument + */ + @Test + public void testClass23() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class23.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation11.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getType().getQualified(), "boolean"); + assertEquals(argument.getValue().size(), 1); + assertEquals(argument.getValue().get(0), Boolean.TRUE.toString()); + assertTrue(argument.isPrimitive()); + assertFalse(argument.isArray()); + } + + /** + * testing empty int array annotation argument + */ + @Test + public void testClass24() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class24.java", + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation5.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + AnnotationInstance instance = classNode.getAnnotation().get(0); + AnnotationArgument argument = instance.getArgument().get(0); + assertEquals(argument.getType().getQualified(), "int"); + assertEquals(argument.getValue().size(), 0); + assertTrue(argument.isPrimitive()); + assertTrue(argument.isArray()); + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/EnumTest.java b/src/test/java/com/github/markusbernhardt/xmldoclet/EnumTest.java index 471e77a..190939d 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/EnumTest.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/EnumTest.java @@ -1,146 +1,160 @@ -package com.github.markusbernhardt.xmldoclet; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.junit.Test; - -import com.github.markusbernhardt.xmldoclet.simpledata.Annotation12; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; -import com.github.markusbernhardt.xmldoclet.xjc.Enum; -import com.github.markusbernhardt.xmldoclet.xjc.EnumConstant; -import com.github.markusbernhardt.xmldoclet.xjc.Package; -import com.github.markusbernhardt.xmldoclet.xjc.Root; - -/** - * Unit test group for Enumerations - */ -public class EnumTest extends AbstractTestParent { - - /** - * Rigourous Parser :-) - */ - @Test - public void testSampledoc() { - executeJavadoc(".", new String[] { "./src/test/java" }, null, null, new String[] { "com" }, - new String[] { "-dryrun" }); - } - - /** - * testing a simple enum - */ - @Test - public void testEnum1() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum1.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Enum enumNode = packageNode.getEnum().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 1); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(enumNode.getName(), "Enum1"); - assertEquals(enumNode.getComment(), "Enum1"); - assertEquals(enumNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Enum1"); - assertEquals(enumNode.getConstant().size(), 3); - assertEquals(enumNode.getConstant().get(0).getName(), "a"); - assertEquals(enumNode.getConstant().get(1).getName(), "b"); - assertEquals(enumNode.getConstant().get(2).getName(), "c"); - } - - /** - * testing an empty enum - */ - @Test - public void testEnum2() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum2.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Enum enumNode = packageNode.getEnum().get(0); - - assertEquals(enumNode.getName(), "Enum2"); - assertEquals(enumNode.getComment(), "Enum2"); - assertEquals(enumNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Enum2"); - assertEquals(enumNode.getConstant().size(), 0); - } - - /** - * testing enum comment - */ - @Test - public void testEnum3() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum3.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Enum enumNode = packageNode.getEnum().get(0); - assertEquals(enumNode.getComment(), "Enum3"); - } - - /** - * testing enum field comment - */ - @Test - public void testEnum4() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum4.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Enum enumNode = packageNode.getEnum().get(0); - - EnumConstant enumConstantNode = enumNode.getConstant().get(0); - assertEquals(enumConstantNode.getComment(), "field1"); - } - - /** - * testing single annotation - */ - @Test - public void testEnum5() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum5.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Enum enumNode = packageNode.getEnum().get(0); - assertEquals(enumNode.getAnnotation().size(), 1); - AnnotationInstance annotationInstanceNode = enumNode.getAnnotation().get(0); - assertEquals(annotationInstanceNode.getQualified(), "java.lang.Deprecated"); - } - - /** - * testing multiple annotation - */ - @Test - public void testEnum6() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum6.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Enum enumNode = packageNode.getEnum().get(0); - assertEquals(enumNode.getAnnotation().size(), 2); - - AnnotationInstance annotationInstanceNode = enumNode.getAnnotation().get(0); - assertEquals(annotationInstanceNode.getQualified(), "java.lang.Deprecated"); - assertEquals(annotationInstanceNode.getName(), "Deprecated"); - assertEquals(annotationInstanceNode.getArgument().size(), 0); - - annotationInstanceNode = enumNode.getAnnotation().get(1); - assertEquals(annotationInstanceNode.getQualified(), Annotation12.class.getName()); - assertEquals(annotationInstanceNode.getName(), Annotation12.class.getSimpleName()); - assertEquals(annotationInstanceNode.getArgument().size(), 1); - - AnnotationArgument annotationArgumentNode = annotationInstanceNode.getArgument().get(0); - assertEquals(annotationArgumentNode.getName(), "value"); - assertEquals(annotationArgumentNode.getValue().get(0), "mister"); - - } - -} +package com.github.markusbernhardt.xmldoclet; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; + +import com.github.markusbernhardt.xmldoclet.simpledata.Annotation12; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; +import com.github.markusbernhardt.xmldoclet.xjc.Enum; +import com.github.markusbernhardt.xmldoclet.xjc.EnumConstant; +import com.github.markusbernhardt.xmldoclet.xjc.Package; +import com.github.markusbernhardt.xmldoclet.xjc.Root; + +/** + * Unit test group for Enumerations + */ +public class EnumTest extends AbstractTestParent { + + /** + * Rigourous Parser :-) + */ + @Test + public void testSampledoc() { + executeJavadoc(".", new String[] {"./src/test/java"}, null, null, new String[] {"com"}, + new String[] {"-dryrun"}); + } + + /** + * testing a simple enum + */ + @Test + public void testEnum1() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum1.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Enum enumNode = packageNode.getEnum().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 1); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(enumNode.getName(), "Enum1"); + assertEquals(enumNode.getComment(), "Enum1"); + assertEquals(enumNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Enum1"); + assertEquals(enumNode.getConstant().size(), 3); + assertEquals(enumNode.getConstant().get(0).getName(), "a"); + assertEquals(enumNode.getConstant().get(1).getName(), "b"); + assertEquals(enumNode.getConstant().get(2).getName(), "c"); + } + + /** + * testing an empty enum + */ + @Test + public void testEnum2() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum2.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Enum enumNode = packageNode.getEnum().get(0); + + assertEquals(enumNode.getName(), "Enum2"); + assertEquals(enumNode.getComment(), "Enum2"); + assertEquals(enumNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Enum2"); + assertEquals(enumNode.getConstant().size(), 0); + } + + /** + * testing enum comment + */ + @Test + public void testEnum3() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum3.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Enum enumNode = packageNode.getEnum().get(0); + assertEquals(enumNode.getComment(), "Enum3"); + } + + /** + * testing enum field comment + */ + @Test + public void testEnum4() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum4.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Enum enumNode = packageNode.getEnum().get(0); + + EnumConstant enumConstantNode = enumNode.getConstant().get(0); + assertEquals(enumConstantNode.getComment(), "field1"); + } + + /** + * testing single annotation + */ + @Test + public void testEnum5() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum5.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Enum enumNode = packageNode.getEnum().get(0); + assertEquals(enumNode.getAnnotation().size(), 1); + AnnotationInstance annotationInstanceNode = enumNode.getAnnotation().get(0); + assertEquals(annotationInstanceNode.getQualified(), "java.lang.Deprecated"); + } + + /** + * testing multiple annotation + */ + @Test + public void testEnum6() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum6.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Enum enumNode = packageNode.getEnum().get(0); + assertEquals(enumNode.getAnnotation().size(), 2); + + AnnotationInstance annotationInstanceNode = enumNode.getAnnotation().get(0); + assertEquals(annotationInstanceNode.getQualified(), "java.lang.Deprecated"); + assertEquals(annotationInstanceNode.getName(), "Deprecated"); + assertEquals(annotationInstanceNode.getArgument().size(), 0); + + annotationInstanceNode = enumNode.getAnnotation().get(1); + assertEquals(annotationInstanceNode.getQualified(), Annotation12.class.getName()); + assertEquals(annotationInstanceNode.getName(), Annotation12.class.getSimpleName()); + assertEquals(annotationInstanceNode.getArgument().size(), 1); + + AnnotationArgument annotationArgumentNode = annotationInstanceNode.getArgument().get(0); + assertEquals(annotationArgumentNode.getName(), "value"); + assertEquals(annotationArgumentNode.getValue().get(0), "mister"); + + } + +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/FieldTest.java b/src/test/java/com/github/markusbernhardt/xmldoclet/FieldTest.java index 7490d1d..984fdf7 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/FieldTest.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/FieldTest.java @@ -1,192 +1,192 @@ -package com.github.markusbernhardt.xmldoclet; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.List; - -import org.junit.Test; - -import com.github.markusbernhardt.xmldoclet.simpledata.Annotation12; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; -import com.github.markusbernhardt.xmldoclet.xjc.Class; -import com.github.markusbernhardt.xmldoclet.xjc.Field; -import com.github.markusbernhardt.xmldoclet.xjc.Package; -import com.github.markusbernhardt.xmldoclet.xjc.Root; - -/** - * Unit test group for Fields - */ -public class FieldTest extends AbstractTestParent { - - /** - * Rigourous Parser :-) - */ - @Test - public void testSampledoc() { - executeJavadoc(".", new String[] { "./src/test/java" }, null, null, new String[] { "com" }, - new String[] { "-dryrun" }); - } - - /** - * testing a returns of fields - */ - @Test - public void testMethod1() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Field1.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - List fields = classNode.getField(); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - // field0 -- test name - Field field = findByFieldName("field0", fields); - assertEquals(field.getName(), "field0"); - - // field1 -- test public field - field = findByFieldName("field1", fields); - assertEquals(field.getScope(), "public"); - - // field2 -- test private field - field = findByFieldName("field2", fields); - assertEquals(field.getScope(), "private"); - - // field3 -- default scope field (non defined) - field = findByFieldName("field3", fields); - assertEquals(field.getScope(), ""); - - // field4 -- protected scope field - field = findByFieldName("field4", fields); - assertEquals(field.getScope(), "protected"); - - // field5 -- volatile field - field = findByFieldName("field5", fields); - assertTrue(field.isVolatile()); - - // negative test of volatile - assertFalse(findByFieldName("field4", fields).isVolatile()); - - // field6 -- static field - field = findByFieldName("field6", fields); - assertTrue(field.isStatic()); - - // negative test of static - assertFalse(findByFieldName("field4", fields).isStatic()); - - // field7 -- transient field - field = findByFieldName("field7", fields); - assertTrue(field.isTransient()); - - // negative test of transient - assertFalse(findByFieldName("field4", fields).isTransient()); - - // field8 -- final field - field = findByFieldName("field8", fields); - assertTrue(field.isFinal()); - - // negative test of final - assertFalse(findByFieldName("field4", fields).isFinal()); - - // field9 -- string final expression - field = findByFieldName("field9", fields); - assertEquals(field.getConstant(), "\"testy\""); - - // field10 -- int final expression - field = findByFieldName("field10", fields); - assertEquals(field.getConstant(), "10"); - - // field11 -- annotation - field = findByFieldName("field11", fields); - assertEquals(field.getAnnotation().size(), 1); - - AnnotationInstance annotation = field.getAnnotation().get(0); - assertEquals(annotation.getQualified(), "java.lang.Deprecated"); - assertEquals(annotation.getName(), "Deprecated"); - assertEquals(annotation.getArgument().size(), 0); - - // field12 -- two annotations - field = findByFieldName("field12", fields); - assertEquals(field.getAnnotation().size(), 2); - - annotation = field.getAnnotation().get(0); - assertEquals(annotation.getQualified(), "java.lang.Deprecated"); - assertEquals(annotation.getName(), "Deprecated"); - assertEquals(annotation.getArgument().size(), 0); - - annotation = field.getAnnotation().get(1); - assertEquals(annotation.getQualified(), Annotation12.class.getName()); - assertEquals(annotation.getName(), Annotation12.class.getSimpleName()); - assertEquals(annotation.getArgument().size(), 1); - - AnnotationArgument argument = annotation.getArgument().get(0); - assertEquals(argument.getName(), "value"); - assertEquals(argument.getValue().get(0), "mister"); - - // field13 - type testing - field = findByFieldName("field13", fields); - assertNotNull(field.getType()); - assertEquals(field.getType().getQualified(), "java.lang.String"); - assertNull(field.getType().getDimension()); - assertNull(field.getType().getWildcard()); - assertEquals(field.getType().getGeneric().size(), 0); - - // field14 - wild card - field = findByFieldName("field14", fields); - assertNotNull(field.getType()); - assertEquals(field.getType().getQualified(), "java.util.ArrayList"); - assertNotNull(field.getType().getGeneric()); - assertEquals(field.getType().getGeneric().size(), 1); - assertEquals(field.getType().getGeneric().get(0).getQualified(), "?"); - assertNotNull(field.getType().getGeneric().get(0).getWildcard()); - - // field15 - typed generic - field = findByFieldName("field15", fields); - assertNotNull(field.getType()); - assertEquals(field.getType().getQualified(), "java.util.HashMap"); - assertEquals(field.getType().getGeneric().size(), 2); - assertEquals(field.getType().getGeneric().get(0).getQualified(), "java.lang.String"); - assertNull(field.getType().getGeneric().get(0).getWildcard()); - assertEquals(field.getType().getGeneric().get(1).getQualified(), "java.lang.Integer"); - assertNull(field.getType().getGeneric().get(1).getWildcard()); - - // field16 - array - field = findByFieldName("field16", fields); - assertNotNull(field.getType()); - assertEquals(field.getType().getQualified(), "java.lang.String"); - assertEquals(field.getType().getDimension(), "[]"); - } - - /** - * Short way of finding fields. - * - * @param fieldName - * the shortname of the method - * @param fields - * the list of methods to look through. - * @return The matching field - */ - private Field findByFieldName(String fieldName, List fields) { - for (Field field : fields) { - if (field.getName().equals(fieldName)) { - return field; - } - } - - fail(); - return null; - } -} +package com.github.markusbernhardt.xmldoclet; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.List; + +import org.junit.Test; + +import com.github.markusbernhardt.xmldoclet.simpledata.Annotation12; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; +import com.github.markusbernhardt.xmldoclet.xjc.Class; +import com.github.markusbernhardt.xmldoclet.xjc.Field; +import com.github.markusbernhardt.xmldoclet.xjc.Package; +import com.github.markusbernhardt.xmldoclet.xjc.Root; + +/** + * Unit test group for Fields + */ +public class FieldTest extends AbstractTestParent { + + /** + * Rigourous Parser :-) + */ + @Test + public void testSampledoc() { + executeJavadoc(".", new String[] {"./src/test/java"}, null, null, new String[] {"com"}, + new String[] {"-dryrun"}); + } + + /** + * testing a returns of fields + */ + @Test + public void testMethod1() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Field1.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + List fields = classNode.getField(); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + // field0 -- test name + Field field = findByFieldName("field0", fields); + assertEquals(field.getName(), "field0"); + + // field1 -- test public field + field = findByFieldName("field1", fields); + assertEquals(field.getScope(), "public"); + + // field2 -- test private field + field = findByFieldName("field2", fields); + assertEquals(field.getScope(), "private"); + + // field3 -- default scope field (non defined) + field = findByFieldName("field3", fields); + assertEquals(field.getScope(), ""); + + // field4 -- protected scope field + field = findByFieldName("field4", fields); + assertEquals(field.getScope(), "protected"); + + // field5 -- volatile field + field = findByFieldName("field5", fields); + assertTrue(field.isVolatile()); + + // negative test of volatile + assertFalse(findByFieldName("field4", fields).isVolatile()); + + // field6 -- static field + field = findByFieldName("field6", fields); + assertTrue(field.isStatic()); + + // negative test of static + assertFalse(findByFieldName("field4", fields).isStatic()); + + // field7 -- transient field + field = findByFieldName("field7", fields); + assertTrue(field.isTransient()); + + // negative test of transient + assertFalse(findByFieldName("field4", fields).isTransient()); + + // field8 -- final field + field = findByFieldName("field8", fields); + assertTrue(field.isFinal()); + + // negative test of final + assertFalse(findByFieldName("field4", fields).isFinal()); + + // field9 -- string final expression + field = findByFieldName("field9", fields); + assertEquals(field.getConstant(), "\"testy\""); + + // field10 -- int final expression + field = findByFieldName("field10", fields); + assertEquals(field.getConstant(), "10"); + + // field11 -- annotation + field = findByFieldName("field11", fields); + assertEquals(field.getAnnotation().size(), 1); + + AnnotationInstance annotation = field.getAnnotation().get(0); + assertEquals(annotation.getQualified(), "java.lang.Deprecated"); + assertEquals(annotation.getName(), "Deprecated"); + assertEquals(annotation.getArgument().size(), 0); + + // field12 -- two annotations + field = findByFieldName("field12", fields); + assertEquals(field.getAnnotation().size(), 2); + + annotation = field.getAnnotation().get(0); + assertEquals(annotation.getQualified(), "java.lang.Deprecated"); + assertEquals(annotation.getName(), "Deprecated"); + assertEquals(annotation.getArgument().size(), 0); + + annotation = field.getAnnotation().get(1); + assertEquals(annotation.getQualified(), Annotation12.class.getName()); + assertEquals(annotation.getName(), Annotation12.class.getSimpleName()); + assertEquals(annotation.getArgument().size(), 1); + + AnnotationArgument argument = annotation.getArgument().get(0); + assertEquals(argument.getName(), "value"); + assertEquals(argument.getValue().get(0), "mister"); + + // field13 - type testing + field = findByFieldName("field13", fields); + assertNotNull(field.getType()); + assertEquals(field.getType().getQualified(), "java.lang.String"); + assertNull(field.getType().getDimension()); + assertNull(field.getType().getWildcard()); + assertEquals(field.getType().getGeneric().size(), 0); + + // field14 - wild card + field = findByFieldName("field14", fields); + assertNotNull(field.getType()); + assertEquals(field.getType().getQualified(), "java.util.ArrayList"); + assertNotNull(field.getType().getGeneric()); + assertEquals(field.getType().getGeneric().size(), 1); + assertEquals(field.getType().getGeneric().get(0).getQualified(), "?"); + assertNotNull(field.getType().getGeneric().get(0).getWildcard()); + + // field15 - typed generic + field = findByFieldName("field15", fields); + assertNotNull(field.getType()); + assertEquals(field.getType().getQualified(), "java.util.HashMap"); + assertEquals(field.getType().getGeneric().size(), 2); + assertEquals(field.getType().getGeneric().get(0).getQualified(), "java.lang.String"); + assertNull(field.getType().getGeneric().get(0).getWildcard()); + assertEquals(field.getType().getGeneric().get(1).getQualified(), "java.lang.Integer"); + assertNull(field.getType().getGeneric().get(1).getWildcard()); + + // field16 - array + field = findByFieldName("field16", fields); + assertNotNull(field.getType()); + assertEquals(field.getType().getQualified(), "java.lang.String"); + assertEquals(field.getType().getDimension(), "[]"); + } + + /** + * Short way of finding fields. + * + * @param fieldName the shortname of the method + * @param fields the list of methods to look through. + * @return The matching field + */ + private Field findByFieldName(String fieldName, List fields) { + for (Field field : fields) { + if (field.getName().equals(fieldName)) { + return field; + } + } + + fail(); + return null; + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/InterfaceTest.java b/src/test/java/com/github/markusbernhardt/xmldoclet/InterfaceTest.java index 94c41f9..86769fe 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/InterfaceTest.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/InterfaceTest.java @@ -1,326 +1,348 @@ -package com.github.markusbernhardt.xmldoclet; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import com.github.markusbernhardt.xmldoclet.simpledata.Interface1; -import com.github.markusbernhardt.xmldoclet.simpledata.Interface2; -import com.github.markusbernhardt.xmldoclet.simpledata.Interface3; -import com.github.markusbernhardt.xmldoclet.simpledata.Interface4; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; -import com.github.markusbernhardt.xmldoclet.xjc.Interface; -import com.github.markusbernhardt.xmldoclet.xjc.Method; -import com.github.markusbernhardt.xmldoclet.xjc.Package; -import com.github.markusbernhardt.xmldoclet.xjc.Root; -import com.github.markusbernhardt.xmldoclet.xjc.TypeParameter; - -/** - * Unit test group for Interfaces - */ -@SuppressWarnings("deprecation") -public class InterfaceTest extends AbstractTestParent { - - /** - * Rigourous Parser :-) - */ - @Test - public void testSampledoc() { - executeJavadoc(".", new String[] { "./src/test/java" }, null, null, new String[] { "com" }, - new String[] { "-dryrun" }); - } - - /** - * testing a interface with nothing defined - */ - @Test - public void testInterface1() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface1.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Interface interfaceNode = packageNode.getInterface().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 1); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(interfaceNode.getComment(), "Interface1"); - assertEquals(interfaceNode.getName(), Interface1.class.getSimpleName()); - assertEquals(interfaceNode.getQualified(), Interface1.class.getName()); - assertEquals(interfaceNode.getScope(), "public"); - assertEquals(interfaceNode.getMethod().size(), 0); - assertEquals(interfaceNode.getAnnotation().size(), 0); - assertEquals(interfaceNode.getInterface().size(), 0); - assertTrue(interfaceNode.isIncluded()); - } - - /** - * testing a interface with 1 method - */ - @Test - public void testInterface2() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface2.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Interface interfaceNode = packageNode.getInterface().get(0); - Method method = interfaceNode.getMethod().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 1); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(interfaceNode.getComment(), "Interface2"); - assertEquals(interfaceNode.getName(), Interface2.class.getSimpleName()); - assertEquals(interfaceNode.getQualified(), Interface2.class.getName()); - assertEquals(interfaceNode.getScope(), "public"); - assertEquals(interfaceNode.getMethod().size(), 1); - assertEquals(interfaceNode.getAnnotation().size(), 0); - assertEquals(interfaceNode.getInterface().size(), 0); - assertTrue(interfaceNode.isIncluded()); - - // verify method - assertEquals(method.getComment(), "method1"); - assertEquals(method.getName(), "method1"); - assertEquals(method.getSignature(), "()"); - assertFalse(method.isFinal()); - assertFalse(method.isNative()); - assertFalse(method.isStatic()); - assertFalse(method.isSynchronized()); - assertFalse(method.isVarArgs()); - assertEquals(method.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Interface2.method1"); - assertEquals(method.getScope(), "public"); - assertEquals(method.getAnnotation().size(), 0); - assertEquals(method.getParameter().size(), 0); - assertEquals(method.getException().size(), 0); - - } - - /** - * testing a interface that extends another interface - */ - @Test - public void testInterface3() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface3.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Interface interfaceNode = packageNode.getInterface().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 1); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(interfaceNode.getComment(), "Interface3"); - assertEquals(interfaceNode.getName(), Interface3.class.getSimpleName()); - assertEquals(interfaceNode.getQualified(), Interface3.class.getName()); - assertEquals(interfaceNode.getScope(), "public"); - assertEquals(interfaceNode.getMethod().size(), 0); - assertEquals(interfaceNode.getAnnotation().size(), 0); - assertEquals(interfaceNode.getInterface().size(), 1); - assertTrue(interfaceNode.isIncluded()); - - // verify interface - assertEquals(interfaceNode.getInterface().get(0).getQualified(), java.io.Serializable.class.getName()); - } - - /** - * testing a interface that implements one annotation - */ - @Test - public void testInterface4() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface4.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Interface interfaceNode = packageNode.getInterface().get(0); - AnnotationInstance annotationInstanceNode = interfaceNode.getAnnotation().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 1); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(interfaceNode.getComment(), "Interface4"); - assertEquals(interfaceNode.getName(), Interface4.class.getSimpleName()); - assertEquals(interfaceNode.getQualified(), Interface4.class.getName()); - assertEquals(interfaceNode.getScope(), "public"); - assertEquals(interfaceNode.getMethod().size(), 0); - assertEquals(interfaceNode.getAnnotation().size(), 1); - assertEquals(interfaceNode.getInterface().size(), 0); - assertTrue(interfaceNode.isIncluded()); - - // verify deprecated annotation - // test annotation 'deprecated' on class - assertEquals(annotationInstanceNode.getQualified(), "java.lang.Deprecated"); - assertEquals(annotationInstanceNode.getName(), "Deprecated"); - assertEquals(annotationInstanceNode.getArgument().size(), 0); - } - - /** - * testing a interface that is abstract - */ - @Test - public void testInterface5() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface5.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Interface interfaceNode = packageNode.getInterface().get(0); - Method method = interfaceNode.getMethod().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 1); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(interfaceNode.getComment(), "Interface5"); - assertEquals(interfaceNode.getName(), "Interface5"); - assertEquals(interfaceNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Interface5"); - assertEquals(interfaceNode.getScope(), ""); - assertEquals(interfaceNode.getMethod().size(), 1); - assertEquals(interfaceNode.getAnnotation().size(), 0); - assertEquals(interfaceNode.getInterface().size(), 0); - assertTrue(interfaceNode.isIncluded()); - - // verify method - assertEquals(method.getComment(), "method1"); - assertEquals(method.getName(), "method1"); - assertEquals(method.getSignature(), "()"); - assertFalse(method.isFinal()); - assertFalse(method.isNative()); - assertFalse(method.isStatic()); - assertFalse(method.isSynchronized()); - assertFalse(method.isVarArgs()); - assertEquals(method.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Interface5.method1"); - - // all interface methods are public - assertEquals(method.getScope(), "public"); - assertEquals(method.getAnnotation().size(), 0); - assertEquals(method.getParameter().size(), 0); - assertEquals(method.getException().size(), 0); - } - - /** - * testing a interface that has a type variable - */ - @Test - public void testInterface6() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface6.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Interface interfaceNode = packageNode.getInterface().get(0); - TypeParameter typeParameterNode = interfaceNode.getGeneric().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 1); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(interfaceNode.getComment(), "Interface6"); - assertEquals(interfaceNode.getName(), "Interface6"); - assertEquals(interfaceNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Interface6"); - assertEquals(interfaceNode.getScope(), "public"); - assertEquals(interfaceNode.getMethod().size(), 0); - assertEquals(interfaceNode.getAnnotation().size(), 0); - assertEquals(interfaceNode.getInterface().size(), 0); - assertTrue(interfaceNode.isIncluded()); - - assertEquals(typeParameterNode.getName(), "Fun"); - assertEquals(typeParameterNode.getBound().size(), 0); - } - - /** - * testing a interface that has a type variable with extends - */ - @Test - public void testInterface7() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface7.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Interface interfaceNode = packageNode.getInterface().get(0); - TypeParameter typeParameterNode = interfaceNode.getGeneric().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 1); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(interfaceNode.getComment(), "Interface7"); - assertEquals(interfaceNode.getName(), "Interface7"); - assertEquals(interfaceNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Interface7"); - assertEquals(interfaceNode.getScope(), "public"); - assertEquals(interfaceNode.getMethod().size(), 0); - assertEquals(interfaceNode.getAnnotation().size(), 0); - assertEquals(interfaceNode.getInterface().size(), 0); - assertTrue(interfaceNode.isIncluded()); - - assertEquals(typeParameterNode.getBound().size(), 1); - assertEquals(typeParameterNode.getBound().get(0), "java.lang.Number"); - } - - /** - * testing a interface that has a type variable with extends of a class and - * interface - */ - @Test - public void testInterface8() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface8.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Interface interfaceNode = packageNode.getInterface().get(0); - TypeParameter typeParameterNode = interfaceNode.getGeneric().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 1); - assertEquals(packageNode.getClazz().size(), 0); - - assertEquals(interfaceNode.getComment(), "Interface8"); - assertEquals(interfaceNode.getName(), "Interface8"); - assertEquals(interfaceNode.getQualified(), "com.github.markusbernhardt.xmldoclet.simpledata.Interface8"); - assertEquals(interfaceNode.getScope(), "public"); - assertEquals(interfaceNode.getMethod().size(), 0); - assertEquals(interfaceNode.getAnnotation().size(), 0); - assertEquals(interfaceNode.getInterface().size(), 0); - assertTrue(interfaceNode.isIncluded()); - - assertEquals(typeParameterNode.getBound().size(), 2); - assertEquals(typeParameterNode.getBound().get(0), "java.lang.Number"); - assertEquals(typeParameterNode.getBound().get(1), "java.lang.Runnable"); - } -} +package com.github.markusbernhardt.xmldoclet; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import com.github.markusbernhardt.xmldoclet.simpledata.Interface1; +import com.github.markusbernhardt.xmldoclet.simpledata.Interface2; +import com.github.markusbernhardt.xmldoclet.simpledata.Interface3; +import com.github.markusbernhardt.xmldoclet.simpledata.Interface4; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; +import com.github.markusbernhardt.xmldoclet.xjc.Interface; +import com.github.markusbernhardt.xmldoclet.xjc.Method; +import com.github.markusbernhardt.xmldoclet.xjc.Package; +import com.github.markusbernhardt.xmldoclet.xjc.Root; +import com.github.markusbernhardt.xmldoclet.xjc.TypeParameter; + +/** + * Unit test group for Interfaces + */ +@SuppressWarnings("deprecation") +public class InterfaceTest extends AbstractTestParent { + + /** + * Rigourous Parser :-) + */ + @Test + public void testSampledoc() { + executeJavadoc(".", new String[] {"./src/test/java"}, null, null, new String[] {"com"}, + new String[] {"-dryrun"}); + } + + /** + * testing a interface with nothing defined + */ + @Test + public void testInterface1() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface1.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Interface interfaceNode = packageNode.getInterface().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 1); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(interfaceNode.getComment(), "Interface1"); + assertEquals(interfaceNode.getName(), Interface1.class.getSimpleName()); + assertEquals(interfaceNode.getQualified(), Interface1.class.getName()); + assertEquals(interfaceNode.getScope(), "public"); + assertEquals(interfaceNode.getMethod().size(), 0); + assertEquals(interfaceNode.getAnnotation().size(), 0); + assertEquals(interfaceNode.getInterface().size(), 0); + assertTrue(interfaceNode.isIncluded()); + } + + /** + * testing a interface with 1 method + */ + @Test + public void testInterface2() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface2.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Interface interfaceNode = packageNode.getInterface().get(0); + Method method = interfaceNode.getMethod().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 1); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(interfaceNode.getComment(), "Interface2"); + assertEquals(interfaceNode.getName(), Interface2.class.getSimpleName()); + assertEquals(interfaceNode.getQualified(), Interface2.class.getName()); + assertEquals(interfaceNode.getScope(), "public"); + assertEquals(interfaceNode.getMethod().size(), 1); + assertEquals(interfaceNode.getAnnotation().size(), 0); + assertEquals(interfaceNode.getInterface().size(), 0); + assertTrue(interfaceNode.isIncluded()); + + // verify method + assertEquals(method.getComment(), "method1"); + assertEquals(method.getName(), "method1"); + assertEquals(method.getSignature(), "()"); + assertFalse(method.isFinal()); + assertFalse(method.isNative()); + assertFalse(method.isStatic()); + assertFalse(method.isSynchronized()); + assertFalse(method.isVarArgs()); + assertEquals(method.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Interface2.method1"); + assertEquals(method.getScope(), "public"); + assertEquals(method.getAnnotation().size(), 0); + assertEquals(method.getParameter().size(), 0); + assertEquals(method.getException().size(), 0); + + } + + /** + * testing a interface that extends another interface + */ + @Test + public void testInterface3() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface3.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Interface interfaceNode = packageNode.getInterface().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 1); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(interfaceNode.getComment(), "Interface3"); + assertEquals(interfaceNode.getName(), Interface3.class.getSimpleName()); + assertEquals(interfaceNode.getQualified(), Interface3.class.getName()); + assertEquals(interfaceNode.getScope(), "public"); + assertEquals(interfaceNode.getMethod().size(), 0); + assertEquals(interfaceNode.getAnnotation().size(), 0); + assertEquals(interfaceNode.getInterface().size(), 1); + assertTrue(interfaceNode.isIncluded()); + + // verify interface + assertEquals(interfaceNode.getInterface().get(0).getQualified(), + java.io.Serializable.class.getName()); + } + + /** + * testing a interface that implements one annotation + */ + @Test + public void testInterface4() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface4.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Interface interfaceNode = packageNode.getInterface().get(0); + AnnotationInstance annotationInstanceNode = interfaceNode.getAnnotation().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 1); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(interfaceNode.getComment(), "Interface4"); + assertEquals(interfaceNode.getName(), Interface4.class.getSimpleName()); + assertEquals(interfaceNode.getQualified(), Interface4.class.getName()); + assertEquals(interfaceNode.getScope(), "public"); + assertEquals(interfaceNode.getMethod().size(), 0); + assertEquals(interfaceNode.getAnnotation().size(), 1); + assertEquals(interfaceNode.getInterface().size(), 0); + assertTrue(interfaceNode.isIncluded()); + + // verify deprecated annotation + // test annotation 'deprecated' on class + assertEquals(annotationInstanceNode.getQualified(), "java.lang.Deprecated"); + assertEquals(annotationInstanceNode.getName(), "Deprecated"); + assertEquals(annotationInstanceNode.getArgument().size(), 0); + } + + /** + * testing a interface that is abstract + */ + @Test + public void testInterface5() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface5.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Interface interfaceNode = packageNode.getInterface().get(0); + Method method = interfaceNode.getMethod().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 1); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(interfaceNode.getComment(), "Interface5"); + assertEquals(interfaceNode.getName(), "Interface5"); + assertEquals(interfaceNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Interface5"); + assertEquals(interfaceNode.getScope(), ""); + assertEquals(interfaceNode.getMethod().size(), 1); + assertEquals(interfaceNode.getAnnotation().size(), 0); + assertEquals(interfaceNode.getInterface().size(), 0); + assertTrue(interfaceNode.isIncluded()); + + // verify method + assertEquals(method.getComment(), "method1"); + assertEquals(method.getName(), "method1"); + assertEquals(method.getSignature(), "()"); + assertFalse(method.isFinal()); + assertFalse(method.isNative()); + assertFalse(method.isStatic()); + assertFalse(method.isSynchronized()); + assertFalse(method.isVarArgs()); + assertEquals(method.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Interface5.method1"); + + // all interface methods are public + assertEquals(method.getScope(), "public"); + assertEquals(method.getAnnotation().size(), 0); + assertEquals(method.getParameter().size(), 0); + assertEquals(method.getException().size(), 0); + } + + /** + * testing a interface that has a type variable + */ + @Test + public void testInterface6() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface6.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Interface interfaceNode = packageNode.getInterface().get(0); + TypeParameter typeParameterNode = interfaceNode.getGeneric().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 1); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(interfaceNode.getComment(), "Interface6"); + assertEquals(interfaceNode.getName(), "Interface6"); + assertEquals(interfaceNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Interface6"); + assertEquals(interfaceNode.getScope(), "public"); + assertEquals(interfaceNode.getMethod().size(), 0); + assertEquals(interfaceNode.getAnnotation().size(), 0); + assertEquals(interfaceNode.getInterface().size(), 0); + assertTrue(interfaceNode.isIncluded()); + + assertEquals(typeParameterNode.getName(), "Fun"); + assertEquals(typeParameterNode.getBound().size(), 0); + } + + /** + * testing a interface that has a type variable with extends + */ + @Test + public void testInterface7() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface7.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Interface interfaceNode = packageNode.getInterface().get(0); + TypeParameter typeParameterNode = interfaceNode.getGeneric().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 1); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(interfaceNode.getComment(), "Interface7"); + assertEquals(interfaceNode.getName(), "Interface7"); + assertEquals(interfaceNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Interface7"); + assertEquals(interfaceNode.getScope(), "public"); + assertEquals(interfaceNode.getMethod().size(), 0); + assertEquals(interfaceNode.getAnnotation().size(), 0); + assertEquals(interfaceNode.getInterface().size(), 0); + assertTrue(interfaceNode.isIncluded()); + + assertEquals(typeParameterNode.getBound().size(), 1); + assertEquals(typeParameterNode.getBound().get(0), "java.lang.Number"); + } + + /** + * testing a interface that has a type variable with extends of a class and interface + */ + @Test + public void testInterface8() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface8.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Interface interfaceNode = packageNode.getInterface().get(0); + TypeParameter typeParameterNode = interfaceNode.getGeneric().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 1); + assertEquals(packageNode.getClazz().size(), 0); + + assertEquals(interfaceNode.getComment(), "Interface8"); + assertEquals(interfaceNode.getName(), "Interface8"); + assertEquals(interfaceNode.getQualified(), + "com.github.markusbernhardt.xmldoclet.simpledata.Interface8"); + assertEquals(interfaceNode.getScope(), "public"); + assertEquals(interfaceNode.getMethod().size(), 0); + assertEquals(interfaceNode.getAnnotation().size(), 0); + assertEquals(interfaceNode.getInterface().size(), 0); + assertTrue(interfaceNode.isIncluded()); + + assertEquals(typeParameterNode.getBound().size(), 2); + assertEquals(typeParameterNode.getBound().get(0), "java.lang.Number"); + assertEquals(typeParameterNode.getBound().get(1), "java.lang.Runnable"); + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/MethodTest.java b/src/test/java/com/github/markusbernhardt/xmldoclet/MethodTest.java index dc17ffe..e42d7bb 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/MethodTest.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/MethodTest.java @@ -1,391 +1,398 @@ -package com.github.markusbernhardt.xmldoclet; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.List; - -import org.junit.Test; - -import com.github.markusbernhardt.xmldoclet.simpledata.Annotation12; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument; -import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; -import com.github.markusbernhardt.xmldoclet.xjc.Class; -import com.github.markusbernhardt.xmldoclet.xjc.Method; -import com.github.markusbernhardt.xmldoclet.xjc.MethodParameter; -import com.github.markusbernhardt.xmldoclet.xjc.Package; -import com.github.markusbernhardt.xmldoclet.xjc.Root; -import com.github.markusbernhardt.xmldoclet.xjc.TypeInfo; -import com.github.markusbernhardt.xmldoclet.xjc.Wildcard; - -/** - * Unit test group for Methods - */ -public class MethodTest extends AbstractTestParent { - - /** - * Rigourous Parser :-) - */ - @Test - public void testSampledoc() { - executeJavadoc(".", new String[] { "./src/test/java" }, null, null, new String[] { "com" }, - new String[] { "-dryrun" }); - } - - /** - * testing a returns of methodNodes - */ - @Test - public void testMethod1() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method1.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - List testMethods = classNode.getMethod(); - - // with methodNode1 we are checking that a simple methodNode can exist - // with no arguments and no return - Method methodNode = findByMethodName("method1", testMethods); - assertEquals(methodNode.getReturn().getQualified(), "void"); - assertEquals(methodNode.getReturn().getGeneric().size(), 0); - assertNull(methodNode.getReturn().getWildcard()); - assertNull(methodNode.getReturn().getDimension()); - - // methodNode2 - checking Object based returns - methodNode = findByMethodName("method2", testMethods); - assertEquals(methodNode.getReturn().getQualified(), "java.lang.Integer"); - assertEquals(methodNode.getReturn().getGeneric().size(), 0); - assertNull(methodNode.getReturn().getWildcard()); - assertNull(methodNode.getReturn().getDimension()); - - // methodNode 3 - checking primitive based returns - methodNode = findByMethodName("method3", testMethods); - assertEquals(methodNode.getReturn().getQualified(), "int"); - assertEquals(methodNode.getReturn().getGeneric().size(), 0); - assertNull(methodNode.getReturn().getWildcard()); - assertNull(methodNode.getReturn().getDimension()); - } - - /** - * testing arguments of methodNodes - */ - @Test - public void testMethod2() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method2.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - List testMethods = classNode.getMethod(); - - // methodNode - methodNode with no arguments - Method methodNode = findByMethodName("method1", testMethods); - assertEquals(methodNode.getParameter().size(), 0); - assertEquals(methodNode.getSignature(), "()"); - - // methodNode2 - methodNode with one Object-derived argument - methodNode = findByMethodName("method2", testMethods); - assertEquals(methodNode.getParameter().size(), 1); - assertEquals(methodNode.getSignature(), "(" + Integer.class.getName() + ")"); - - // one should be able to reliably access getParameter() in this fashion - // since XML order is important, and order of getParameter() to - // methodNodes is - // likewise important. ORDER MATTERS AND SHOULD BE TRUSTY! - MethodParameter methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getType().getQualified(), "java.lang.Integer"); - - // methodNode3 - check primitive argument - methodNode = findByMethodName("method3", testMethods); - assertEquals(methodNode.getParameter().size(), 1); - assertEquals(methodNode.getSignature(), "(int)"); - - methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getType().getQualified(), "int"); - assertNull(methodParameterNode.getType().getDimension()); - assertEquals(methodParameterNode.getType().getGeneric().size(), 0); - assertNull(methodParameterNode.getType().getWildcard()); - - // methodNode4 - check that two args are OK - methodNode = findByMethodName("method4", testMethods); - assertEquals(methodNode.getParameter().size(), 2); - assertEquals(methodNode.getSignature(), "(" + Integer.class.getName() + ", " + Integer.class.getName() + ")"); - - methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getType().getQualified(), "java.lang.Integer"); - - methodParameterNode = methodNode.getParameter().get(1); - assertEquals(methodParameterNode.getType().getQualified(), "java.lang.Integer"); - - // methodNode5 - check that a generic argument is valid - methodNode = findByMethodName("method5", testMethods); - assertEquals(methodNode.getParameter().size(), 1); - assertEquals(methodNode.getSignature(), "(java.util.ArrayList)"); - - methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getName(), "arg1"); - assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); - assertNull(methodParameterNode.getType().getDimension()); - assertNull(methodParameterNode.getType().getWildcard()); - assertEquals(methodParameterNode.getType().getGeneric().size(), 1); - - TypeInfo type = methodParameterNode.getType().getGeneric().get(0); - assertEquals(type.getQualified(), "java.lang.String"); - assertNull(type.getDimension()); - assertNull(type.getWildcard()); - assertEquals(type.getGeneric().size(), 0); - - // methodNode6 - check that a wildcard argument is valid - methodNode = findByMethodName("method6", testMethods); - assertEquals(methodNode.getParameter().size(), 1); - assertEquals(methodNode.getSignature(), "(java.util.ArrayList)"); - - methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getName(), "arg1"); - assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); - assertNull(methodParameterNode.getType().getDimension()); - assertNull(methodParameterNode.getType().getWildcard()); - assertEquals(methodParameterNode.getType().getGeneric().size(), 1); - - type = methodParameterNode.getType().getGeneric().get(0); - assertEquals(type.getQualified(), "?"); - assertNull(type.getDimension()); - assertNotNull(type.getWildcard()); - assertEquals(type.getGeneric().size(), 0); - - Wildcard wildcard = type.getWildcard(); - assertEquals(wildcard.getExtendsBound().size(), 0); - assertEquals(wildcard.getSuperBound().size(), 0); - - // methodNode7 - check that a wildcard argument is valid with extends - // clause - methodNode = findByMethodName("method7", testMethods); - assertEquals(methodNode.getParameter().size(), 1); - assertEquals(methodNode.getSignature(), "(java.util.ArrayList)"); - - methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getName(), "arg1"); - assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); - assertEquals(methodParameterNode.getType().getDimension(), null); - assertEquals(methodParameterNode.getType().getGeneric().size(), 1); - assertNull(methodParameterNode.getType().getWildcard()); - - type = methodParameterNode.getType().getGeneric().get(0); - assertEquals(type.getQualified(), "?"); - assertEquals(type.getDimension(), null); - assertEquals(type.getGeneric().size(), 0); - assertNotNull(type.getWildcard()); - - wildcard = type.getWildcard(); - assertEquals(wildcard.getExtendsBound().size(), 1); - assertEquals(wildcard.getSuperBound().size(), 0); - - TypeInfo extendsBound = wildcard.getExtendsBound().get(0); - assertEquals(extendsBound.getQualified(), "java.lang.String"); - assertEquals(extendsBound.getDimension(), null); - assertEquals(extendsBound.getGeneric().size(), 0); - assertNull(extendsBound.getWildcard()); - - // methodNode8 - check that a wildcard argument is valid with super - // clause - methodNode = findByMethodName("method8", testMethods); - assertEquals(methodNode.getParameter().size(), 1); - assertEquals(methodNode.getSignature(), "(java.util.ArrayList)"); - - methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getName(), "arg1"); - assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); - assertEquals(methodParameterNode.getType().getDimension(), null); - assertEquals(methodParameterNode.getType().getGeneric().size(), 1); - assertNull(methodParameterNode.getType().getWildcard()); - - type = methodParameterNode.getType().getGeneric().get(0); - assertEquals(type.getQualified(), "?"); - assertEquals(type.getDimension(), null); - assertEquals(type.getGeneric().size(), 0); - assertNotNull(type.getWildcard()); - - wildcard = type.getWildcard(); - assertEquals(wildcard.getSuperBound().size(), 1); - assertEquals(wildcard.getExtendsBound().size(), 0); - - TypeInfo superBounds = wildcard.getSuperBound().get(0); - assertEquals(superBounds.getQualified(), "java.lang.String"); - assertEquals(superBounds.getDimension(), null); - assertEquals(superBounds.getGeneric().size(), 0); - assertNull(superBounds.getWildcard()); - - // methodNode9 - check that a two-level deep nested generic - methodNode = findByMethodName("method9", testMethods); - assertEquals(methodNode.getParameter().size(), 1); - assertEquals(methodNode.getSignature(), "(java.util.ArrayList>)"); - - methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getName(), "arg1"); - assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); - assertEquals(methodParameterNode.getType().getDimension(), null); - assertEquals(methodParameterNode.getType().getGeneric().size(), 1); - assertNull(methodParameterNode.getType().getWildcard()); - - type = methodParameterNode.getType().getGeneric().get(0); - assertEquals(type.getQualified(), "java.util.ArrayList"); - assertEquals(type.getDimension(), null); - assertEquals(type.getGeneric().size(), 1); - assertNull(type.getWildcard()); - - type = type.getGeneric().get(0); - assertEquals(type.getQualified(), "java.lang.String"); - assertEquals(type.getDimension(), null); - assertEquals(type.getGeneric().size(), 0); - assertNull(type.getWildcard()); - - // methodNode10 - check var args - methodNode = findByMethodName("method10", testMethods); - assertEquals(methodNode.getParameter().size(), 1); - assertEquals(methodNode.getSignature(), "(java.lang.Object...)"); - assertTrue(methodNode.isVarArgs()); - - methodParameterNode = methodNode.getParameter().get(0); - assertEquals(methodParameterNode.getName(), "object"); - assertEquals(methodParameterNode.getType().getQualified(), "java.lang.Object"); - assertEquals(methodParameterNode.getType().getDimension(), "[]"); - - // methodNode9--check var args negative test - assertFalse(findByMethodName("method9", testMethods).isVarArgs()); - } - - /** - * testing methodNode properties - */ - @Test - public void testMethod3() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method3.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - List testMethods = classNode.getMethod(); - - // methodNode1 -- we check public scope - Method methodNode = findByMethodName("method1", testMethods); - assertEquals(methodNode.getScope(), "public"); - - // methodNode2 -- we check package scope - methodNode = findByMethodName("method2", testMethods); - assertEquals(methodNode.getScope(), ""); - - // methodNode3 -- we check private scope - methodNode = findByMethodName("method3", testMethods); - assertEquals(methodNode.getScope(), "private"); - - // methodNode4 -- we check private scope - methodNode = findByMethodName("method4", testMethods); - assertEquals(methodNode.getScope(), "protected"); - - // methodNode5 -- we check native - methodNode = findByMethodName("method5", testMethods); - assertTrue(methodNode.isNative()); - // and negative - assertFalse(findByMethodName("method4", testMethods).isNative()); - - // methodNode6 -- we check static - methodNode = findByMethodName("method6", testMethods); - assertTrue(methodNode.isStatic()); - // and negative - assertFalse(findByMethodName("method4", testMethods).isStatic()); - - // methodNode7 -- we check final - methodNode = findByMethodName("method7", testMethods); - assertTrue(methodNode.isFinal()); - // and negative - assertFalse(findByMethodName("method4", testMethods).isFinal()); - - // methodNode8 -- we check synchronized - methodNode = findByMethodName("method8", testMethods); - assertTrue(methodNode.isSynchronized()); - // and negative - assertFalse(findByMethodName("method4", testMethods).isSynchronized()); - - // methodNode9 -- we check one thrown exception - methodNode = findByMethodName("method9", testMethods); - assertEquals(methodNode.getException().size(), 1); - - TypeInfo exception = methodNode.getException().get(0); - assertEquals(exception.getQualified(), "java.lang.Exception"); - assertEquals(exception.getDimension(), null); - assertEquals(exception.getGeneric().size(), 0); - assertNull(exception.getWildcard()); - - // methodNode10 -- we check two thrown exceptions - methodNode = findByMethodName("method10", testMethods); - assertEquals(methodNode.getException().size(), 2); - - exception = methodNode.getException().get(0); - assertEquals(exception.getQualified(), "java.lang.OutOfMemoryError"); - assertEquals(exception.getDimension(), null); - assertEquals(exception.getGeneric().size(), 0); - - exception = methodNode.getException().get(1); - assertEquals(exception.getQualified(), "java.lang.IllegalArgumentException"); - assertEquals(exception.getDimension(), null); - assertEquals(exception.getGeneric().size(), 0); - - // negative--no exceptions - assertEquals(findByMethodName("method4", testMethods).getException().size(), 0); - - // methodNode11 -- 1 annotation instance - - methodNode = findByMethodName("method11", testMethods); - assertEquals(methodNode.getAnnotation().size(), 1); - - AnnotationInstance annotation = methodNode.getAnnotation().get(0); - assertEquals(annotation.getQualified(), "java.lang.Deprecated"); - assertEquals(annotation.getArgument().size(), 0); - - // methodNode12 -- 2 annotation instances - methodNode = findByMethodName("method12", testMethods); - assertEquals(methodNode.getAnnotation().size(), 2); - - annotation = methodNode.getAnnotation().get(0); - assertEquals(annotation.getQualified(), "java.lang.Deprecated"); - - annotation = methodNode.getAnnotation().get(1); - assertEquals(annotation.getQualified(), Annotation12.class.getName()); - assertEquals(annotation.getArgument().size(), 1); - AnnotationArgument annotArgument = annotation.getArgument().get(0); - assertEquals(annotArgument.getName(), "value"); - assertEquals(annotArgument.getValue().get(0), "java.lang.Warning"); - - // negative -- no annotations - assertEquals(findByMethodName("method4", testMethods).getAnnotation().size(), 0); - - } - - /** - * Short way of finding methodNodes. It's meant to only be used for - * methodNodes that do not share the same name in the same class. In fact, - * this class will junit assert that there is only 1 methodNode matching - * this name in the supplied list methodParameterNodeeter. - * - * @param methodNodeName - * the shortname of the methodNode - * @param methodNodes - * the list of methodNodes to look through. - * @return The matching methodNode - */ - private Method findByMethodName(String methodNodeName, List methodNodes) { - for (Method methodNode : methodNodes) { - if (methodNode.getName().equals(methodNodeName)) { - return methodNode; - } - } - - fail(); - return null; - } -} +package com.github.markusbernhardt.xmldoclet; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.List; + +import org.junit.Test; + +import com.github.markusbernhardt.xmldoclet.simpledata.Annotation12; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument; +import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance; +import com.github.markusbernhardt.xmldoclet.xjc.Class; +import com.github.markusbernhardt.xmldoclet.xjc.Method; +import com.github.markusbernhardt.xmldoclet.xjc.MethodParameter; +import com.github.markusbernhardt.xmldoclet.xjc.Package; +import com.github.markusbernhardt.xmldoclet.xjc.Root; +import com.github.markusbernhardt.xmldoclet.xjc.TypeInfo; +import com.github.markusbernhardt.xmldoclet.xjc.Wildcard; + +/** + * Unit test group for Methods + */ +public class MethodTest extends AbstractTestParent { + + /** + * Rigourous Parser :-) + */ + @Test + public void testSampledoc() { + executeJavadoc(".", new String[] {"./src/test/java"}, null, null, new String[] {"com"}, + new String[] {"-dryrun"}); + } + + /** + * testing a returns of methodNodes + */ + @Test + public void testMethod1() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method1.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + List testMethods = classNode.getMethod(); + + // with methodNode1 we are checking that a simple methodNode can exist + // with no arguments and no return + Method methodNode = findByMethodName("method1", testMethods); + assertEquals(methodNode.getReturn().getQualified(), "void"); + assertEquals(methodNode.getReturn().getGeneric().size(), 0); + assertNull(methodNode.getReturn().getWildcard()); + assertNull(methodNode.getReturn().getDimension()); + + // methodNode2 - checking Object based returns + methodNode = findByMethodName("method2", testMethods); + assertEquals(methodNode.getReturn().getQualified(), "java.lang.Integer"); + assertEquals(methodNode.getReturn().getGeneric().size(), 0); + assertNull(methodNode.getReturn().getWildcard()); + assertNull(methodNode.getReturn().getDimension()); + + // methodNode 3 - checking primitive based returns + methodNode = findByMethodName("method3", testMethods); + assertEquals(methodNode.getReturn().getQualified(), "int"); + assertEquals(methodNode.getReturn().getGeneric().size(), 0); + assertNull(methodNode.getReturn().getWildcard()); + assertNull(methodNode.getReturn().getDimension()); + } + + /** + * testing arguments of methodNodes + */ + @Test + public void testMethod2() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method2.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + List testMethods = classNode.getMethod(); + + // methodNode - methodNode with no arguments + Method methodNode = findByMethodName("method1", testMethods); + assertEquals(methodNode.getParameter().size(), 0); + assertEquals(methodNode.getSignature(), "()"); + + // methodNode2 - methodNode with one Object-derived argument + methodNode = findByMethodName("method2", testMethods); + assertEquals(methodNode.getParameter().size(), 1); + assertEquals(methodNode.getSignature(), "(" + Integer.class.getName() + ")"); + + // one should be able to reliably access getParameter() in this fashion + // since XML order is important, and order of getParameter() to + // methodNodes is + // likewise important. ORDER MATTERS AND SHOULD BE TRUSTY! + MethodParameter methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getType().getQualified(), "java.lang.Integer"); + + // methodNode3 - check primitive argument + methodNode = findByMethodName("method3", testMethods); + assertEquals(methodNode.getParameter().size(), 1); + assertEquals(methodNode.getSignature(), "(int)"); + + methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getType().getQualified(), "int"); + assertNull(methodParameterNode.getType().getDimension()); + assertEquals(methodParameterNode.getType().getGeneric().size(), 0); + assertNull(methodParameterNode.getType().getWildcard()); + + // methodNode4 - check that two args are OK + methodNode = findByMethodName("method4", testMethods); + assertEquals(methodNode.getParameter().size(), 2); + assertEquals(methodNode.getSignature(), + "(" + Integer.class.getName() + ", " + Integer.class.getName() + ")"); + + methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getType().getQualified(), "java.lang.Integer"); + + methodParameterNode = methodNode.getParameter().get(1); + assertEquals(methodParameterNode.getType().getQualified(), "java.lang.Integer"); + + // methodNode5 - check that a generic argument is valid + methodNode = findByMethodName("method5", testMethods); + assertEquals(methodNode.getParameter().size(), 1); + assertEquals(methodNode.getSignature(), "(java.util.ArrayList)"); + + methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getName(), "arg1"); + assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); + assertNull(methodParameterNode.getType().getDimension()); + assertNull(methodParameterNode.getType().getWildcard()); + assertEquals(methodParameterNode.getType().getGeneric().size(), 1); + + TypeInfo type = methodParameterNode.getType().getGeneric().get(0); + assertEquals(type.getQualified(), "java.lang.String"); + assertNull(type.getDimension()); + assertNull(type.getWildcard()); + assertEquals(type.getGeneric().size(), 0); + + // methodNode6 - check that a wildcard argument is valid + methodNode = findByMethodName("method6", testMethods); + assertEquals(methodNode.getParameter().size(), 1); + assertEquals(methodNode.getSignature(), "(java.util.ArrayList)"); + + methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getName(), "arg1"); + assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); + assertNull(methodParameterNode.getType().getDimension()); + assertNull(methodParameterNode.getType().getWildcard()); + assertEquals(methodParameterNode.getType().getGeneric().size(), 1); + + type = methodParameterNode.getType().getGeneric().get(0); + assertEquals(type.getQualified(), "?"); + assertNull(type.getDimension()); + assertNotNull(type.getWildcard()); + assertEquals(type.getGeneric().size(), 0); + + Wildcard wildcard = type.getWildcard(); + assertEquals(wildcard.getExtendsBound().size(), 0); + assertEquals(wildcard.getSuperBound().size(), 0); + + // methodNode7 - check that a wildcard argument is valid with extends + // clause + methodNode = findByMethodName("method7", testMethods); + assertEquals(methodNode.getParameter().size(), 1); + assertEquals(methodNode.getSignature(), + "(java.util.ArrayList)"); + + methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getName(), "arg1"); + assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); + assertEquals(methodParameterNode.getType().getDimension(), null); + assertEquals(methodParameterNode.getType().getGeneric().size(), 1); + assertNull(methodParameterNode.getType().getWildcard()); + + type = methodParameterNode.getType().getGeneric().get(0); + assertEquals(type.getQualified(), "?"); + assertEquals(type.getDimension(), null); + assertEquals(type.getGeneric().size(), 0); + assertNotNull(type.getWildcard()); + + wildcard = type.getWildcard(); + assertEquals(wildcard.getExtendsBound().size(), 1); + assertEquals(wildcard.getSuperBound().size(), 0); + + TypeInfo extendsBound = wildcard.getExtendsBound().get(0); + assertEquals(extendsBound.getQualified(), "java.lang.String"); + assertEquals(extendsBound.getDimension(), null); + assertEquals(extendsBound.getGeneric().size(), 0); + assertNull(extendsBound.getWildcard()); + + // methodNode8 - check that a wildcard argument is valid with super + // clause + methodNode = findByMethodName("method8", testMethods); + assertEquals(methodNode.getParameter().size(), 1); + assertEquals(methodNode.getSignature(), "(java.util.ArrayList)"); + + methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getName(), "arg1"); + assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); + assertEquals(methodParameterNode.getType().getDimension(), null); + assertEquals(methodParameterNode.getType().getGeneric().size(), 1); + assertNull(methodParameterNode.getType().getWildcard()); + + type = methodParameterNode.getType().getGeneric().get(0); + assertEquals(type.getQualified(), "?"); + assertEquals(type.getDimension(), null); + assertEquals(type.getGeneric().size(), 0); + assertNotNull(type.getWildcard()); + + wildcard = type.getWildcard(); + assertEquals(wildcard.getSuperBound().size(), 1); + assertEquals(wildcard.getExtendsBound().size(), 0); + + TypeInfo superBounds = wildcard.getSuperBound().get(0); + assertEquals(superBounds.getQualified(), "java.lang.String"); + assertEquals(superBounds.getDimension(), null); + assertEquals(superBounds.getGeneric().size(), 0); + assertNull(superBounds.getWildcard()); + + // methodNode9 - check that a two-level deep nested generic + methodNode = findByMethodName("method9", testMethods); + assertEquals(methodNode.getParameter().size(), 1); + assertEquals(methodNode.getSignature(), + "(java.util.ArrayList>)"); + + methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getName(), "arg1"); + assertEquals(methodParameterNode.getType().getQualified(), "java.util.ArrayList"); + assertEquals(methodParameterNode.getType().getDimension(), null); + assertEquals(methodParameterNode.getType().getGeneric().size(), 1); + assertNull(methodParameterNode.getType().getWildcard()); + + type = methodParameterNode.getType().getGeneric().get(0); + assertEquals(type.getQualified(), "java.util.ArrayList"); + assertEquals(type.getDimension(), null); + assertEquals(type.getGeneric().size(), 1); + assertNull(type.getWildcard()); + + type = type.getGeneric().get(0); + assertEquals(type.getQualified(), "java.lang.String"); + assertEquals(type.getDimension(), null); + assertEquals(type.getGeneric().size(), 0); + assertNull(type.getWildcard()); + + // methodNode10 - check var args + methodNode = findByMethodName("method10", testMethods); + assertEquals(methodNode.getParameter().size(), 1); + assertEquals(methodNode.getSignature(), "(java.lang.Object...)"); + assertTrue(methodNode.isVarArgs()); + + methodParameterNode = methodNode.getParameter().get(0); + assertEquals(methodParameterNode.getName(), "object"); + assertEquals(methodParameterNode.getType().getQualified(), "java.lang.Object"); + assertEquals(methodParameterNode.getType().getDimension(), "[]"); + + // methodNode9--check var args negative test + assertFalse(findByMethodName("method9", testMethods).isVarArgs()); + } + + /** + * testing methodNode properties + */ + @Test + public void testMethod3() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method3.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + List testMethods = classNode.getMethod(); + + // methodNode1 -- we check public scope + Method methodNode = findByMethodName("method1", testMethods); + assertEquals(methodNode.getScope(), "public"); + + // methodNode2 -- we check package scope + methodNode = findByMethodName("method2", testMethods); + assertEquals(methodNode.getScope(), ""); + + // methodNode3 -- we check private scope + methodNode = findByMethodName("method3", testMethods); + assertEquals(methodNode.getScope(), "private"); + + // methodNode4 -- we check private scope + methodNode = findByMethodName("method4", testMethods); + assertEquals(methodNode.getScope(), "protected"); + + // methodNode5 -- we check native + methodNode = findByMethodName("method5", testMethods); + assertTrue(methodNode.isNative()); + // and negative + assertFalse(findByMethodName("method4", testMethods).isNative()); + + // methodNode6 -- we check static + methodNode = findByMethodName("method6", testMethods); + assertTrue(methodNode.isStatic()); + // and negative + assertFalse(findByMethodName("method4", testMethods).isStatic()); + + // methodNode7 -- we check final + methodNode = findByMethodName("method7", testMethods); + assertTrue(methodNode.isFinal()); + // and negative + assertFalse(findByMethodName("method4", testMethods).isFinal()); + + // methodNode8 -- we check synchronized + methodNode = findByMethodName("method8", testMethods); + assertTrue(methodNode.isSynchronized()); + // and negative + assertFalse(findByMethodName("method4", testMethods).isSynchronized()); + + // methodNode9 -- we check one thrown exception + methodNode = findByMethodName("method9", testMethods); + assertEquals(methodNode.getException().size(), 1); + + TypeInfo exception = methodNode.getException().get(0); + assertEquals(exception.getQualified(), "java.lang.Exception"); + assertEquals(exception.getDimension(), null); + assertEquals(exception.getGeneric().size(), 0); + assertNull(exception.getWildcard()); + + // methodNode10 -- we check two thrown exceptions + methodNode = findByMethodName("method10", testMethods); + assertEquals(methodNode.getException().size(), 2); + + exception = methodNode.getException().get(0); + assertEquals(exception.getQualified(), "java.lang.OutOfMemoryError"); + assertEquals(exception.getDimension(), null); + assertEquals(exception.getGeneric().size(), 0); + + exception = methodNode.getException().get(1); + assertEquals(exception.getQualified(), "java.lang.IllegalArgumentException"); + assertEquals(exception.getDimension(), null); + assertEquals(exception.getGeneric().size(), 0); + + // negative--no exceptions + assertEquals(findByMethodName("method4", testMethods).getException().size(), 0); + + // methodNode11 -- 1 annotation instance + + methodNode = findByMethodName("method11", testMethods); + assertEquals(methodNode.getAnnotation().size(), 1); + + AnnotationInstance annotation = methodNode.getAnnotation().get(0); + assertEquals(annotation.getQualified(), "java.lang.Deprecated"); + assertEquals(annotation.getArgument().size(), 0); + + // methodNode12 -- 2 annotation instances + methodNode = findByMethodName("method12", testMethods); + assertEquals(methodNode.getAnnotation().size(), 2); + + annotation = methodNode.getAnnotation().get(0); + assertEquals(annotation.getQualified(), "java.lang.Deprecated"); + + annotation = methodNode.getAnnotation().get(1); + assertEquals(annotation.getQualified(), Annotation12.class.getName()); + assertEquals(annotation.getArgument().size(), 1); + AnnotationArgument annotArgument = annotation.getArgument().get(0); + assertEquals(annotArgument.getName(), "value"); + assertEquals(annotArgument.getValue().get(0), "java.lang.Warning"); + + // negative -- no annotations + assertEquals(findByMethodName("method4", testMethods).getAnnotation().size(), 0); + + } + + /** + * Short way of finding methodNodes. It's meant to only be used for methodNodes that do not + * share the same name in the same class. In fact, this class will junit assert that there is + * only 1 methodNode matching this name in the supplied list + * methodParameterNodeeter. + * + * @param methodNodeName the shortname of the methodNode + * @param methodNodes the list of methodNodes to look through. + * @return The matching methodNode + */ + private Method findByMethodName(String methodNodeName, List methodNodes) { + for (Method methodNode : methodNodes) { + if (methodNode.getName().equals(methodNodeName)) { + return methodNode; + } + } + + fail(); + return null; + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/PrimitiveTest.java b/src/test/java/com/github/markusbernhardt/xmldoclet/PrimitiveTest.java index 85ae7a2..c7886ad 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/PrimitiveTest.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/PrimitiveTest.java @@ -7,12 +7,12 @@ */ public class PrimitiveTest extends AbstractTestParent { - /** - * Rigourous Parser :-) - */ - @Test - public void test() { - executeJavadoc(null, new String[] { "./src/test/java" }, null, null, new String[] { "com" }, - new String[] { "-dryrun" }); - } + /** + * Rigourous Parser :-) + */ + @Test + public void test() { + executeJavadoc(null, new String[] {"./src/test/java"}, null, null, new String[] {"com"}, + new String[] {"-dryrun"}); + } } diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/TagTest.java b/src/test/java/com/github/markusbernhardt/xmldoclet/TagTest.java index 918c002..80eb506 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/TagTest.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/TagTest.java @@ -1,40 +1,42 @@ -package com.github.markusbernhardt.xmldoclet; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.junit.Test; - -import com.github.markusbernhardt.xmldoclet.xjc.Class; -import com.github.markusbernhardt.xmldoclet.xjc.Package; -import com.github.markusbernhardt.xmldoclet.xjc.Root; - -/** - * Unit test group for Tags - */ -public class TagTest extends AbstractTestParent { - - /** - * testing a simple tags - */ - @Test - public void testTag1() { - String[] sourceFiles = new String[] { "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Tag1.java" }; - Root rootNode = executeJavadoc(null, null, null, sourceFiles, null, new String[] { "-dryrun" }); - - Package packageNode = rootNode.getPackage().get(0); - Class classNode = packageNode.getClazz().get(0); - - assertEquals(rootNode.getPackage().size(), 1); - assertNull(packageNode.getComment()); - assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); - assertEquals(packageNode.getAnnotation().size(), 0); - assertEquals(packageNode.getEnum().size(), 0); - assertEquals(packageNode.getInterface().size(), 0); - assertEquals(packageNode.getClazz().size(), 1); - - assertEquals(classNode.getTag().size(), 7); - assertEquals(classNode.getMethod().get(0).getTag().size(), 3); - } - -} +package com.github.markusbernhardt.xmldoclet; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; + +import com.github.markusbernhardt.xmldoclet.xjc.Class; +import com.github.markusbernhardt.xmldoclet.xjc.Package; +import com.github.markusbernhardt.xmldoclet.xjc.Root; + +/** + * Unit test group for Tags + */ +public class TagTest extends AbstractTestParent { + + /** + * testing a simple tags + */ + @Test + public void testTag1() { + String[] sourceFiles = new String[] { + "./src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Tag1.java"}; + Root rootNode = + executeJavadoc(null, null, null, sourceFiles, null, new String[] {"-dryrun"}); + + Package packageNode = rootNode.getPackage().get(0); + Class classNode = packageNode.getClazz().get(0); + + assertEquals(rootNode.getPackage().size(), 1); + assertNull(packageNode.getComment()); + assertEquals(packageNode.getName(), "com.github.markusbernhardt.xmldoclet.simpledata"); + assertEquals(packageNode.getAnnotation().size(), 0); + assertEquals(packageNode.getEnum().size(), 0); + assertEquals(packageNode.getInterface().size(), 0); + assertEquals(packageNode.getClazz().size(), 1); + + assertEquals(classNode.getTag().size(), 7); + assertEquals(classNode.getMethod().get(0).getTag().size(), 3); + } + +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation10.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation10.java index 2c4dfcb..35c6e1d 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation10.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation10.java @@ -4,10 +4,10 @@ * Annotation10 */ @interface Annotation10 { - /** - * id - * - * @return ret - */ - public abstract char id(); -} \ No newline at end of file + /** + * id + * + * @return ret + */ + public abstract char id(); +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation11.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation11.java index 3510061..e4078e7 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation11.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation11.java @@ -4,10 +4,10 @@ * Annotation11 */ @interface Annotation11 { - /** - * id - * - * @return ret - */ - public abstract boolean id(); -} \ No newline at end of file + /** + * id + * + * @return ret + */ + public abstract boolean id(); +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation12.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation12.java index fdeaa2e..a71b600 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation12.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation12.java @@ -4,10 +4,10 @@ * Annotation12 */ public @interface Annotation12 { - /** - * value - * - * @return ret - */ - String[] value(); -} \ No newline at end of file + /** + * value + * + * @return ret + */ + String[] value(); +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation2.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation2.java index 7795e7f..89f4c8c 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation2.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation2.java @@ -5,4 +5,4 @@ */ @Deprecated public @interface Annotation2 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation3.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation3.java index aa1feff..7a5ca61 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation3.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation3.java @@ -4,10 +4,10 @@ * Annotation3 */ public @interface Annotation3 { - /** - * id - * - * @return ret - */ - public int id() default 3; -} \ No newline at end of file + /** + * id + * + * @return ret + */ + public int id() default 3; +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation4.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation4.java index 7e1257b..2537432 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation4.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation4.java @@ -4,4 +4,4 @@ * Annotation4 */ @interface Annotation4 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation5.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation5.java index aa45f83..6388563 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation5.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation5.java @@ -4,10 +4,10 @@ * Annotation5 */ @interface Annotation5 { - /** - * id - * - * @return ret - */ - public int[] id() default { 2, 3 }; -} \ No newline at end of file + /** + * id + * + * @return ret + */ + public int[] id() default {2, 3}; +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation6.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation6.java index ac0d0b9..91ca028 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation6.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation6.java @@ -4,10 +4,10 @@ * Annotation6 */ @interface Annotation6 { - /** - * id - * - * @return ret - */ - public abstract String id() default "hello"; -} \ No newline at end of file + /** + * id + * + * @return ret + */ + public abstract String id() default "hello"; +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation7.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation7.java index f89346e..ff148aa 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation7.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation7.java @@ -4,10 +4,10 @@ * Annotation7 */ @interface Annotation7 { - /** - * id - * - * @return ret - */ - public abstract Enum1 id() default Enum1.b; -} \ No newline at end of file + /** + * id + * + * @return ret + */ + public abstract Enum1 id() default Enum1.b; +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation8.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation8.java index 09442ed..a428c35 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation8.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation8.java @@ -4,11 +4,11 @@ * Annotation8 */ @interface Annotation8 { - /** - * id - * - * @return ret - */ - @SuppressWarnings("rawtypes") - public abstract Class id() default Object.class; -} \ No newline at end of file + /** + * id + * + * @return ret + */ + @SuppressWarnings("rawtypes") + public abstract Class id() default Object.class; +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation9.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation9.java index 5d458bd..19a5bed 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation9.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Annotation9.java @@ -4,10 +4,10 @@ * Annotation9 */ @interface Annotation9 { - /** - * id - * - * @return ret - */ - public abstract Class id(); -} \ No newline at end of file + /** + * id + * + * @return ret + */ + public abstract Class id(); +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/AnnotationCascade.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/AnnotationCascade.java index 9f83118..534c559 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/AnnotationCascade.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/AnnotationCascade.java @@ -4,10 +4,10 @@ * AnnotationCascade */ public @interface AnnotationCascade { - /** - * value - * - * @return ret - */ - AnnotationCascadeChild[] children(); -} \ No newline at end of file + /** + * value + * + * @return ret + */ + AnnotationCascadeChild[] children(); +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/AnnotationCascadeChild.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/AnnotationCascadeChild.java index b1c2a28..963bff7 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/AnnotationCascadeChild.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/AnnotationCascadeChild.java @@ -1,18 +1,19 @@ -package com.github.markusbernhardt.xmldoclet.simpledata; - -/** - * AnnotationCascadeChild - */ -public @interface AnnotationCascadeChild { - - /** - * The name. - * @return The name. - */ - public String name(); - - public String[] dummyData() default {} ; - - public Annotation3[] subAnnotations() default {}; - -} +package com.github.markusbernhardt.xmldoclet.simpledata; + +/** + * AnnotationCascadeChild + */ +public @interface AnnotationCascadeChild { + + /** + * The name. + * + * @return The name. + */ + public String name(); + + public String[] dummyData() default {}; + + public Annotation3[] subAnnotations() default {}; + +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class10.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class10.java index 8c0b15c..25cba13 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class10.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class10.java @@ -5,4 +5,4 @@ */ class Class10 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class11.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class11.java index 43d798a..924eac0 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class11.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class11.java @@ -6,4 +6,4 @@ @SuppressWarnings("serial") public class Class11 extends java.lang.Exception { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class12.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class12.java index 7e37c03..5688afd 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class12.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class12.java @@ -6,4 +6,4 @@ @SuppressWarnings("serial") public class Class12 extends java.lang.Error { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class13.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class13.java index cb5b30d..0aa5dd6 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class13.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class13.java @@ -3,8 +3,7 @@ /** * Class13 * - * @param - * Generic class + * @param Generic class */ public class Class13 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class14.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class14.java index f560240..cbbfafb 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class14.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class14.java @@ -3,8 +3,7 @@ /** * Class14 * - * @param - * Generic class + * @param Generic class */ public class Class14 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class15.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class15.java index 5568e6e..9c16d41 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class15.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class15.java @@ -3,8 +3,7 @@ /** * Class15 * - * @param - * Generic class + * @param Generic class */ public class Class15 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class16.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class16.java index 1956a47..93bcae8 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class16.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class16.java @@ -6,4 +6,4 @@ @Annotation3(id = 3) public class Class16 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class17.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class17.java index 7a56ece..8eaf0af 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class17.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class17.java @@ -3,7 +3,7 @@ /** * Class17 */ -@Annotation5(id = { 1, 2 }) +@Annotation5(id = {1, 2}) public class Class17 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class18.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class18.java index ea768cc..7d1a243 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class18.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class18.java @@ -6,4 +6,4 @@ @Annotation6(id = "hey") public class Class18 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class19.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class19.java index 019d135..2f7c17c 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class19.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class19.java @@ -6,4 +6,4 @@ @Annotation7(id = Enum1.a) public class Class19 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class2.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class2.java index fd024db..839a911 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class2.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class2.java @@ -4,10 +4,10 @@ * Class2 */ public class Class2 { - /** - * Constructor1 - */ - public Class2() { + /** + * Constructor1 + */ + public Class2() { - } -} \ No newline at end of file + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class20.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class20.java index 7f4188e..f295d70 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class20.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class20.java @@ -6,4 +6,4 @@ @Annotation8(id = String.class) public class Class20 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class21.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class21.java index 4cf4c84..4794dbb 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class21.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class21.java @@ -6,4 +6,4 @@ @Annotation10(id = 'a') public class Class21 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class22.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class22.java index 95035b7..b178197 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class22.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class22.java @@ -6,4 +6,4 @@ @Annotation10(id = '\u0000') public class Class22 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class23.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class23.java index db2805a..d6627f6 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class23.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class23.java @@ -6,4 +6,4 @@ @Annotation11(id = true) public class Class23 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class24.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class24.java index 76d4715..d2ab637 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class24.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class24.java @@ -6,4 +6,4 @@ @Annotation5(id = {}) public class Class24 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class3.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class3.java index fde8ad7..7861e6f 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class3.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class3.java @@ -4,12 +4,12 @@ * Class3 */ public class Class3 { - /** - * method1 - * - * @return int - */ - public int method1() { - return 0; - } -} \ No newline at end of file + /** + * method1 + * + * @return int + */ + public int method1() { + return 0; + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class4.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class4.java index 777e168..8df1472 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class4.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class4.java @@ -4,8 +4,8 @@ * Class4 */ public class Class4 { - /** - * field1 - */ - public int field1; -} \ No newline at end of file + /** + * field1 + */ + public int field1; +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class5.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class5.java index da22642..dfa69eb 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class5.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class5.java @@ -5,4 +5,4 @@ */ public class Class5 extends Class3 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class6.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class6.java index 348c7eb..f2994be 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class6.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class6.java @@ -6,4 +6,4 @@ @SuppressWarnings("serial") public class Class6 implements java.io.Serializable { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class7.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class7.java index 7a24c0c..e4a31a8 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class7.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class7.java @@ -6,4 +6,4 @@ @Deprecated public class Class7 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class8.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class8.java index 8182db2..17a5acd 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class8.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class8.java @@ -5,4 +5,4 @@ */ public abstract class Class8 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class9.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class9.java index 8e25486..86411da 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class9.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Class9.java @@ -9,13 +9,13 @@ */ public class Class9 implements java.io.Externalizable { - public void writeExternal(ObjectOutput out) throws IOException { - // To change body of implemented methods use File | Settings | File - // Templates. - } + public void writeExternal(ObjectOutput out) throws IOException { + // To change body of implemented methods use File | Settings | File + // Templates. + } - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - // To change body of implemented methods use File | Settings | File - // Templates. - } -} \ No newline at end of file + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + // To change body of implemented methods use File | Settings | File + // Templates. + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/ClassAnnotationCascade.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/ClassAnnotationCascade.java index c7dc0e7..b09f6e0 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/ClassAnnotationCascade.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/ClassAnnotationCascade.java @@ -1,33 +1,31 @@ -package com.github.markusbernhardt.xmldoclet.simpledata; - -/** - * ClassAnnotationCascade - */ -@AnnotationCascade( - children= { - @AnnotationCascadeChild(name="primitive", - dummyData= {"A", "B", "C"} - ), - @AnnotationCascadeChild(name="nested", - subAnnotations= { - @Annotation3(id=4), - @Annotation3(id=5), - @Annotation3(id=666) - - }) - } - ) -public class ClassAnnotationCascade implements Interface2 { - - public void test() { - - } - - /** - * {@inheritDoc} - */ - @Override - public int method1() { - return 0; - } -} +package com.github.markusbernhardt.xmldoclet.simpledata; + +/** + * ClassAnnotationCascade + */ +@AnnotationCascade( + children = { + @AnnotationCascadeChild(name = "primitive", + dummyData = {"A", "B", "C"}), + @AnnotationCascadeChild(name = "nested", + subAnnotations = { + @Annotation3(id = 4), + @Annotation3(id = 5), + @Annotation3(id = 666) + + }) + }) +public class ClassAnnotationCascade implements Interface2 { + + public void test() { + + } + + /** + * {@inheritDoc} + */ + @Override + public int method1() { + return 0; + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum1.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum1.java index 99892d5..9d397d2 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum1.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum1.java @@ -4,16 +4,16 @@ * Enum1 */ public enum Enum1 { - /** - * a - */ - a, - /** - * b - */ - b, - /** - * c - */ - c -} \ No newline at end of file + /** + * a + */ + a, + /** + * b + */ + b, + /** + * c + */ + c +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum2.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum2.java index 2ee7642..b2c4cd8 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum2.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum2.java @@ -4,4 +4,4 @@ * Enum2 */ public enum Enum2 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum3.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum3.java index f82bec2..66d082f 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum3.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum3.java @@ -4,4 +4,4 @@ * Enum3 */ public enum Enum3 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum4.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum4.java index 5a7903e..a91dfc2 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum4.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum4.java @@ -4,6 +4,6 @@ * Enum4 */ public enum Enum4 { - /** field1 */ - field -} \ No newline at end of file + /** field1 */ + field +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum5.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum5.java index 4567667..7a7ba90 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum5.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum5.java @@ -5,4 +5,4 @@ */ @Deprecated public enum Enum5 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum6.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum6.java index 8449ae8..c061dbc 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum6.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Enum6.java @@ -6,4 +6,4 @@ @Deprecated @Annotation12("mister") public enum Enum6 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Field1.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Field1.java index 1583f90..207322f 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Field1.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Field1.java @@ -7,59 +7,59 @@ * Field1 */ public class Field1 { - /** field */ - public String field0; + /** field */ + public String field0; - /** field */ - public String field1; + /** field */ + public String field1; - /** field */ - @SuppressWarnings("unused") - private String field2; + /** field */ + @SuppressWarnings("unused") + private String field2; - /** field */ - String field3; + /** field */ + String field3; - /** field */ - protected String field4; + /** field */ + protected String field4; - /** field */ - public volatile String field5; + /** field */ + public volatile String field5; - /** field */ - public static String field6; + /** field */ + public static String field6; - /** field */ - public transient String field7; + /** field */ + public transient String field7; - /** field */ - public final String field8 = "mer"; + /** field */ + public final String field8 = "mer"; - /** field */ - public final String field9 = "testy"; + /** field */ + public final String field9 = "testy"; - /** field */ - public final int field10 = 10; + /** field */ + public final int field10 = 10; - /** field */ - @Deprecated - public String field11; + /** field */ + @Deprecated + public String field11; - /** field */ - @Deprecated - @Annotation12("mister") - public String field12; + /** field */ + @Deprecated + @Annotation12("mister") + public String field12; - /** field */ - public String field13; + /** field */ + public String field13; - /** field */ - public ArrayList field14; + /** field */ + public ArrayList field14; - /** field */ - public HashMap field15; + /** field */ + public HashMap field15; - /** field */ - public String[] field16; + /** field */ + public String[] field16; -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface1.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface1.java index 677a3fb..47d9194 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface1.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface1.java @@ -5,4 +5,4 @@ */ public interface Interface1 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface2.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface2.java index 873197b..ff285c4 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface2.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface2.java @@ -4,10 +4,10 @@ * Interface2 */ public interface Interface2 { - /** - * method1 - * - * @return int - */ - public int method1(); -} \ No newline at end of file + /** + * method1 + * + * @return int + */ + public int method1(); +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface3.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface3.java index 485b47e..6123bf9 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface3.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface3.java @@ -4,4 +4,4 @@ * Interface3 */ public interface Interface3 extends java.io.Serializable { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface4.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface4.java index 2b71554..804e6dd 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface4.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface4.java @@ -5,4 +5,4 @@ */ @Deprecated public interface Interface4 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface5.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface5.java index 7f978f1..924daf2 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface5.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface5.java @@ -4,8 +4,8 @@ * Interface5 */ interface Interface5 { - /** - * method1 - */ - void method1(); + /** + * method1 + */ + void method1(); } diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface6.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface6.java index 5960c1c..a20aa2e 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface6.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface6.java @@ -3,8 +3,7 @@ /** * Interface6 * - * @param - * Generic Class + * @param Generic Class */ public interface Interface6 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface7.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface7.java index 8569838..c49b7a0 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface7.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface7.java @@ -3,8 +3,7 @@ /** * Interface7 * - * @param - * Generic Class + * @param Generic Class */ public interface Interface7 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface8.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface8.java index da312ba..67970ea 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface8.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Interface8.java @@ -3,8 +3,7 @@ /** * Interface8 * - * @param - * Generic Class + * @param Generic Class */ public interface Interface8 { -} \ No newline at end of file +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method1.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method1.java index c64d7e1..95ef78c 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method1.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method1.java @@ -4,78 +4,78 @@ * Class1 */ public class Method1 { - /** Method */ - public void method1() { + /** Method */ + public void method1() { - } + } - /** - * Method - * - * @return ret - */ - public Integer method2() { - return new Integer(0); - } + /** + * Method + * + * @return ret + */ + public Integer method2() { + return new Integer(0); + } - /** - * Method - * - * @return ret - */ - public int method3() { - return 0; - } + /** + * Method + * + * @return ret + */ + public int method3() { + return 0; + } - /** Method */ - public void method4() { + /** Method */ + public void method4() { - } + } - /** + /** * */ - public void method5() { + public void method5() { - } + } - /** - * - * @return lins - */ - public Integer method6() { - return new Integer(0); - } + /** + * + * @return lins + */ + public Integer method6() { + return new Integer(0); + } - /** - * - * @return line - */ - public Integer method7() { - return new Integer(0); - } + /** + * + * @return line + */ + public Integer method7() { + return new Integer(0); + } - /** - * - * @return line - */ - public Integer method8() { - return new Integer(0); - } + /** + * + * @return line + */ + public Integer method8() { + return new Integer(0); + } - /** - * - * @return line line - */ - public Integer method9() { - return new Integer(0); - } + /** + * + * @return line line + */ + public Integer method9() { + return new Integer(0); + } - /** - * - * @return line line - */ - public Integer method10() { - return new Integer(0); - } -} \ No newline at end of file + /** + * + * @return line line + */ + public Integer method10() { + return new Integer(0); + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method2.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method2.java index 5f45708..86adcbd 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method2.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method2.java @@ -6,100 +6,90 @@ * Class1 */ public class Method2 { - /** Method */ - public void method1() { - - } - - /** - * Method - * - * @param arg1 - * arg - */ - public void method2(Integer arg1) { - - } - - /** - * Method - * - * @param arg1 - * arg - */ - public void method3(int arg1) { - - } - - /** - * Method - * - * @param arg1 - * arg - * @param arg2 - * arg - */ - public void method4(Integer arg1, Integer arg2) { - - } - - /** - * Method - * - * @param arg1 - * arg - */ - public void method5(ArrayList arg1) { - - } - - /** - * Method - * - * @param arg1 - * arg - */ - public void method6(ArrayList arg1) { - - } - - /** - * Method - * - * @param arg1 - * arg - */ - public void method7(ArrayList arg1) { - - } - - /** - * Method - * - * @param arg1 - * arg - */ - public void method8(ArrayList arg1) { - - } - - /** - * Method - * - * @param arg1 - * arg - */ - public void method9(ArrayList> arg1) { - - } - - /** - * Method - * - * @param object - * object - */ - public void method10(Object... object) { - - } -} \ No newline at end of file + /** Method */ + public void method1() { + + } + + /** + * Method + * + * @param arg1 arg + */ + public void method2(Integer arg1) { + + } + + /** + * Method + * + * @param arg1 arg + */ + public void method3(int arg1) { + + } + + /** + * Method + * + * @param arg1 arg + * @param arg2 arg + */ + public void method4(Integer arg1, Integer arg2) { + + } + + /** + * Method + * + * @param arg1 arg + */ + public void method5(ArrayList arg1) { + + } + + /** + * Method + * + * @param arg1 arg + */ + public void method6(ArrayList arg1) { + + } + + /** + * Method + * + * @param arg1 arg + */ + public void method7(ArrayList arg1) { + + } + + /** + * Method + * + * @param arg1 arg + */ + public void method8(ArrayList arg1) { + + } + + /** + * Method + * + * @param arg1 arg + */ + public void method9(ArrayList> arg1) { + + } + + /** + * Method + * + * @param object object + */ + public void method10(Object... object) { + + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method3.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method3.java index dc65a40..7ddc079 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method3.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Method3.java @@ -4,76 +4,73 @@ * Class1 */ public class Method3 { - /** Method */ - public void method1() { + /** Method */ + public void method1() { - } + } - /** Method */ - void method2() { + /** Method */ + void method2() { - } + } - /** Method */ - private void method3() { + /** Method */ + private void method3() { - } + } - /** Method */ - protected void method4() { + /** Method */ + protected void method4() { - } + } - /** Method */ - public native void method5(); + /** Method */ + public native void method5(); - /** Method */ - public static void method6() { + /** Method */ + public static void method6() { - } + } - /** Method */ - public final void method7() { + /** Method */ + public final void method7() { - } + } - /** Method */ - public synchronized void method8() { + /** Method */ + public synchronized void method8() { - } + } - /** - * Method - * - * @throws Exception - * exception - */ - public void method9() throws Exception { + /** + * Method + * + * @throws Exception exception + */ + public void method9() throws Exception { - } + } - /** - * Method - * - * @throws OutOfMemoryError - * exception - * @throws IllegalArgumentException - * exception - */ - public void method10() throws OutOfMemoryError, IllegalArgumentException { + /** + * Method + * + * @throws OutOfMemoryError exception + * @throws IllegalArgumentException exception + */ + public void method10() throws OutOfMemoryError, IllegalArgumentException { - } + } - /** Method */ - @Deprecated - public void method11() { + /** Method */ + @Deprecated + public void method11() { - } + } - /** Method */ - @Deprecated - @Annotation12("java.lang.Warning") - public void method12() { + /** Method */ + @Deprecated + @Annotation12("java.lang.Warning") + public void method12() { - } -} \ No newline at end of file + } +} diff --git a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Tag1.java b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Tag1.java index 2562de1..847d74e 100644 --- a/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Tag1.java +++ b/src/test/java/com/github/markusbernhardt/xmldoclet/simpledata/Tag1.java @@ -1,27 +1,25 @@ -package com.github.markusbernhardt.xmldoclet.simpledata; - -/** - * Tag1 - * - * @author author - * @deprecated deprecated - * @category category - * @see java.lang.Object - * @serial serial - * @since since - * @version version - */ -public class Tag1 { - /** - * The famous foo method. - * - * @param bar - * bar - * @return object - * @throws NullPointerException - * exception - */ - public Object foo(Object bar) { - return ""; - } -} +package com.github.markusbernhardt.xmldoclet.simpledata; + +/** + * Tag1 + * + * @author author + * @deprecated deprecated + * @category category + * @see java.lang.Object + * @serial serial + * @since since + * @version version + */ +public class Tag1 { + /** + * The famous foo method. + * + * @param bar bar + * @return object + * @throws NullPointerException exception + */ + public Object foo(Object bar) { + return ""; + } +}