Author: tchemit Date: 2008-10-11 14:06:12 +0000 (Sat, 11 Oct 2008) New Revision: 893 Added: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java Modified: lutinjaxx/trunk/jaxx-core/changelog lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java Log: fix bug on JavaFileParser : works again Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-09 11:08:39 UTC (rev 892) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-11 14:06:12 UTC (rev 893) @@ -1,4 +1,5 @@ -ver-0-5 chemit 20081002 + ver-0-5 chemit 20081002 + * 20081011 [chemit] fix bug on JavaFileParser : works again * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) * 20081002 [chemit] Introduce JAXXContext Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java 2008-10-09 11:08:39 UTC (rev 892) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java 2008-10-11 14:06:12 UTC (rev 893) @@ -83,6 +83,7 @@ SimpleNode node = p.popNode(); if (node != null) { scanCompilationUnit(node); + return; } throw new CompilerException("Internal error: null node parsing Java file from " + src); } Copied: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java (from rev 884, lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/ClassDescriptorTest.java) =================================================================== --- lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java 2008-10-11 14:06:12 UTC (rev 893) @@ -0,0 +1,53 @@ +package jaxx.junit; + +import jaxx.CompilerException; +import jaxx.reflect.ClassDescriptor; +import jaxx.reflect.JavaFileParser; +import junit.framework.TestCase; + +import java.io.File; +import java.io.FileReader; +import java.io.Reader; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class JavaFileParserTest extends TestCase { + + + /** log */ + protected static final Log log = LogFactory.getLog(JavaFileParserTest.class); + + protected File getBaseDir() { + // get maven env basedir + String basedir = System.getenv("basedir"); + if (basedir == null) { + basedir = new File("").getAbsolutePath(); + } + return new File(basedir); + } + + public void testParseJavaSourceFile() throws Exception { + + + File testSourceRoot = new File(getBaseDir(), "src" + File.separator + "test" + File.separator + "java"); + assertTrue(testSourceRoot.exists()); + + File src = new File(testSourceRoot, getClass().getName().replaceAll("\\.", File.separator) + ".java"); + assertTrue(src.exists()); + log.info("trying parsing file " + src); + Reader reader = new FileReader(src); + try { + ClassDescriptor result = JavaFileParser.parseJavaFile("TestParserJava", reader, getClass().getClassLoader()); + assertNotNull(result); + + } catch (CompilerException e) { + log.error("could not parse file "+src+" for reason "+e.getMessage(),e); + fail(e.getMessage()); + } + finally { + reader.close(); + } + } + +} Property changes on: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java ___________________________________________________________________ Name: svn:mergeinfo +