Author: jjankovi Date: 2012-03-28 08:22:19 -0400 (Wed, 28 Mar 2012) New Revision: 39877 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java Log: added important method to Seam3TestBase Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-03-28 12:21:10 UTC (rev 39876) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-03-28 12:22:19 UTC (rev 39877) @@ -15,9 +15,9 @@ import java.util.logging.Level; import org.jboss.tools.cdi.bot.test.CDITestBase; +import org.jboss.tools.cdi.seam3.bot.test.Activator; import org.jboss.tools.cdi.seam3.bot.test.CDISeam3AllBotTests; import org.jboss.tools.cdi.seam3.bot.test.util.LibraryHelper; -import org.jboss.tools.cdi.seam3.bot.test.util.ProjectImportHelper; import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibraries; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; @@ -37,9 +37,7 @@ private String packageName = "cdi.seam"; protected final LibraryHelper libraryHelper = new LibraryHelper(); - protected final ProjectImportHelper projectImportHelper = new ProjectImportHelper(); - protected String getProjectName() { return projectName; } @@ -50,14 +48,25 @@ @Override public void prepareWorkspace() { - projectImportHelper.importTestProject("/resources/projects/" + getProjectName(), projectName); + importSeam3TestProject("/resources/projects/" + + getProjectName(), projectName); } + protected void importSeam3TestProject(String projectLocation, String dir) { + projectImportHelper.importTestProject(projectLocation, dir, Activator.PLUGIN_ID); + } + protected void addAndCheckLibraryInProject(String projectName, SeamLibraries library) { addLibraryIntoProject(projectName, library.getName()); checkLibraryInProject(projectName, library.getName()); } + protected void importProjectWithLibrary(String projectName, SeamLibraries library) { + importSeam3TestProject("/resources/projects/" + projectName, projectName); + addAndCheckLibraryInProject(projectName, library); + eclipse.cleanAllProjects(); + } + private void addLibraryIntoProject(String projectName, String libraryName) { try { libraryHelper.addLibraryIntoProject(projectName, libraryName);