Skip to content

Commit 437ba49

Browse files
MarkusBernhardtMarkusBernhardt
committed
First real unit test. Failing.
1 parent cf83dd2 commit 437ba49

File tree

4 files changed

+228
-65
lines changed

4 files changed

+228
-65
lines changed

‎src/main/java/com/github/markusbernhardt/xmldoclet/Parser.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected Annotation parseAnnotationTypeDoc(AnnotationTypeDoc annotationTypeDoc)
9797
annotationNode.setName(annotationTypeDoc.name());
9898
annotationNode.setQualifiedName(annotationTypeDoc.qualifiedName());
9999
annotationNode.setComment(annotationTypeDoc.commentText());
100-
annotationNode.setIsIncluded(annotationTypeDoc.isIncluded());
100+
annotationNode.setIncluded(annotationTypeDoc.isIncluded());
101101
annotationNode.setScope(parseScope(annotationTypeDoc));
102102

103103
for (AnnotationTypeElementDoc annotationTypeElementDoc : annotationTypeDoc.elements()) {
@@ -156,8 +156,8 @@ protected AnnotationInstance parseAnnotationDesc(AnnotationDesc annotationDesc,
156156

157157
Type annotationArgumentType = elementValuesPair.element().returnType();
158158
annotationArgumentNode.setType(annotationArgumentType.qualifiedTypeName());
159-
annotationArgumentNode.setIsPrimitive(annotationArgumentType.isPrimitive());
160-
annotationArgumentNode.setIsArray(annotationArgumentType.dimension().length() > 0);
159+
annotationArgumentNode.setPrimitive(annotationArgumentType.isPrimitive());
160+
annotationArgumentNode.setArray(annotationArgumentType.dimension().length() > 0);
161161

162162
Object objValue = elementValuesPair.value().value();
163163
if (objValue instanceof AnnotationValue[]) {
@@ -182,7 +182,7 @@ protected Enum parseEnum(ClassDoc classDoc) {
182182
enumNode.setName(classDoc.name());
183183
enumNode.setQualifiedName(classDoc.qualifiedName());
184184
enumNode.setComment(classDoc.commentText());
185-
enumNode.setIsIncluded(classDoc.isIncluded());
185+
enumNode.setIncluded(classDoc.isIncluded());
186186
enumNode.setScope(parseScope(classDoc));
187187

188188
Type superClassType = classDoc.superclassType();
@@ -229,7 +229,7 @@ protected Interface parseInterface(ClassDoc classDoc) {
229229
interfaceNode.setName(classDoc.name());
230230
interfaceNode.setQualifiedName(classDoc.qualifiedName());
231231
interfaceNode.setComment(classDoc.commentText());
232-
interfaceNode.setIsIncluded(classDoc.isIncluded());
232+
interfaceNode.setIncluded(classDoc.isIncluded());
233233
interfaceNode.setScope(parseScope(classDoc));
234234

235235
for (TypeVariable typeVariable : classDoc.typeParameters()) {
@@ -257,12 +257,12 @@ protected Class parseClass(ClassDoc classDoc) {
257257
classNode.setName(classDoc.name());
258258
classNode.setQualifiedName(classDoc.qualifiedName());
259259
classNode.setComment(classDoc.commentText());
260-
classNode.setIsAbstract(classDoc.isAbstract());
261-
classNode.setIsError(classDoc.isError());
262-
classNode.setIsException(classDoc.isException());
263-
classNode.setIsExternalizable(classDoc.isExternalizable());
264-
classNode.setIsIncluded(classDoc.isIncluded());
265-
classNode.setIsSerializable(classDoc.isSerializable());
260+
classNode.setAbstract(classDoc.isAbstract());
261+
classNode.setError(classDoc.isError());
262+
classNode.setException(classDoc.isException());
263+
classNode.setExternalizable(classDoc.isExternalizable());
264+
classNode.setIncluded(classDoc.isIncluded());
265+
classNode.setSerializable(classDoc.isSerializable());
266266
classNode.setScope(parseScope(classDoc));
267267

268268
for (TypeVariable typeVariable : classDoc.typeParameters()) {
@@ -304,12 +304,12 @@ protected Constructor parseConstructor(ConstructorDoc constructorDoc) {
304304
constructorNode.setQualifiedName(constructorDoc.qualifiedName());
305305
constructorNode.setComment(constructorDoc.commentText());
306306
constructorNode.setScope(parseScope(constructorDoc));
307-
constructorNode.setIsIncluded(constructorDoc.isIncluded());
308-
constructorNode.setIsFinal(constructorDoc.isFinal());
309-
constructorNode.setIsNative(constructorDoc.isNative());
310-
constructorNode.setIsStatic(constructorDoc.isStatic());
311-
constructorNode.setIsSynchronized(constructorDoc.isSynchronized());
312-
constructorNode.setIsVarArgs(constructorDoc.isVarArgs());
307+
constructorNode.setIncluded(constructorDoc.isIncluded());
308+
constructorNode.setFinal(constructorDoc.isFinal());
309+
constructorNode.setNative(constructorDoc.isNative());
310+
constructorNode.setStatic(constructorDoc.isStatic());
311+
constructorNode.setSynchronized(constructorDoc.isSynchronized());
312+
constructorNode.setVarArgs(constructorDoc.isVarArgs());
313313
constructorNode.setSignature(constructorDoc.signature());
314314

315315
for (Parameter parameter : constructorDoc.parameters()) {
@@ -334,13 +334,13 @@ protected Method parseMethod(MethodDoc methodDoc) {
334334
methodNode.setQualifiedName(methodDoc.qualifiedName());
335335
methodNode.setComment(methodDoc.commentText());
336336
methodNode.setScope(parseScope(methodDoc));
337-
methodNode.setIsAbstract(methodDoc.isAbstract());
338-
methodNode.setIsIncluded(methodDoc.isIncluded());
339-
methodNode.setIsFinal(methodDoc.isFinal());
340-
methodNode.setIsNative(methodDoc.isNative());
341-
methodNode.setIsStatic(methodDoc.isStatic());
342-
methodNode.setIsSynchronized(methodDoc.isSynchronized());
343-
methodNode.setIsVarArgs(methodDoc.isVarArgs());
337+
methodNode.setAbstract(methodDoc.isAbstract());
338+
methodNode.setIncluded(methodDoc.isIncluded());
339+
methodNode.setFinal(methodDoc.isFinal());
340+
methodNode.setNative(methodDoc.isNative());
341+
methodNode.setStatic(methodDoc.isStatic());
342+
methodNode.setSynchronized(methodDoc.isSynchronized());
343+
methodNode.setVarArgs(methodDoc.isVarArgs());
344344
methodNode.setSignature(methodDoc.signature());
345345
methodNode.setReturn(parseTypeInfo(methodDoc.returnType()));
346346

@@ -378,10 +378,10 @@ protected Field parseField(FieldDoc fieldDoc) {
378378
fieldNode.setQualifiedName(fieldDoc.qualifiedName());
379379
fieldNode.setComment(fieldDoc.commentText());
380380
fieldNode.setScope(parseScope(fieldDoc));
381-
fieldNode.setIsFinal(fieldDoc.isFinal());
382-
fieldNode.setIsStatic(fieldDoc.isStatic());
383-
fieldNode.setIsVolatile(fieldDoc.isVolatile());
384-
fieldNode.setIsTransient(fieldDoc.isTransient());
381+
fieldNode.setFinal(fieldDoc.isFinal());
382+
fieldNode.setStatic(fieldDoc.isStatic());
383+
fieldNode.setVolatile(fieldDoc.isVolatile());
384+
fieldNode.setTransient(fieldDoc.isTransient());
385385
fieldNode.setConstant(fieldDoc.constantValueExpression());
386386

387387
for (AnnotationDesc annotationDesc : fieldDoc.annotations()) {

‎src/main/xjc/javadoc.xsd‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
minOccurs="0" />
3333
<xs:element name="comment" type="xs:string" minOccurs="0" />
3434
<xs:element name="scope" type="scope" minOccurs="0" />
35-
<xs:element name="isIncluded" type="xs:boolean" />
35+
<xs:element name="included" type="xs:boolean" />
3636
<xs:element name="elements" type="annotationElement"
3737
minOccurs="0" maxOccurs="unbounded" />
3838
<xs:element name="annotations" type="annotationInstance"
@@ -67,8 +67,8 @@
6767
<xs:element name="value" type="xs:string" minOccurs="0"
6868
maxOccurs="unbounded" />
6969
<xs:element name="type" type="xs:string" minOccurs="0" />
70-
<xs:element name="isPrimitive" type="xs:boolean" />
71-
<xs:element name="isArray" type="xs:boolean" />
70+
<xs:element name="primitive" type="xs:boolean" />
71+
<xs:element name="array" type="xs:boolean" />
7272
</xs:sequence>
7373
</xs:complexType>
7474

@@ -79,7 +79,7 @@
7979
minOccurs="0" />
8080
<xs:element name="comment" type="xs:string" minOccurs="0" />
8181
<xs:element name="scope" type="xs:string" minOccurs="0" />
82-
<xs:element name="isIncluded" type="xs:boolean" />
82+
<xs:element name="included" type="xs:boolean" />
8383
<xs:element name="extends" type="typeInfo" minOccurs="0" />
8484
<xs:element name="implements" type="typeInfo" minOccurs="0"
8585
maxOccurs="unbounded" />
@@ -106,7 +106,7 @@
106106
minOccurs="0" />
107107
<xs:element name="comment" type="xs:string" minOccurs="0" />
108108
<xs:element name="scope" type="xs:string" minOccurs="0" />
109-
<xs:element name="isIncluded" type="xs:boolean" />
109+
<xs:element name="included" type="xs:boolean" />
110110
<xs:element name="generics" type="typeParameter"
111111
minOccurs="0" maxOccurs="unbounded" />
112112
<xs:element name="extends" type="typeInfo" minOccurs="0"
@@ -125,12 +125,12 @@
125125
minOccurs="0" />
126126
<xs:element name="comment" type="xs:string" minOccurs="0" />
127127
<xs:element name="scope" type="xs:string" minOccurs="0" />
128-
<xs:element name="isAbstract" type="xs:boolean" />
129-
<xs:element name="isError" type="xs:boolean" />
130-
<xs:element name="isException" type="xs:boolean" />
131-
<xs:element name="isExternalizable" type="xs:boolean" />
132-
<xs:element name="isIncluded" type="xs:boolean" />
133-
<xs:element name="isSerializable" type="xs:boolean" />
128+
<xs:element name="abstract" type="xs:boolean" />
129+
<xs:element name="error" type="xs:boolean" />
130+
<xs:element name="exception" type="xs:boolean" />
131+
<xs:element name="externalizable" type="xs:boolean" />
132+
<xs:element name="included" type="xs:boolean" />
133+
<xs:element name="serializable" type="xs:boolean" />
134134
<xs:element name="generics" type="typeParameter"
135135
minOccurs="0" maxOccurs="unbounded" />
136136
<xs:element name="extends" type="typeInfo" minOccurs="0" />
@@ -154,12 +154,12 @@
154154
minOccurs="0" />
155155
<xs:element name="comment" type="xs:string" minOccurs="0" />
156156
<xs:element name="scope" type="xs:string" minOccurs="0" />
157-
<xs:element name="isFinal" type="xs:boolean" />
158-
<xs:element name="isIncluded" type="xs:boolean" />
159-
<xs:element name="isNative" type="xs:boolean" />
160-
<xs:element name="isSynchronized" type="xs:boolean" />
161-
<xs:element name="isStatic" type="xs:boolean" />
162-
<xs:element name="isVarArgs" type="xs:boolean" />
157+
<xs:element name="final" type="xs:boolean" />
158+
<xs:element name="included" type="xs:boolean" />
159+
<xs:element name="native" type="xs:boolean" />
160+
<xs:element name="synchronized" type="xs:boolean" />
161+
<xs:element name="static" type="xs:boolean" />
162+
<xs:element name="varArgs" type="xs:boolean" />
163163
<xs:element name="signature" type="xs:string" minOccurs="0" />
164164
<xs:element name="parameters" type="methodParameter"
165165
minOccurs="0" maxOccurs="unbounded" />
@@ -177,13 +177,13 @@
177177
minOccurs="0" />
178178
<xs:element name="comment" type="xs:string" minOccurs="0" />
179179
<xs:element name="scope" type="xs:string" minOccurs="0" />
180-
<xs:element name="isAbstract" type="xs:boolean" />
181-
<xs:element name="isFinal" type="xs:boolean" />
182-
<xs:element name="isIncluded" type="xs:boolean" />
183-
<xs:element name="isNative" type="xs:boolean" />
184-
<xs:element name="isSynchronized" type="xs:boolean" />
185-
<xs:element name="isStatic" type="xs:boolean" />
186-
<xs:element name="isVarArgs" type="xs:boolean" />
180+
<xs:element name="abstract" type="xs:boolean" />
181+
<xs:element name="final" type="xs:boolean" />
182+
<xs:element name="included" type="xs:boolean" />
183+
<xs:element name="native" type="xs:boolean" />
184+
<xs:element name="synchronized" type="xs:boolean" />
185+
<xs:element name="static" type="xs:boolean" />
186+
<xs:element name="varArgs" type="xs:boolean" />
187187
<xs:element name="signature" type="xs:string" minOccurs="0" />
188188
<xs:element name="parameters" type="methodParameter"
189189
minOccurs="0" maxOccurs="unbounded" />
@@ -212,10 +212,10 @@
212212
minOccurs="0" />
213213
<xs:element name="comment" type="xs:string" minOccurs="0" />
214214
<xs:element name="scope" type="xs:string" minOccurs="0" />
215-
<xs:element name="isVolatile" type="xs:boolean" />
216-
<xs:element name="isTransient" type="xs:boolean" />
217-
<xs:element name="isStatic" type="xs:boolean" />
218-
<xs:element name="isFinal" type="xs:boolean" />
215+
<xs:element name="volatile" type="xs:boolean" />
216+
<xs:element name="transient" type="xs:boolean" />
217+
<xs:element name="static" type="xs:boolean" />
218+
<xs:element name="final" type="xs:boolean" />
219219
<xs:element name="constant" type="xs:string" minOccurs="0" />
220220
<xs:element name="annotations" type="annotationInstance"
221221
minOccurs="0" maxOccurs="unbounded" />

‎src/test/java/com/github/markusbernhardt/xmldoclet/AbstractTestParent.java‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;
1111

12+
import com.github.markusbernhardt.xmldoclet.xjc.Root;
13+
1214
public class AbstractTestParent {
1315

1416
private final static Logger log = LoggerFactory.getLogger(AbstractTestParent.class);
@@ -52,7 +54,7 @@ public class AbstractTestParent {
5254
* (unless you specify 'bar' as a subpackage, too)
5355
* @return XStream compatible data structure
5456
*/
55-
public void executeJavadoc(String extendedClassPath, String[] sourcePaths, String[] packages, String[] sourceFiles,
57+
public Root executeJavadoc(String extendedClassPath, String[] sourcePaths, String[] packages, String[] sourceFiles,
5658
String[] subPackages, String[] additionalArguments) {
5759
try {
5860
OutputStream errors = new LoggingOutputStream(log, LoggingLevelEnum.ERROR);
@@ -76,16 +78,20 @@ public void executeJavadoc(String extendedClassPath, String[] sourcePaths, Strin
7678
argumentList.add("-classpath");
7779
argumentList.add(classPath);
7880

79-
String concatedSourcePaths = join(File.pathSeparator, sourcePaths);
80-
if (concatedSourcePaths.length() > 0) {
81-
argumentList.add("-sourcepath");
82-
argumentList.add(concatedSourcePaths);
81+
if (sourcePaths != null) {
82+
String concatedSourcePaths = join(File.pathSeparator, sourcePaths);
83+
if (concatedSourcePaths.length() > 0) {
84+
argumentList.add("-sourcepath");
85+
argumentList.add(concatedSourcePaths);
86+
}
8387
}
8488

85-
String concatedSubPackages = join(";", subPackages);
86-
if (concatedSubPackages.length() > 0) {
87-
argumentList.add("-subpackages");
88-
argumentList.add(concatedSubPackages);
89+
if (subPackages != null) {
90+
String concatedSubPackages = join(";", subPackages);
91+
if (concatedSubPackages.length() > 0) {
92+
argumentList.add("-subpackages");
93+
argumentList.add(concatedSubPackages);
94+
}
8995
}
9096

9197
if (packages != null) {
@@ -116,6 +122,8 @@ public void executeJavadoc(String extendedClassPath, String[] sourcePaths, Strin
116122
} catch (Error e) {
117123
log.error("doclet error", e);
118124
}
125+
126+
return XmlDoclet.root;
119127
}
120128

121129
public static String join(String glue, String[] strings) {

0 commit comments

Comments
 (0)