Changeset 291 for trunk/org.modelica.mdt.test/src/org/modelica/mdt/test/TestNewClassWizard.java

Timestamp:

02/05/06 15:03:38 (19 years ago)

Author:

boris

Message:

• moved the modelica project creation code where it belongs IMHO
• wraped the call to modelica project creation operation from new project wizard into IWorkspaceRunnable to improve batching of change events

File:

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

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

@@ -49 +49 @@
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
+import org.modelica.mdt.core.IModelicaProject;
 import org.modelica.mdt.core.ModelicaCore;
 import org.modelica.mdt.test.util.Utility;
@@ -59 +59 @@
 import abbot.tester.swt.TextTester;
 
+import junit.framework.Assert;
 import junit.framework.TestCase;
 
@@ -101 +102 @@
          */
         project = 
-            ModelicaCore.createProject(PROJECT_NAME_1,
-                    PlatformUI.getWorkbench().getActiveWorkbenchWindow());
-        assertNotNull("failed to create project", project);
-        
+            ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME_1);
+        
+        /* create project only if it does not exist yet */
+        if (!project.exists())
+        {
+            IModelicaProject mproj = 
+                ModelicaCore.getModelicaRoot().createProject(PROJECT_NAME_1);
+            Assert.assertNotNull("failed to create project", mproj);
+            
+            project = mproj.getProject();
+        }
+            
         /* 
          * create the selection that points at the root of the created project 
          */
-        fileDestination = 
-            new StructuredSelection(ResourcesPlugin.getWorkspace().getRoot().
-                    getProject(PROJECT_NAME_1));
+        fileDestination = new StructuredSelection(project);
         
         /*
@@ -120 +127 @@
                 
     }
-    
-
     
     public void openWizardAndFetchWidgets()
@@ -161 +166 @@
         assertNotNull("Problems finding classType widget", classType);
         
-        
         /* make some checks on the state of the wizards */
         assertEquals("Wrong source folder selected", 
-                sourceFolder.getText(), PROJECT_NAME_1);        
+                PROJECT_NAME_1, sourceFolder.getText());        
         assertEquals("Junk present in class name field", 
-                className.getText(), "");
+                "", className.getText());
         assertFalse("initial equation unexpectedly selected",
                 initialEquation.getSelection());
@@ -173 +177 @@
         assertFalse("Finish button not disabled", 
                 finish.getEnabled());
-        
-
     }