[jbosstools-commits] JBoss Tools SVN: r41883 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: decorator and 2 other directories.

[jbosstools-commits at lists.jboss.org]

Author: jjankovi
Date: 2012-06-12 05:47:23 -0400 (Tue, 12 Jun 2012)
New Revision: 41883

Modified:
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java
Log:
cdi bot test refactoring

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java	2012-06-12 09:16:15 UTC (rev 41882)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java	2012-06-12 09:47:23 UTC (rev 41883)
@@ -80,13 +80,19 @@
 		return packageName;
 	}
 	
-	protected void importCDITestProject(String projectName, 
+	protected static void importCDITestProject(String projectName) {
+		String location = "/resources/projects/" + projectName;
+		importCDITestProject(projectName, location, projectName);
+	}
+	
+	protected static void importCDITestProject(String projectName, 
 			String projectLocation, String dir) {
 		
 		ImportHelper.importProject(projectLocation, dir, PluginActivator.PLUGIN_ID);
 				
 		eclipse.addConfiguredRuntimeIntoProject(projectName, 
 				configuredState.getServer().name);
+		eclipse.cleanAllProjects();
 	}
 	
 }
\ No newline at end of file

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java	2012-06-12 09:16:15 UTC (rev 41882)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java	2012-06-12 09:47:23 UTC (rev 41883)
@@ -47,22 +47,19 @@
 	
 	@Before
 	public void prepareWorkspace() {
-		if (!projectHelper.projectExists(getProjectName())) {
-			importCDITestProject(getProjectName(), 
-					"/resources/projects/" + 
-					getProjectName(), getProjectName());
-			eclipse.cleanAllProjects();
-		}
+		
 	}
 	
 	@After
-	public void waitForJobs() {
-		projectExplorer.deleteProject(getProjectName(), true);
+	public void cleanUp() {
+		projectExplorer.deleteAllProjects();
 	}
 	
 	@Test
 	public void testCreatingDecoratorWithMenu() {
 		
+		importCDITestProject(getProjectName());
+		
 		String[] path = (getProjectName() + "/" + CDIConstants.SRC
 				+ "/" + getPackageName()).split("/");
 		
@@ -111,6 +108,8 @@
 	@Test
 	public void testCreatingDecoratorWithWizard() {
 		
+		importCDITestProject(getProjectName());
+		
 		CDIWizardBase decoratorWizard = new NewCDIFileWizard(
 				CDIWizardType.DECORATOR).run();
 		decoratorWizard.setName(ACCOUNT_DECORATOR).

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java	2012-06-12 09:16:15 UTC (rev 41882)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java	2012-06-12 09:47:23 UTC (rev 41883)
@@ -14,7 +14,7 @@
 import org.jboss.tools.cdi.bot.test.CDIConstants;
 import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.uiutils.wizards.AssignableBeansDialog;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class AllAssignableDialogTest extends CDITestBase {
@@ -26,14 +26,9 @@
 		return "CDIAssignableDialogTest";
 	}
 	
-	@Before
-	public void prepareWorkspace() {
-		if (!projectHelper.projectExists(getProjectName())) {
-			importCDITestProject(getProjectName(),
-					"/resources/projects/" + 
-					getProjectName(), getProjectName());
-			eclipse.cleanAllProjects();
-		}
+	@BeforeClass
+	public static void prepareWS() {
+		importCDITestProject("CDIAssignableDialogTest");
 	}
 	
 	@Test

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java	2012-06-12 09:16:15 UTC (rev 41882)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java	2012-06-12 09:47:23 UTC (rev 41883)
@@ -14,7 +14,7 @@
 import org.jboss.tools.cdi.bot.test.CDIConstants;
 import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.uiutils.wizards.AssignableBeansDialog;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class AssignableDialogFilterTest extends CDITestBase {
@@ -26,14 +26,9 @@
 		return "AssignableDialogFilterTest";
 	}
 	
-	@Before
-	public void prepareWorkspace() {
-		if (!projectHelper.projectExists(getProjectName())) {
-			importCDITestProject(getProjectName(),
-					"/resources/projects/" + 
-					getProjectName(), getProjectName());
-			eclipse.cleanAllProjects();
-		}
+	@BeforeClass
+	public static void prepareWS() {
+		importCDITestProject("AssignableDialogFilterTest");
 	}
 	
 	@Test

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java	2012-06-12 09:16:15 UTC (rev 41882)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java	2012-06-12 09:47:23 UTC (rev 41883)
@@ -18,7 +18,7 @@
 import org.jboss.tools.cdi.bot.test.CDIConstants;
 import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.uiutils.wizards.OpenOnOptionsDialog;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class QuickFixProposalsDescriptionTest extends CDITestBase {
@@ -28,14 +28,9 @@
 		return "CDIQuickFixProposals";
 	}
 	
-	@Before
-	public void prepareWorkspace() {
-		if (!projectHelper.projectExists(getProjectName())) {
-			importCDITestProject(getProjectName(),
-					"/resources/projects/" + 
-					getProjectName(), getProjectName());
-			eclipse.cleanAllProjects();
-		}
+	@BeforeClass
+	public static void prepareWS() {
+		importCDITestProject("CDIQuickFixProposals");
 	}
 	
 	@Test