Changeset 316

Timestamp:

02/14/06 15:29:13 (19 years ago)

Author:

boris

Message:

• added test that creates subpackages via the new package wizard

File:

• trunk/org.modelica.mdt.test/src/org/modelica/mdt/test/TestNewPackageWizard.java (modified) (6 diffs)

trunk/org.modelica.mdt.test/src/org/modelica/mdt/test/TestNewPackageWizard.java

@@ -75 +75 @@
     
     private Text packageName;
-//  private Text parentPackage;
+    private Text parentPackage;
     private Text packageDesc;
     private Text sourceFolder;
@@ -131 +131 @@
         packageName = 
             TextTester.getInstrumentedText(NewPackageWizard.PACKAGE_NAME_TAG);
-//      parentPackage = 
-//          TextTester.getInstrumentedText(NewTypePage.PARENT_PACKAGE_TAG);
+        parentPackage = 
+            TextTester.getInstrumentedText(NewTypePage.PARENT_PACKAGE_TAG);
         packageDesc = 
             TextTester.getInstrumentedText(NewPackageWizard.PACKAGE_DESC_TAG);
@@ -195 +195 @@
 // testEncapsulatedCreatePackageWithDesc() tests with creating a subpackage
 // after the main package is created
-//      /*
-//       * test to create a nested package inside pkg1
-//       */
-//      
-//      openWizardAndFetchWidgets();
-//      
-//      String subName = "sub_pkg1";
-//      
-//      /*
-//       * fill in the wizard fields
-//       */
-//      ttester.actionEnterText(packageName, subName);
-//      ttester.actionEnterText(parentPackage, name);
-//
-//      /* wait for the name change to propogate to enable the finish button */
-//      while (!finish.getEnabled()) { Utility.sleep(this, 100); }
-//      Utility.sleep(this, 10000);         // TODO remove me
-//      btester.actionClick(finish);
-//
-//      /* check if the package folder was created */
-//      folder = folder.getFolder(subName);
-//      assertTrue("no package folder was created", folder.exists());
-//
-//      /*
-//       * check that the generated package.mo exists and is sane
-//       */
-//      packageMo = folder.getFile("package.mo");
-//      assertTrue("package.mo was not created", packageMo.exists());
-//      
-//      same = 
-//          Utility.compareContent(packageMo,
-//              "within " + name + ";\n" +
-//              "\n" +
-//              "package " + subName + "\n" +
-//              "\n"+
-//              "end " + name + ";");
-//      assertTrue("unexpected conted created in the package.mo", same);
-//
+        /*
+         * test to create a nested package inside pkg1
+         */
+        
+        openWizardAndFetchWidgets();
+        
+        String subName = "sub_pkg1";
+        
+        /*
+         * fill in the wizard fields
+         */
+        ttester.actionEnterText(packageName, subName);
+        ttester.actionEnterText(parentPackage, name);
+
+        /*
+         * wait tops 5 seconds for the name change to propogate
+         * to enable the finish button 
+         */
+        long waitUntil = System.currentTimeMillis() + 5000;
+        while (!finish.getEnabled() && waitUntil > System.currentTimeMillis())
+        {
+            Utility.sleep(this, 95);
+        }
+        btester.actionClick(finish);
+
+        /* check if the package folder was created */
+        folder = folder.getFolder(subName);
+        assertTrue("no package folder was created", folder.exists());
+
+        /*
+         * check that the generated package.mo exists and is sane
+         */
+        packageMo = folder.getFile("package.mo");
+        assertTrue("package.mo was not created", packageMo.exists());
+        
+        same = 
+            Utility.compareContent(packageMo,
+                "within " + name + ";\n" +
+                "\n" +
+                "package " + subName + "\n" +
+                "\n"+
+                "end " + subName + ";");
+        assertTrue("unexpected conted created in the package.mo", same);
+
     }
     
@@ -272 +278 @@
                 "end " + name + ";");
         assertTrue("unexpected conted created in the package.mo", same);
