[qdox-scm] [1276] trunk/qdox/src/test/resources: Improve LexerTest

Sun, 31 Jul 2011 03:23:35 -0700

Title: [1276] trunk/qdox/src/test/resources: Improve LexerTest
Revision
1276
Author
rfscholte
Date
2011-07-31 05:23:26 -0500 (Sun, 31 Jul 2011)

Log Message

Improve LexerTest
- fix todo's
- specify expected results for IDENTIFIER and STRING_LITERAL
- move testdata sourcefiles if they shouldn't be available as compiled class on the classpath


Modified Paths




Added Paths


    

  • trunk/qdox/src/test/resources/com/
    • 

  • trunk/qdox/src/test/resources/com/thoughtworks/
    • 

  • trunk/qdox/src/test/resources/com/thoughtworks/qdox/
    • 

  • trunk/qdox/src/test/resources/com/thoughtworks/qdox/testdata/
    • 




Removed Paths

Diff

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java (1275 => 1276)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java	2011-07-26 21:01:34 UTC (rev 1275)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java	2011-07-31 10:23:26 UTC (rev 1276)
@@ -506,7 +506,7 @@
     }
 
     public void testSourceDefaultCtor() throws Exception {
-        builder.addSource(new File("src/test/java/com/thoughtworks/qdox/testdata/DefaultCtor.java"));
+        builder.addSource(new File("src/test/resources/com/thoughtworks/qdox/testdata/DefaultCtor.java"));
         JavaClass javaClass = builder.getClassByName("com.thoughtworks.qdox.testdata.DefaultCtor");
 
         JavaMethod ctor = javaClass.getMethodBySignature("DefaultCtor", null);

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java (1275 => 1276)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java	2011-07-26 21:01:34 UTC (rev 1275)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java	2011-07-31 10:23:26 UTC (rev 1276)
@@ -60,7 +60,7 @@
 
         Lexer lexer = new JFlexLexer(new StringReader(in));
         assertLex(Parser.CLASS, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "X", lexer);
         assertLex(Parser.BRACEOPEN, lexer);
         assertLex(Parser.STATIC, lexer);
         assertLex(Parser.CODEBLOCK, lexer);
@@ -109,7 +109,7 @@
 
         Lexer lexer = new JFlexLexer(new StringReader(in));
         assertLex(Parser.CLASS, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "X", lexer);
         assertLex(Parser.BRACEOPEN, lexer);
 
         assertLex(Parser.IDENTIFIER, "int", lexer);
@@ -128,7 +128,7 @@
 
         Lexer lexer = new JFlexLexer(new StringReader(in));
         assertLex(Parser.CLASS, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "X", lexer);
         assertLex(Parser.BRACEOPEN, lexer);
 
         assertLex(Parser.IDENTIFIER, "int", lexer);
@@ -155,7 +155,7 @@
     }
 
     public void testUnicodeInFile() throws Exception {
-        Lexer lexer = new JFlexLexer(new FileReader("src/test/java/com/thoughtworks/qdox/testdata/Unicode.java"));
+        Lexer lexer = new JFlexLexer( getClass().getResourceAsStream( "/com/thoughtworks/qdox/testdata/Unicode.java" ) );
         assertLex(Parser.PACKAGE, lexer);
         assertLex(Parser.IDENTIFIER, lexer);
         assertLex(Parser.DOT, lexer);
@@ -400,13 +400,13 @@
         assertLex(Parser.IDENTIFIER, "month", lexer);
         assertLex(Parser.EQUALS, lexer);
         assertLex(Parser.STRING_LITERAL, "\"", lexer);
-        // TODO the above should be ...
-        // assertLex(Parser.STRING_LITERAL, "Jan", lexer);
+        assertEquals("\"Jan\"", lexer.getCodeBody());
         assertLex(Parser.PARENCLOSE, lexer);
         assertLex(Parser.AT, "@", lexer);
         assertLex(Parser.IDENTIFIER, "Note", lexer);
         assertLex(Parser.PARENOPEN, lexer);
         assertLex(Parser.STRING_LITERAL, lexer);
+        assertEquals( "\"Just ignore me\"", lexer.getCodeBody() );
         assertLex(Parser.PARENCLOSE, lexer);
         assertLex(Parser.PUBLIC, lexer);
         assertLex(Parser.CLASS, lexer);
@@ -451,8 +451,10 @@
         assertLex(Parser.PARENOPEN, "(", lexer);
         assertLex(Parser.BRACEOPEN, "{", lexer);
         assertLex(Parser.STRING_LITERAL, "\"", lexer);
+        assertEquals( "\"Children\"", lexer.getCodeBody() );
         assertLex(Parser.COMMA, ",", lexer);
         assertLex(Parser.STRING_LITERAL, "\"", lexer);
+        assertEquals( "\"Unscrupulous dentists\"", lexer.getCodeBody() );
         assertLex(Parser.BRACECLOSE, "}", lexer);
         assertLex(Parser.PARENCLOSE, ")", lexer);
         assertLex(Parser.PUBLIC, "public", lexer);
@@ -467,13 +469,13 @@
         String in = "enum Foo { a(\"hello\"); int someField; }";
         Lexer lexer = new JFlexLexer(new StringReader(in));
         assertLex(Parser.ENUM, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "Foo", lexer);
         assertLex(Parser.BRACEOPEN, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "a", lexer);
         assertLex(Parser.PARENBLOCK, lexer);
         assertLex(Parser.SEMI, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "int", lexer);
+        assertLex(Parser.IDENTIFIER, "someField", lexer);
         assertLex(Parser.SEMI, lexer);
         assertLex(Parser.BRACECLOSE, lexer);
     }
