Author: echatellier Date: 2010-09-23 12:11:58 +0200 (Thu, 23 Sep 2010) New Revision: 337 Url: http://nuiton.org/repositories/revision/wikitty/337 Log: Move topcased model to argoUML Added: trunk/wikitty-api/src/main/xmi/ trunk/wikitty-api/src/main/xmi/wikitty.zargo Removed: trunk/wikitty-api/src/main/uml/ Modified: trunk/wikitty-api/pom.xml trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-09-23 09:57:29 UTC (rev 336) +++ trunk/wikitty-api/pom.xml 2010-09-23 10:11:58 UTC (rev 337) @@ -123,18 +123,6 @@ <artifactId>wikitty-generators</artifactId> <version>${project.version}</version> </dependency> - <!-- Meta model uml d'eclipse --> - <dependency> - <groupId>org.eclipse.uml2.uml</groupId> - <artifactId>resources</artifactId> - <version>2.1.0-v200706251652</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.uml2</groupId> - <artifactId>uml</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> </plugin> <!-- Create a jar that includes all tests --> @@ -162,8 +150,7 @@ <phase>generate-sources</phase> <configuration> <inputs> - <input>zargo:src/main/uml/wikitty-api:*.zargo</input> - <input>xmi:src/main/uml/wikitty-api:*.uml</input> + <input>zargo:src/main/xmi:*.zargo</input> </inputs> <fullPackagePath>org.nuiton.wikitty</fullPackagePath> <defaultPackage>org.nuiton.wikitty</defaultPackage> Copied: trunk/wikitty-api/src/main/xmi/wikitty.zargo (from rev 333, trunk/wikitty-api/src/main/uml/wikitty-api/wikitty-security.zargo) =================================================================== (Binary files differ) Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-23 09:57:29 UTC (rev 336) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-23 10:11:58 UTC (rev 337) @@ -16,6 +16,8 @@ import org.nuiton.wikitty.ExtensionFactory; import org.nuiton.wikitty.FieldType; import org.nuiton.wikitty.FieldType.TYPE; +import org.nuiton.wikitty.TreeNode; +import org.nuiton.wikitty.TreeNodeAbstract; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; @@ -413,4 +415,16 @@ log.info("Time w set: " + timeSetW + " Time w get: " + timeGetW); log.info("Time z set: " + timeSetZ + " Time z get: " + timeGetZ); } + + /** + * Test que les entités générées sont dans les types attendus. + */ + @Test + public void testGeneratedExtensionType() { + + WikittyExtension wikittyExtension = TreeNodeAbstract.extensionTreeNode; + Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_PARENT).getType()); + Assert.assertEquals(TYPE.STRING, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_NAME).getType()); + Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_CHILDREN).getType()); + } }