Author: jjankovi Date: 2012-04-24 04:55:58 -0400 (Tue, 24 Apr 2012) New Revision: 40441 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: fixing importing test project 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-04-24 08:35:56 UTC (rev 40440) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-04-24 08:55:58 UTC (rev 40441) @@ -80,11 +80,14 @@ return packageName; } - protected void importCDITestProject(String projectLocation, String dir) { + protected void importCDITestProject(String projectName, + String projectLocation, String dir) { + ImportHelper.importProject(projectLocation, dir, PluginActivator.PLUGIN_ID); + /** configure JDK and required runtime */ - projectHelper.addDefaultJDKIntoProject(getProjectName()); - projectHelper.addConfiguredRuntimeIntoProject(getProjectName(), + projectHelper.addDefaultJDKIntoProject(projectName); + projectHelper.addConfiguredRuntimeIntoProject(projectName, configuredState.getServer().name); } 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-04-24 08:35:56 UTC (rev 40440) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java 2012-04-24 08:55:58 UTC (rev 40441) @@ -48,7 +48,8 @@ @Before public void prepareWorkspace() { if (!projectHelper.projectExists(getProjectName())) { - importCDITestProject("/resources/projects/" + + importCDITestProject(getProjectName(), + "/resources/projects/" + getProjectName(), getProjectName()); eclipse.cleanAllProjects(); } 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-04-24 08:35:56 UTC (rev 40440) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-04-24 08:55:58 UTC (rev 40441) @@ -29,7 +29,8 @@ @Before public void prepareWorkspace() { if (!projectHelper.projectExists(getProjectName())) { - importCDITestProject("/resources/projects/" + + importCDITestProject(getProjectName(), + "/resources/projects/" + getProjectName(), getProjectName()); eclipse.cleanAllProjects(); } 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-04-24 08:35:56 UTC (rev 40440) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java 2012-04-24 08:55:58 UTC (rev 40441) @@ -29,7 +29,8 @@ @Before public void prepareWorkspace() { if (!projectHelper.projectExists(getProjectName())) { - importCDITestProject("/resources/projects/" + + importCDITestProject(getProjectName(), + "/resources/projects/" + getProjectName(), getProjectName()); eclipse.cleanAllProjects(); } 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-04-24 08:35:56 UTC (rev 40440) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java 2012-04-24 08:55:58 UTC (rev 40441) @@ -31,7 +31,8 @@ @Before public void prepareWorkspace() { if (!projectHelper.projectExists(getProjectName())) { - importCDITestProject("/resources/projects/" + + importCDITestProject(getProjectName(), + "/resources/projects/" + getProjectName(), getProjectName()); eclipse.cleanAllProjects(); }