[jbosstools-commits] JBoss Tools SVN: r41887 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test: base and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Jun 12 07:00:35 EDT 2012
Author: jjankovi
Date: 2012-06-12 07:00:35 -0400 (Tue, 12 Jun 2012)
New Revision: 41887
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderTestBase.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java
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/SolderAnnotationTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java
Log:
refactoring of seam3 bot tests
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -38,7 +38,7 @@
VetoAnnotationTest.class,
RequiresAnnotationTest.class,
NamedPackagesTest.class,
- FullyQualifiedTest.class
+ FullyQualifiedTest.class,
})
public class CDISeam3AllBotTests extends AbstractTestSuite {
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-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -39,38 +39,34 @@
*/
public class Seam3TestBase extends CDITestBase {
- private String projectName = "CDISeam3Project";
+ protected static String projectName = "CDISeam3Project";
private String packageName = "cdi.seam";
- protected final LibraryHelper libraryHelper = new LibraryHelper();
+ protected final static LibraryHelper libraryHelper = new LibraryHelper();
- protected String getProjectName() {
- return projectName;
- }
-
- protected String getPackageName() {
+ @Override
+ public String getPackageName() {
return packageName;
}
- protected SeamLibrary getSeamLibrary() {
- return SeamLibrary.UNKNOWN;
- }
-
@Override
public void prepareWorkspace() {
- if (!projectHelper.projectExists(getProjectName())) {
- importSeam3ProjectWithLibrary(getProjectName());
- }
}
+ @Override
+ public void waitForJobs() {
+
+ }
+
+
/**
*
* @param projectName
* @param projectLocation
* @param dir
*/
- protected void importSeam3TestProject(String projectName,
+ protected static void importSeam3TestProject(String projectName,
String projectLocation, String dir) {
ImportHelper.importProject(projectLocation, dir, Activator.PLUGIN_ID);
@@ -81,17 +77,9 @@
/**
*
* @param projectName
- */
- protected void importSeam3ProjectWithLibrary(String projectName) {
- importSeam3ProjectWithLibrary(projectName, getSeamLibrary());
- }
-
- /**
- *
- * @param projectName
* @param library
*/
- protected void importSeam3ProjectWithLibrary(String projectName,
+ protected static void importSeam3ProjectWithLibrary(String projectName,
SeamLibrary library) {
importSeam3TestProject(projectName,
"/resources/projects/" + projectName, projectName);
@@ -104,7 +92,7 @@
* @param projectName
* @param library
*/
- protected void addAndCheckLibraryInProject(String projectName,
+ protected static void addAndCheckLibraryInProject(String projectName,
SeamLibrary library) {
addLibraryIntoProject(projectName, library.getName());
checkLibraryInProject(projectName, library.getName());
@@ -115,7 +103,7 @@
* @param projectName
* @param libraryName
*/
- private void addLibraryIntoProject(String projectName, String libraryName) {
+ private static void addLibraryIntoProject(String projectName, String libraryName) {
try {
libraryHelper.addLibraryIntoProject(projectName, libraryName);
LOGGER.info("Library: \"" + libraryName + "\" copied");
@@ -133,7 +121,7 @@
* @param projectName
* @param libraryName
*/
- private void checkLibraryInProject(String projectName, String libraryName) {
+ private static void checkLibraryInProject(String projectName, String libraryName) {
assertTrue(libraryHelper.isLibraryInProjectClassPath(projectName, libraryName));
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderAnnotationTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderAnnotationTestBase.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderAnnotationTestBase.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -20,7 +20,7 @@
* @author jjankovi
*
*/
-public class SolderAnnotationTestBase extends SolderTestBase {
+public class SolderAnnotationTestBase extends Seam3TestBase {
protected String APPLICATION_CLASS = "Application.java";
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderTestBase.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderTestBase.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010-2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.cdi.seam3.bot.test.base;
-
-import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
-/**
- *
- * @author jjankovi
- *
- */
-public class SolderTestBase extends Seam3TestBase {
-
- @Override
- protected SeamLibrary getSeamLibrary() {
- return SeamLibrary.SOLDER;
- }
-
-}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -16,6 +16,8 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase;
import org.jboss.tools.cdi.seam3.bot.test.uiutils.AssignableBeansDialogExt;
+import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
+import org.junit.After;
import org.junit.Test;
/**
@@ -25,20 +27,19 @@
*/
public class DefaultBeansTest extends SolderAnnotationTestBase {
- @Override
- public String getProjectName() {
- return "defaultBeans";
- }
+ private static String projectName = "defaultBeans";
- @Override
+ @After
public void waitForJobs() {
- projectExplorer.deleteProject(getProjectName(), true);
+ projectExplorer.deleteAllProjects();
}
@Test
public void testProperAssign() {
- packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+
+ packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS);
assertFalse(openOnUtil.openOnByOption("managerImpl", APPLICATION_CLASS, CDIConstants.SHOW_ALL_ASSIGNABLE));
@@ -51,11 +52,13 @@
@Test
public void testProperAssignAlternativesDeactive() {
+
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, false, null,
"Manager", null, null).finish();
- packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS);
assertTrue(openOnUtil.openOnByOption("managerImpl", APPLICATION_CLASS, CDIConstants.SHOW_ALL_ASSIGNABLE));
@@ -81,11 +84,13 @@
@Test
public void testProperUnassign() {
+
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, false, false, null,
"Manager", null, null).finish();
- packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS);
assertTrue(openOnUtil.openOnByOption("managerImpl", APPLICATION_CLASS, CDIConstants.SHOW_ALL_ASSIGNABLE));
@@ -111,11 +116,13 @@
@Test
public void testProperUnassignAlternativesActive() {
+
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, true, null,
"Manager", null, null).finish();
- packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ packageExplorer.openFile(projectName, CDIConstants.SRC,
getPackageName(), APPLICATION_CLASS);
assertTrue(openOnUtil.openOnByOption("managerImpl", APPLICATION_CLASS, CDIConstants.SHOW_ALL_ASSIGNABLE));
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -14,6 +14,7 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase;
import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
+import org.junit.After;
import org.junit.Test;
/**
@@ -26,12 +27,7 @@
private final String EXACT_INTERFACE = "exact-interface";
private final String EXACT_BEANS = "exact-beans";
- @Override
- public void prepareWorkspace() {
-
- }
-
- @Override
+ @After
public void waitForJobs() {
projectExplorer.deleteAllProjects();
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -20,6 +20,7 @@
import org.jboss.tools.cdi.bot.test.uiutils.CollectionsUtil;
import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase;
import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
+import org.junit.After;
import org.junit.Test;
/**
@@ -29,16 +30,11 @@
*/
public class FullyQualifiedTest extends SolderAnnotationTestBase {
- @Override
+ @After
public void waitForJobs() {
projectExplorer.deleteAllProjects();
}
- @Override
- public void prepareWorkspace() {
-
- }
-
@Test
public void testNonNamedBean() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -13,8 +13,10 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.jboss.tools.cdi.bot.test.CDIConstants;
-import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase;
+import org.jboss.tools.cdi.seam3.bot.test.base.Seam3TestBase;
+import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
import org.jboss.tools.ui.bot.ext.Timing;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -24,15 +26,17 @@
*
*/
-public class GenericOpenOnTest extends SolderTestBase {
+public class GenericOpenOnTest extends Seam3TestBase {
private final String GENERIC_POINT_1 = "MyExtendedConfiguration ";
private final String GENERIC_POINT_2 = "MyConfigurationProducer.getOneConfig()";
private final String GENERIC_POINT_3 = "MyConfigurationProducer.getSecondConfig()";
- @Override
- public String getProjectName() {
- return "generic";
+ private static String projectName = "generic";
+
+ @BeforeClass
+ public static void setup() {
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
}
/**
@@ -41,7 +45,7 @@
@Test
public void testGenericOpenOn() {
- packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ packageExplorer.openFile(projectName, CDIConstants.SRC,
"cdi.seam", "MyBeanInjections.java");
checkFirstOpenOnAndGeneric();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -16,7 +16,9 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
import org.jboss.tools.cdi.bot.test.uiutils.CollectionsUtil;
-import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase;
+import org.jboss.tools.cdi.seam3.bot.test.base.Seam3TestBase;
+import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
+import org.junit.After;
import org.junit.Test;
/**
@@ -24,23 +26,19 @@
* @author jjankovi
*
*/
-public class NamedPackagesTest extends SolderTestBase {
+public class NamedPackagesTest extends Seam3TestBase {
private final String CDI_SEAM_PACKAGE = "cdi.seam";
private final String CDI_TEST_PACKAGE = "cdi.test";
private final String ORG_JBOSS_PACKAGE = "org.jboss";
+ private static String projectName = "named";
private final String PACKAGE_INFO_JAVA_CDI = "package-info.java.cdi";
private final String PACKAGE_INFO_JAVA = "package-info.java";
private final String MANAGER_JAVA = "Manager.java";
- @Override
- public String getProjectName() {
- return "named";
- }
-
- @Override
+ @After
public void waitForJobs() {
projectExplorer.deleteAllProjects();
}
@@ -48,7 +46,9 @@
@Test
public void testNoNamedPackaged() {
- setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
ORG_JBOSS_PACKAGE, MANAGER_JAVA).toTextEditor());
List<String> beansProposal = editResourceUtil.getProposalList(
MANAGER_JAVA, "\"#{}\"", 3, 0);
@@ -61,11 +61,13 @@
@Test
public void testOneNamedPackage() {
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+
editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI,
- getProjectName() + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA);
+ projectName + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA);
eclipse.cleanAllProjects();
- setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
ORG_JBOSS_PACKAGE, MANAGER_JAVA).toTextEditor());
List<String> beansProposal = editResourceUtil.getProposalList(
MANAGER_JAVA, "\"#{}\"", 3, 0);
@@ -80,13 +82,15 @@
@Test
public void testBothNamedPackages() {
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+
editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI,
- getProjectName() + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA);
+ projectName + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA);
editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI,
- getProjectName() + "/" + CDIConstants.SRC + "/" + CDI_TEST_PACKAGE, PACKAGE_INFO_JAVA);
+ projectName + "/" + CDIConstants.SRC + "/" + CDI_TEST_PACKAGE, PACKAGE_INFO_JAVA);
eclipse.cleanAllProjects();
- setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
ORG_JBOSS_PACKAGE, MANAGER_JAVA).toTextEditor());
List<String> beansProposal = editResourceUtil.getProposalList(
MANAGER_JAVA, "\"#{}\"", 3, 0);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -14,6 +14,7 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase;
import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
+import org.junit.After;
import org.junit.Test;
/**
@@ -23,16 +24,11 @@
*/
public class RequiresAnnotationTest extends SolderAnnotationTestBase {
- @Override
+ @After
public void waitForJobs() {
projectExplorer.deleteAllProjects();
}
- @Override
- public void prepareWorkspace() {
-
- }
-
@Test
public void testManagedBeans() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -13,7 +13,9 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
-import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase;
+import org.jboss.tools.cdi.seam3.bot.test.base.Seam3TestBase;
+import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -22,11 +24,13 @@
* @author Jaroslav Jankovic
*/
-public class ResourceOpenOnTest extends SolderTestBase {
+public class ResourceOpenOnTest extends Seam3TestBase {
- @Override
- public String getProjectName() {
- return "resource";
+ private static String projectName = "resource";
+
+ @BeforeClass
+ public static void setup() {
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
}
/**
@@ -37,7 +41,7 @@
String className = "MyBean.java";
- packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
+ packageExplorer.openFile(projectName, CDIConstants.SRC,
"cdi.seam", className);
assertTrue(openOnUtil.openOnByOption(CDIConstants.RESOURCE_ANNOTATION,
@@ -48,8 +52,8 @@
destinationFile.equals(CDIConstants.BEANS_XML));
editResourceUtil.moveFileInExplorerBase(packageExplorer, CDIConstants.BEANS_XML,
- getProjectName() + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.WEB_INF,
- getProjectName() + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.META_INF);
+ projectName + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.WEB_INF,
+ projectName + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.META_INF);
LOGGER.info("bean.xml was moved to META-INF");
setEd(bot.swtBotEditorExtByTitle(className));
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java 2012-06-12 10:52:10 UTC (rev 41886)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java 2012-06-12 11:00:35 UTC (rev 41887)
@@ -14,6 +14,7 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase;
import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
+import org.junit.After;
import org.junit.Test;
/**
@@ -23,16 +24,11 @@
*/
public class VetoAnnotationTest extends SolderAnnotationTestBase {
- @Override
+ @After
public void waitForJobs() {
projectExplorer.deleteAllProjects();
}
- @Override
- public void prepareWorkspace() {
-
- }
-
@Test
public void testManagedBeans() {
More information about the jbosstools-commits
mailing list