|
 |
2f3bb1 |
From ca5a50fc69b4b1bb0f640edb8dbaa13c5e90112e Mon Sep 17 00:00:00 2001
|
|
|
2f3bb1 |
From: rfscholte <rfscholte@apache.org>
|
|
|
2f3bb1 |
Date: Thu, 19 Jan 2017 18:44:38 +0100
|
|
|
2f3bb1 |
Subject: [PATCH] #16 Single comment line not recognized
|
|
|
2f3bb1 |
|
|
|
2f3bb1 |
---
|
|
|
2f3bb1 |
src/grammar/lexer.flex | 2 +-
|
|
|
2f3bb1 |
.../thoughtworks/qdox/JavaProjectBuilderTest.java | 32 ++++++++++++++++++++++
|
|
|
2f3bb1 |
2 files changed, 33 insertions(+), 1 deletion(-)
|
|
|
2f3bb1 |
|
|
|
2f3bb1 |
diff --git a/src/grammar/lexer.flex b/src/grammar/lexer.flex
|
|
|
2f3bb1 |
index 681f2b8..bd3462c 100644
|
|
|
2f3bb1 |
--- a/src/grammar/lexer.flex
|
|
|
2f3bb1 |
+++ b/src/grammar/lexer.flex
|
|
|
2f3bb1 |
@@ -608,7 +608,7 @@ JavadocEnd = "*"+ "/"
|
|
|
2f3bb1 |
\' { if (appendingToCodeBody) { codeBody.append('\''); } pushState(CHAR); }
|
|
|
2f3bb1 |
}
|
|
|
2f3bb1 |
|
|
|
2f3bb1 |
-<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, ANNOTATION, ARGUMENTS, TYPE> {
|
|
|
2f3bb1 |
+<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, ANNOTATION, ARGUMENTS, TYPE, NAME> {
|
|
|
2f3bb1 |
"//" { if (appendingToCodeBody) { codeBody.append("//"); } pushState(SINGLELINECOMMENT); }
|
|
|
2f3bb1 |
"/*" { if (appendingToCodeBody) { codeBody.append("/*"); } pushState(MULTILINECOMMENT); }
|
|
|
2f3bb1 |
"/**/" { if (appendingToCodeBody) { codeBody.append("/**/"); } }
|
|
|
2f3bb1 |
diff --git a/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java b/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
|
|
|
2f3bb1 |
index 204a23a..edc6352 100644
|
|
|
2f3bb1 |
--- a/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
|
|
|
2f3bb1 |
+++ b/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
|
|
|
2f3bb1 |
@@ -1582,6 +1582,38 @@ public class JavaProjectBuilderTest extends TestCase
|
|
|
2f3bb1 |
|
|
|
2f3bb1 |
assertEquals( "com.fg.rtdoc.test.Iface", clz.getInterfaces().get(0).getFullyQualifiedName() );
|
|
|
2f3bb1 |
}
|
|
|
2f3bb1 |
+
|
|
|
2f3bb1 |
+ // Github #16
|
|
|
2f3bb1 |
+ public void testBeanProperties()
|
|
|
2f3bb1 |
+ {
|
|
|
2f3bb1 |
+ String zothParent = "public class ZothParent {\n" +
|
|
|
2f3bb1 |
+ " private String name;\n" +
|
|
|
2f3bb1 |
+ " public String getName() {\n" +
|
|
|
2f3bb1 |
+ " return name;\n" +
|
|
|
2f3bb1 |
+ " }\n" +
|
|
|
2f3bb1 |
+ " public void setName(String name) {\n" +
|
|
|
2f3bb1 |
+ " this.name = name;\n" +
|
|
|
2f3bb1 |
+ " }\n" +
|
|
|
2f3bb1 |
+ "}";
|
|
|
2f3bb1 |
+
|
|
|
2f3bb1 |
+ String zothChild = "public class ZothChild // extends ZothParent\n" +
|
|
|
2f3bb1 |
+ "{\n" +
|
|
|
2f3bb1 |
+ " private int age;\n" +
|
|
|
2f3bb1 |
+ " public int getAge() {\n" +
|
|
|
2f3bb1 |
+ " return age;\n" +
|
|
|
2f3bb1 |
+ " }\n" +
|
|
|
2f3bb1 |
+ " public void setAge(int age) {\n" +
|
|
|
2f3bb1 |
+ " this.age = age;\n" +
|
|
|
2f3bb1 |
+ " }\n" +
|
|
|
2f3bb1 |
+ "}";
|
|
|
2f3bb1 |
+
|
|
|
2f3bb1 |
+ JavaProjectBuilder builder = new JavaProjectBuilder();
|
|
|
2f3bb1 |
+ builder.addSource(new StringReader( zothParent ));
|
|
|
2f3bb1 |
+ JavaClass zothClass = builder.addSource(new StringReader( zothChild )).getClassByName( "ZothChild" );
|
|
|
2f3bb1 |
+ assertEquals( "java.lang.Object", zothClass.getSuperClass().getBinaryName());
|
|
|
2f3bb1 |
+ assertEquals( 2, zothClass.getBeanProperties( true ).size() );
|
|
|
2f3bb1 |
+
|
|
|
2f3bb1 |
+ }
|
|
|
2f3bb1 |
|
|
|
2f3bb1 |
public void testDeclarationSignatureWithGenerics() {
|
|
|
2f3bb1 |
String source = "import java.util.List;"
|
|
|
2f3bb1 |
--
|
|
|
2f3bb1 |
2.9.3
|
|
|
2f3bb1 |
|