@@ -485,9 +487,9 @@
                 + "}";
         Lexer lexer = new JFlexLexer(new StringReader(in));
         assertLex(Parser.ENUM, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "Animal", lexer);
         assertLex(Parser.BRACEOPEN, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "DUCK", lexer);
         assertLex(Parser.CODEBLOCK, lexer);
         assertLex(Parser.BRACECLOSE, lexer);
     }
@@ -519,7 +521,7 @@
 
         Lexer lexer = new JFlexLexer(new StringReader(in));
         assertLex(Parser.INTERFACE, lexer);
-        assertLex(Parser.IDENTIFIER, lexer);
+        assertLex(Parser.IDENTIFIER, "X", lexer);
         assertLex(Parser.BRACEOPEN, lexer);
         assertLex(Parser.IDENTIFIER, "void", lexer);
         assertLex(Parser.IDENTIFIER, "paramWithNonAsciis\\u00E4\\u00F6\\u00FC\\u00DF", lexer);
@@ -536,17 +538,19 @@
     			"@MyFunction.MyInterface( prefix1 = \"abc\", prefix2 = \"abc\" )";
     	Lexer lexer = new JFlexLexer(new StringReader(in));
     	assertLex(Parser.AT, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "MyFunction", lexer);
     	assertLex(Parser.DOT, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "MyInterface", lexer);
     	assertLex(Parser.PARENOPEN, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "prefix1", lexer);
     	assertLex(Parser.EQUALS, lexer);
     	assertLex(Parser.STRING_LITERAL, lexer);
+    	assertEquals( "\"abc\"", lexer.getCodeBody() );
     	assertLex(Parser.COMMA, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "prefix2", lexer);
     	assertLex(Parser.EQUALS, lexer);
     	assertLex(Parser.STRING_LITERAL, lexer);
+    	assertEquals( "\"abc\"", lexer.getCodeBody() );
     	assertLex(Parser.PARENCLOSE, lexer);
     }
 
@@ -554,27 +558,30 @@
     	String in = "@Override\n public boolean isReadOnly(final ELContext context)";
     	Lexer lexer = new JFlexLexer(new StringReader(in));
     	assertLex(Parser.AT, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "Override", lexer);
     	assertLex(Parser.PUBLIC, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "boolean", lexer);