+        
+        /*
+         * test to create a nested package inside pkg2
+         */
+        
+        openWizardAndFetchWidgets();
+        
+        String subName = "sub_pkg2";
+        description = "a jolly good subpackage";
+        
+        /*
+         * fill in the wizard fields
+         */
+        ttester.actionEnterText(packageName, subName);
+        ttester.actionEnterText(parentPackage, name);
+        ttester.actionEnterText(packageDesc, description);
+
+        /*
+         * wait tops 5 seconds for the name change to propogate
+         * to enable the finish button 
+         */
+        long waitUntil = System.currentTimeMillis() + 5000;
+        while (!finish.getEnabled() && waitUntil > System.currentTimeMillis())
+        {
+            Utility.sleep(this, 95);
+        }
+        btester.actionClick(finish);
+
+        /* check if the package folder was created */
+        folder = folder.getFolder(subName);
+        assertTrue("no package folder was created", folder.exists());
+
+        /*
+         * check that the generated package.mo exists and is sane
+         */
+        packageMo = folder.getFile("package.mo");
+        assertTrue("package.mo was not created", packageMo.exists());
+        
+        same = 
+            Utility.compareContent(packageMo,
+                "within " + name + ";\n" +
+                "\n" +
+                "package " + subName + " \"" + description + "\"" + "\n" +
+                "\n"+
+                "end " + subName + ";");
+        assertTrue("unexpected conted created in the package.mo", same);
     }
     
@@ -310 +362 @@
         assertTrue("unexpected conted created in the package.mo", same);
         
+        /*
+         * test to create a nested package inside pkg3
+         */
+        
+        openWizardAndFetchWidgets();
+        
+        String subName = "sub_pkg3";
+        
+        /*
+         * fill in the wizard fields
+         */
+        ttester.actionEnterText(packageName, subName);
+        ttester.actionEnterText(parentPackage, name);
+        btester.actionClick(isEncapsulated);
+
+        /*
+         * wait tops 5 seconds for the name change to propogate
+         * to enable the finish button 
+         */
+        long waitUntil = System.currentTimeMillis() + 5000;
+        while (!finish.getEnabled() && waitUntil > System.currentTimeMillis())
+        {
+            Utility.sleep(this, 95);
+        }
+        btester.actionClick(finish);
+
+        /* check if the package folder was created */
+        folder = folder.getFolder(subName);
+        assertTrue("no package folder was created", folder.exists());
+
+        /*
+         * check that the generated package.mo exists and is sane
+         */
+        packageMo = folder.getFile("package.mo");
+        assertTrue("package.mo was not created", packageMo.exists());
+        
+        same = 
+            Utility.compareContent(packageMo,
+                "within " + name + ";\n" +
+                "\n" +
+                "encapsulated package " + subName + "\n" +
+                "\n"+
+                "end " + subName + ";");
+        assertTrue("unexpected conted created in the package.mo", same);
     }
     
@@ -351 +447 @@
         assertTrue("unexpected conted created in the package.mo", same);
         
+        /*
+         * test to create a nested package inside pkg4
+         */
+        
+        openWizardAndFetchWidgets();
+        
+        String subName = "sub_pkg4";
+        description = "deutsche, jaaa";
+
+        /*
+         * fill in the wizard fields
+         */
+        ttester.actionEnterText(packageName, subName);
+        ttester.actionEnterText(parentPackage, name);
+        ttester.actionEnterText(packageDesc, description);
+        btester.actionClick(isEncapsulated);
+        
+
+        /*
+         * wait tops 5 seconds for the name change to propogate
+         * to enable the finish button 
+         */
+        long waitUntil = System.currentTimeMillis() + 5000;
+        while (!finish.getEnabled() && waitUntil > System.currentTimeMillis())
+        {
+            Utility.sleep(this, 95);
+        }
+        btester.actionClick(finish);
+
+        /* check if the package folder was created */
+        folder = folder.getFolder(subName);
+        assertTrue("no package folder was created", folder.exists());
+
+        /*
+         * check that the generated package.mo exists and is sane
+         */
+        packageMo = folder.getFile("package.mo");
+        assertTrue("package.mo was not created", packageMo.exists());
+        
+        same = 
+            Utility.compareContent(packageMo,
+                "within " + name + ";\n" +
+                "\n" +
+                "encapsulated package " + subName + " \"" + description + "\"" + "\n" +
+                "\n"+
+                "end " + subName + ";");
+        assertTrue("unexpected conted created in the package.mo", same);
+        
     }
 }