Author: fdesbois Date: 2010-01-17 21:43:08 +0100 (Sun, 17 Jan 2010) New Revision: 797 Added: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java Removed: trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java Log: Clean usage of ImportsManager + some javadoc Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java 2010-01-17 20:43:08 UTC (rev 797) @@ -22,13 +22,13 @@ private static final Log log = LogFactory.getLog(AnnotationsManagerExtension.class); /** - * Extension static used to identify ImportsManagerExtension in ObjectModel + * Extension static used to identify AnnotationsManagerExtension in ObjectModel */ public static final String OBJECTMODEL_EXTENSION = "annotations"; /** - * Map of ImportsManager with key equals to the classifier qualified name associated to - * the ImportsManager + * Map of AnotationsManager with key equals to the classifier qualified name associated to + * the AnotationsManager */ protected Map<String, AnnotationsManager> managers; @@ -52,10 +52,10 @@ } /** - * Get the ImportsManager associated to the classifier. If not exist, it will be created. + * Get the AnotationsManager associated to the classifier. If not exist, it will be created. * - * @param classifier reference for the ImportsManager - * @return the importsManager associated to the classifier (never null) + * @param classifier reference for the AnotationsManager + * @return the annotationsManager associated to the classifier (never null) */ public AnnotationsManager getManager(ObjectModelClassifier classifier) { Map<String, AnnotationsManager> managers = getManagers(); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java 2010-01-17 20:43:08 UTC (rev 797) @@ -23,7 +23,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.ImportsManager; import org.nuiton.eugene.models.object.ObjectModelClassifier; import java.util.HashMap; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-01-17 20:43:08 UTC (rev 797) @@ -27,8 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.ImportsManager; -import org.nuiton.eugene.models.object.ObjectModelType; import org.nuiton.eugene.models.object.*; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.xml.*; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-01-17 20:43:08 UTC (rev 797) @@ -31,7 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.eugene.models.object.*; /** Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-01-17 20:43:08 UTC (rev 797) @@ -22,10 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.ObjectModelType; import org.nuiton.eugene.Template; -import org.nuiton.eugene.ImportsManager; -import org.nuiton.eugene.models.object.ObjectModelTransformer; import org.nuiton.eugene.models.object.*; /** Deleted: trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2010-01-17 20:43:08 UTC (rev 797) @@ -1,106 +0,0 @@ -/* - * *##% - * EUGene :: EUGene - * Copyright (C) 2004 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ -package org.nuiton.eugene; - -import java.io.Serializable; -import java.util.List; - -import junit.framework.TestCase; - -public class ImportsManagerTest extends TestCase { - - private ImportsManager mgr; - - @Override - protected void setUp() throws Exception { - mgr = new ImportsManager(); - } - - public void testAddImport() throws Exception { - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); //Repeat to test acceptance - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); - assertFalse(mgr.addImport("org.chorem.eugene.Tutu")); //Conflict, package differs - - assertTrue(mgr.addImport("void")); - assertTrue(mgr.addImport("boolean")); - assertTrue(mgr.addImport("Byte")); - assertTrue(mgr.addImport("java.lang.Toto")); - assertFalse(mgr.addImport("java.lang.sub.Toto")); - - assertTrue(mgr.addImport(Serializable.class)); - assertFalse(mgr.addImport("org.nuiton.eugene.Serializable")); - } - - public void testGetType() throws Exception { - assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); - assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); //Repeat to test acceptance - assertEquals("Tutu", mgr.getType("org.nuiton.eugene.Tutu")); - assertEquals("org.chorem.eugene.Tutu", mgr.getType("org.chorem.eugene.Tutu")); //Conflict, package differs - - assertEquals("void", mgr.getType("void")); - assertEquals("boolean", mgr.getType("boolean")); - assertEquals("Byte", mgr.getType("Byte")); - assertEquals("Toto", mgr.getType("java.lang.Toto")); - assertEquals("java.lang.sub.Toto", mgr.getType("java.lang.sub.Toto")); - } - - public void testGetImports() throws Exception { - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); - assertTrue(mgr.addImport("org.nuiton.eugene.subpackage.Tata")); - List<String> imports = mgr.getImports("org.nuiton.eugene"); - assertEquals(1, imports.size()); - assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(0)); - - imports = mgr.getImports("org.nuiton"); - assertEquals(3, imports.size()); - // Check using alphabetic sort - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(2)); - - imports = mgr.getImports("org.chorem"); - assertEquals(3, imports.size()); - - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - - assertTrue(mgr.addImport("java.lang.String")); - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - - assertTrue(mgr.addImport("void")); - assertTrue(mgr.addImport("boolean")); - assertTrue(mgr.addImport("Byte")); - assertTrue(mgr.addImport("java.lang.Toto")); - assertFalse(mgr.addImport("java.lang.sub.Titi")); // Read as started, import is refused - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); //Already present, must not reject - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); - - } - -} Copied: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java (from rev 795, trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java) =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java (rev 0) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java 2010-01-17 20:43:08 UTC (rev 797) @@ -0,0 +1,106 @@ +/* + * *##% + * EUGene :: EUGene + * Copyright (C) 2004 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package org.nuiton.eugene.java; + +import java.io.Serializable; +import java.util.List; + +import junit.framework.TestCase; + +public class ImportsManagerTest extends TestCase { + + private ImportsManager mgr; + + @Override + protected void setUp() throws Exception { + mgr = new ImportsManager(); + } + + public void testAddImport() throws Exception { + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); //Repeat to test acceptance + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); + assertFalse(mgr.addImport("org.chorem.eugene.Tutu")); //Conflict, package differs + + assertTrue(mgr.addImport("void")); + assertTrue(mgr.addImport("boolean")); + assertTrue(mgr.addImport("Byte")); + assertTrue(mgr.addImport("java.lang.Toto")); + assertFalse(mgr.addImport("java.lang.sub.Toto")); + + assertTrue(mgr.addImport(Serializable.class)); + assertFalse(mgr.addImport("org.nuiton.eugene.Serializable")); + } + + public void testGetType() throws Exception { + assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); + assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); //Repeat to test acceptance + assertEquals("Tutu", mgr.getType("org.nuiton.eugene.Tutu")); + assertEquals("org.chorem.eugene.Tutu", mgr.getType("org.chorem.eugene.Tutu")); //Conflict, package differs + + assertEquals("void", mgr.getType("void")); + assertEquals("boolean", mgr.getType("boolean")); + assertEquals("Byte", mgr.getType("Byte")); + assertEquals("Toto", mgr.getType("java.lang.Toto")); + assertEquals("java.lang.sub.Toto", mgr.getType("java.lang.sub.Toto")); + } + + public void testGetImports() throws Exception { + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); + assertTrue(mgr.addImport("org.nuiton.eugene.subpackage.Tata")); + List<String> imports = mgr.getImports("org.nuiton.eugene"); + assertEquals(1, imports.size()); + assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(0)); + + imports = mgr.getImports("org.nuiton"); + assertEquals(3, imports.size()); + // Check using alphabetic sort + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(2)); + + imports = mgr.getImports("org.chorem"); + assertEquals(3, imports.size()); + + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + + assertTrue(mgr.addImport("java.lang.String")); + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + + assertTrue(mgr.addImport("void")); + assertTrue(mgr.addImport("boolean")); + assertTrue(mgr.addImport("Byte")); + assertTrue(mgr.addImport("java.lang.Toto")); + assertFalse(mgr.addImport("java.lang.sub.Titi")); // Read as started, import is refused + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); //Already present, must not reject + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); + + } + +} Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + /branches/1.0.1-Javabuilder/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:641-651 /branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:652-681 /branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:682-754