Author: tchemit Date: 2008-10-02 15:03:29 +0000 (Thu, 02 Oct 2008) New Revision: 870 Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java Log: make tests works with or without maven todo : make some reals maven plugin tests... Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-02 15:01:30 UTC (rev 869) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-02 15:03:29 UTC (rev 870) @@ -36,6 +36,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Set; +import java.util.Arrays; /** * Classe permettant de transformer des sources jaxx vers du source java. @@ -174,6 +175,7 @@ getLog().info("outClass : " + options.getJavacTargetDirectory()); getLog().info("javacOpts: " + options.getJavacOpts()); getLog().info("optiomize: " + options.getOptimize()); + getLog().info("includes : " + Arrays.toString(includes)); for (String file : files) { getLog().info(file); } @@ -194,8 +196,11 @@ } } - for (Object e : getPluginContext().keySet()) { - getLog().info("pluginContext " + e + " : " + getPluginContext().get(e)); + //fixme should remove this silly test when we will make real maven plugin tests :) + if (getPluginContext()!=null) { + for (Object e : getPluginContext().keySet()) { + getLog().info("pluginContext " + e + " : " + getPluginContext().get(e)); + } } } @@ -221,8 +226,11 @@ } protected void fixCompileSourceRoots() { - if (!project.getCompileSourceRoots().contains(outJava.getPath())) { - project.addCompileSourceRoot(outJava.getPath()); + //fixme should remove this silly test when we will make real maven plugin tests :) + if (project!=null) { + if (!project.getCompileSourceRoots().contains(outJava.getPath())) { + project.addCompileSourceRoot(outJava.getPath()); + } } } Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-02 15:01:30 UTC (rev 869) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-02 15:03:29 UTC (rev 870) @@ -14,11 +14,21 @@ protected static final String PREFIX_PACKAGE = "testcases"; + protected static File basedir; + + public static File getBasedir() { + if (basedir == null) { + String basedirStr = System.getProperty("basedir"); + basedir = new File(basedirStr == null ? "." : basedirStr); + } + return basedir; + } + protected static File srcDir; protected static File getSrcDir() { if (srcDir == null) { - srcDir = new File("src" + File.separator + "test" + File.separator + "java"); + srcDir = new File(getBasedir(),"src" + File.separator + "test" + File.separator + "java"); } return srcDir; } @@ -27,7 +37,7 @@ protected static File getOutDir() { if (outDir == null) { - outDir = new File("target" + File.separator + "test-gen-java"); + outDir = new File(getBasedir(), "target" + File.separator + "test-gen-java"); outDir.mkdirs(); } return outDir; @@ -37,12 +47,22 @@ protected static File getClassOutDir() { if (ClassOutDir == null) { - ClassOutDir = new File("target" + File.separator + "test-classes"); + ClassOutDir = new File(getBasedir(),"target" + File.separator + "test-classes"); ClassOutDir.mkdirs(); } return ClassOutDir; } + protected static File ResourcesOutDir; + + protected static File getResourcesOutDir() { + if (ResourcesOutDir == null) { + ResourcesOutDir = new File(getBasedir(),"target" + File.separator + "test-classes"); + ResourcesOutDir.mkdirs(); + } + return ResourcesOutDir; + } + @Override public void setUp() throws IOException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, MojoExecutionException, MojoFailureException { CompileConfig anno = getClass().getMethod(getName()).getAnnotation(CompileConfig.class); @@ -53,20 +73,28 @@ assertTrue("could not found outDir (or not existing) : " + outDir + " on test " + getClass(), outDir != null && outDir.exists()); final File classOutDir = getClassOutDir(); assertTrue("could not found classOutDir (or not existing) : " + classOutDir + " on test " + getClass(), classOutDir != null && classOutDir.exists()); + final File resourcesOutDir = getResourcesOutDir(); + assertTrue("could not found classOutDir (or not existing) : " + resourcesOutDir + " on test " + getClass(), resourcesOutDir != null && resourcesOutDir.exists()); String packageName = anno.packageName(); goal = new JaxxGeneratorMojo(); goal.setSrc(srcDir); goal.setOutJava(outDir); goal.setOutClass(classOutDir); + goal.setOutResource(resourcesOutDir); + //goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); goal.setOptimize(anno.optimize()); goal.setVerbose(anno.verbose()); //TODO Use the maven plexus TestCase inorder to include dependencies goal.setJavaOpts(anno.javaOpts()); - goal.getLog().info(getName()); - + goal.getLog().info("setUp test " + getName()); } + /*protected void tearDown() throws Exception { + super.tearDown(); + + } */ + @CompileConfig(packageName = "InnerClasses", runJavac = true) public void testInnerClasses() throws MojoExecutionException, MojoFailureException { goal.execute(); @@ -85,13 +113,15 @@ goal.execute(); } - @CompileConfig(packageName = "CssTests") + @CompileConfig(packageName = "CSSTests", verbose = true) public void testCssTests() throws MojoExecutionException, MojoFailureException { goal.execute(); } - @CompileConfig(packageName = "errors") + @CompileConfig(packageName = "errors", verbose = true) public void testErrors() throws MojoExecutionException, MojoFailureException { + //fixme : launch a goal for each files found : since we should failed for some files... + //goal.execute(); } @CompileConfig(packageName = "Initializers", runJavac = false)