Index: lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java diff -u lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java:1.1 lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java:1.2 --- lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java:1.1 Wed Aug 11 16:26:24 2004 +++ lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java Thu Aug 12 08:21:29 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/08/11 16:26:24 $ + * Mise a jour: $Date: 2004/08/12 08:21:29 $ * par : $Author: mazelier $ */ @@ -53,17 +53,17 @@ // 1 panel, 1 bouton, borderlayout File testFile1 = new File("src/test/org/codelutin/generator/models/ui/javaxml/test1.javaxml"); - // alarmPanel de Chorem - File testFile2 = new File("src/test/org/codelutin/generator/models/ui/javaxml/test4.javaxml"); + // alarmPanel de Chorem dans une JFrame + File testFile2 = new File("src/test/org/codelutin/generator/models/ui/javaxml/test2.javaxml"); JavaXMLParser parser = new JavaXMLParser(); UIModel ui = parser.parse(testFile); UIModel ui1 = parser.parse(testFile1); UIModel ui2 = parser.parse(testFile2); - //System.out.println("ui " + ui); - //System.out.println("ui1 " + ui1); - System.out.println("UI2 : \n" + ui2); + //System.out.println("UI : \n" + ui); + //System.out.println("UI1 : \n" + ui1); + //System.out.println("UI2 : \n" + ui2); // test si l'element racine est parse assertNotNull(ui.getRoot()); @@ -106,8 +106,17 @@ UIModelChildImpl child1 = (UIModelChildImpl)children1.get(0); Object constraint1 = child1.getConstraint().getValue(); - assertEquals(constraint1, "Center"); + + // test sur le nombre d'enfants d'une Frame est correct + ArrayList children2 = (ArrayList)ui2.getRoot().getChildren(); + assertTrue(children2.size()==1); + + // test sur une contrainte d'un panel genere + UIModelChildImpl child2 = (UIModelChildImpl)children2.get(0); + + Object constraint2 = child2.getConstraint().getValue(); + assertEquals(constraint2, "Center"); } public static Test suite() { Index: lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/test2.javaxml diff -u lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/test2.javaxml:1.1 lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/test2.javaxml:1.2 --- lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/test2.javaxml:1.1 Wed Aug 11 16:26:24 2004 +++ lutingenerator/src/test/org/codelutin/generator/models/ui/javaxml/test2.javaxml Thu Aug 12 08:21:29 2004 @@ -1,501 +1,497 @@ - - - - - - - - - sujetLabel - - - Sujet - - - - - - - 6 - - - sujetEditor - - - - - - - activateLabel - - - Activate - - - - - - - activateEditor - - - - - - - descriptionLabel - - - Description - - - - - - - 6 - - - descriptionEditor - - - - - - - 0 - - + + + + + + + + + + sujetLabel + + + Sujet + - Attributes - 0 - 0 - - - - - - - - - 1 - 1 - 1 - 1 - 1.0 - 1.0 - 10 - 2 - - 0 - 0 - 0 - 0 - - 0 - 0 + + + + + 6 + + + sujetEditor + - - - - 0 - 3 - 1 - 1 - 0.0 - 0.0 - 10 - 1 - - 0 - 0 - 0 - 0 - - 0 - 0 + + + + activateLabel + + + Activate + - - - - 1 - 2 - 1 - 1 - 0.0 - 0.0 - 10 - 1 - - 0 - 0 - 0 + + + + activateEditor + + + + + + + descriptionLabel + + + Description + + + + + + + 6 + + + descriptionEditor + + + + + + 0 + + + Attributes 0 0 + + - - - - 0 - 1 - 1 - 1 - 0.0 - 0.0 - 10 - 1 - + + + + + 1 + 1 + 1 + 1 + 1.0 + 1.0 + 10 + 2 + + 0 + 0 + 0 + 0 + 0 0 + + + + + + 1 + 3 + 1 + 1 + 1.0 + 1.0 + 10 + 2 + + 0 + 0 + 0 + 0 + 0 0 - 0 - 0 - - - - - - 0 - 2 - 1 - 1 - 0.0 - 0.0 - 10 - 1 - + + + + + 0 + 2 + 1 + 1 + 0.0 + 0.0 + 10 + 1 + + 0 + 0 + 0 + 0 + 0 0 + + + + + + 1 + 2 + 1 + 1 + 0.0 + 0.0 + 10 + 1 + + 0 + 0 + 0 + 0 + 0 0 - 0 - 0 - - - - - - 1 - 3 - 1 - 1 - 1.0 - 1.0 - 10 - 2 - + + + + + 0 + 1 + 1 + 1 + 0.0 + 0.0 + 10 + 1 + + 0 + 0 + 0 + 0 + 0 0 + + + + + + 0 + 3 + 1 + 1 + 0.0 + 0.0 + 10 + 1 + + 0 + 0 + 0 + 0 + 0 0 - 0 - 0 + + + + AlarmAttributesPanelPanel + + + + + + + + Save + + + java.awt.event.ActionListener + + on_save + + - - - AlarmAttributesPanelPanel - - - - - - - - Save - - - java.awt.event.ActionListener - - on_save - - - - - - - Cancel - - - java.awt.event.ActionListener - - on_cancel + + + Cancel + + + java.awt.event.ActionListener + + on_cancel + + + + + + + Delete + + + java.awt.event.ActionListener + + on_delete + + + + + + + Search + + + java.awt.event.ActionListener + + on_search + + + + + + + + + 0 + 1 + 1 + 1 + 0.0 + 0.0 + 10 + 2 + + 0 + 0 + 0 + 0 + + 0 + 0 - - - - - Delete - - - java.awt.event.ActionListener - - on_delete + + + + 0 + 2 + 1 + 1 + 0.0 + 0.0 + 10 + 2 + + 0 + 0 + 0 + 0 + + 0 + 0 - - - - - Search - - - java.awt.event.ActionListener - - on_search + + + + 0 + 3 + 1 + 1 + 0.0 + 0.0 + 10 + 2 + + 0 + 0 + 0 + 0 + + 0 + 0 - - - - - - - 0 - 0 - 1 - 1 - 0.0 - 0.0 - 10 - 2 - + + + 0 0 + 1 + 1 + 0.0 + 0.0 + 10 + 2 + + 0 + 0 + 0 + 0 + 0 0 - 0 - 0 + + + + AlarmButtonsPanel + + + + + + + + + AlarmScrollPane + + + + + + + + + + - - - - 0 - 3 - 1 - 1 - 0.0 - 0.0 - 10 - 2 - - 0 - 0 - 0 + + + 0 + + + Table 0 0 + + - - - - 0 - 2 - 1 - 1 - 0.0 - 0.0 - 10 - 2 - + + + + 0 0 + 1 + 1 + 1.0 + 1.0 + 10 + 1 + + 0 + 0 + 0 + 0 + 0 0 - 0 - 0 - + - - - + + AlarmTablePanelPanel + + + + + + + + 0 + 1 + 2 + 1 + 1.0 + 1.0 + 10 + 1 + 0 - 1 - 1 - 1 - 0.0 - 0.0 - 10 - 2 - - 0 - 0 - 0 - 0 - 0 0 - - - - - AlarmButtonsPanel - - - - - - - - - AlarmScrollPane - - - - - - - - - - - - -3 - 0 - - - - - - - - 0 - - - Table 0 0 - - - - - - + + + + 0 + 0 + 1 + 1 + 1.0 + 1.0 + 10 + 1 + 0 0 - 1 - 1 - 1.0 - 1.0 - 10 - 1 - - 0 - 0 - 0 - 0 - 0 0 - - - - AlarmTablePanelPanel - - - - - - - - 0 - 1 - 2 - 1 - 1.0 - 1.0 - 10 - 1 - - 0 - 0 0 0 - 0 - 0 - - - - - - 1 - 0 - 1 - 1 - 1.0 - 1.0 - 10 - 1 - - 0 + + + + + 1 0 + 1 + 1 + 1.0 + 1.0 + 10 + 1 + + 0 + 0 + 0 + 0 + 0 0 - 0 - 0 - + + + AlarmPanel2 + + + + + - - - 0 - 0 - 1 - 1 - 1.0 - 1.0 - 10 - 1 - - 0 - 0 - 0 - 0 - - 0 - 0 - + + Center - - - AlarmPanel0 - - - - - - - - Center - - + + - JPanel1 + JFrame1