+    	assertLex(Parser.IDENTIFIER, "isReadOnly", lexer);
     	assertLex(Parser.PARENOPEN, lexer);
     	assertLex(Parser.FINAL, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "ELContext", lexer);
+    	assertLex(Parser.IDENTIFIER, "context", lexer);
     	assertLex(Parser.PARENCLOSE, lexer);
     }
     
-    public void testMultipleRowAnnotation() throws Exception {
-    	String in = "@JSFComponent\n  (name = \"h:inputHidden\")";
-    	Lexer lexer = new JFlexLexer(new StringReader(in));
-    	assertLex(Parser.AT, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
-    	assertLex(Parser.PARENOPEN, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
-    	assertLex(Parser.EQUALS, lexer);
-    	assertLex(Parser.STRING_LITERAL, lexer);
-    	assertLex(Parser.PARENCLOSE, lexer);
+    public void testMultipleRowAnnotation()
+        throws Exception
+    {
+        String in = "@JSFComponent\n  (name = \"h:inputHidden\")";
+        Lexer lexer = new JFlexLexer( new StringReader( in ) );
+        assertLex( Parser.AT, lexer );
+        assertLex( Parser.IDENTIFIER, "JSFComponent", lexer );
+        assertLex( Parser.PARENOPEN, lexer );
+        assertLex( Parser.IDENTIFIER, "name", lexer );
+        assertLex( Parser.EQUALS, lexer );
+        assertLex( Parser.STRING_LITERAL, lexer );
+        assertEquals( "\"h:inputHidden\"", lexer.getCodeBody() );
+        assertLex( Parser.PARENCLOSE, lexer );
     }
     
     public void testEnumWithAnnotations() throws Exception {
@@ -585,18 +592,19 @@
 		"}";  
     	Lexer lexer = new JFlexLexer(new StringReader(in));
     	assertLex(Parser.CLASS, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "Foo", lexer);
     	assertLex(Parser.BRACEOPEN, lexer);
     	assertLex(Parser.PUBLIC, lexer);
     	assertLex(Parser.ENUM, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "BasicType", lexer);
     	assertLex(Parser.BRACEOPEN, lexer);
     	assertLex(Parser.AT, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "XmlEnumValue", lexer);
     	assertLex(Parser.PARENOPEN, lexer);
     	assertLex(Parser.STRING_LITERAL, lexer);
+    	assertEquals( "\"text\"", lexer.getCodeBody() );
     	assertLex(Parser.PARENCLOSE, lexer);
-    	assertLex(Parser.IDENTIFIER, lexer);
+    	assertLex(Parser.IDENTIFIER, "VALUE", lexer);
     	assertLex(Parser.PARENBLOCK, lexer);
     	assertLex(Parser.SEMI, lexer);
     }

Deleted: trunk/qdox/src/test/java/com/thoughtworks/qdox/testdata/DefaultCtor.java (1275 => 1276)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/testdata/DefaultCtor.java	2011-07-26 21:01:34 UTC (rev 1275)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/testdata/DefaultCtor.java	2011-07-31 10:23:26 UTC (rev 1276)
@@ -1,9 +0,0 @@
-/* ----------------------------------------------------------------------------
- * (c) Volantis Systems Ltd 2007. All Rights Reserved.
- * ----------------------------------------------------------------------------
- */
-
-package com.thoughtworks.qdox.testdata;
-
-public class DefaultCtor {
-}

Deleted: trunk/qdox/src/test/java/com/thoughtworks/qdox/testdata/Unicode.java (1275 => 1276)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/testdata/Unicode.java	2011-07-26 21:01:34 UTC (rev 1275)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/testdata/Unicode.java	2011-07-31 10:23:26 UTC (rev 1276)
@@ -1,5 +0,0 @@
-package com.thoughtworks.qdox.testdata;
-
-class Unicode {
-    String x = "\u0000";
-}

Copied: trunk/qdox/src/test/resources/com/thoughtworks/qdox/testdata (from rev 1258, trunk/qdox/src/test/java/com/thoughtworks/qdox/testdata) ( => )

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to