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

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Wed Jun 13 04:41:44 EDT 2012


Author: jjankovi
Date: 2012-06-13 04:41:44 -0400 (Wed, 13 Jun 2012)
New Revision: 41922

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/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
   trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java
   trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/SeamLibrary.java
Log:
Support for testing Seam 3.1.0 in seam3 bot tests

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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -12,6 +12,8 @@
 package org.jboss.tools.cdi.seam3.bot.test.base;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.logging.Level;
 
 import org.jboss.tools.cdi.bot.test.CDITestBase;
@@ -59,7 +61,6 @@
 		
 	}
 	
-	
 	/**
 	 * 
 	 * @param projectName
@@ -94,8 +95,7 @@
 	 */
 	protected static void addAndCheckLibraryInProject(String projectName, 
 			SeamLibrary library) {
-		addLibraryIntoProject(projectName, library.getName());
-		checkLibraryInProject(projectName, library.getName());
+		addLibraryIntoProject(projectName, library.getLibrariesNames());
 	}
 	
 	/**
@@ -103,26 +103,21 @@
 	 * @param projectName
 	 * @param libraryName
 	 */
-	private static void addLibraryIntoProject(String projectName, String libraryName) {
+	private static void addLibraryIntoProject(String projectName, Collection<String> libraryName) {
 		try {
-			libraryHelper.addLibraryIntoProject(projectName, libraryName);			
-			LOGGER.info("Library: \"" + libraryName + "\" copied");
-			util.waitForNonIgnoredJobs();
-			libraryHelper.addLibraryToProjectsClassPath(projectName, libraryName);
-			LOGGER.info("Library: \"" + libraryName + "\" on class path of project\"" + projectName + "\"");
+			Iterator<String> iter = libraryName.iterator();
+			while (iter.hasNext()) {
+				String temp = iter.next();
+				libraryHelper.addLibraryIntoProjectFolder(projectName, temp);
+				LOGGER.info("Library: \"" + libraryName + "\" copied");
+				util.waitForNonIgnoredJobs();
+				libraryHelper.addLibraryToProjectsClassPath(projectName, temp);
+				LOGGER.info("Library: \"" + libraryName + "\" on class path of project\"" + projectName + "\"");
+			}
 		} catch (IOException exc) {
 			LOGGER.log(Level.SEVERE, "Error while adding " + libraryName + " library into project");
 			LOGGER.log(Level.SEVERE, exc.getMessage());
 		}		
 	}
 	
-	/**
-	 * 
-	 * @param projectName
-	 * @param 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/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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -37,7 +37,7 @@
 	@Test
 	public void testProperAssign() {
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS);
@@ -53,7 +53,7 @@
 	@Test
 	public void testProperAssignAlternativesDeactive() {
 
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, false, null,
 				"Manager", null, null).finish();
@@ -85,7 +85,7 @@
 	@Test
 	public void testProperUnassign() {
 
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, false, false, null,
 				"Manager", null, null).finish();
@@ -117,7 +117,7 @@
 	@Test
 	public void testProperUnassignAlternativesActive() {
 
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, true, null,
 				"Manager", null, null).finish();

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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -52,7 +52,7 @@
 		String peopleManager = "PeopleManager";
 		String otherManager = "OtherManager";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());

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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -40,7 +40,7 @@
 
 		String projectName = "fullyQualified1";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -57,7 +57,7 @@
 		
 		String projectName = "fullyQualified2";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -83,7 +83,7 @@
 		
 		String projectName = "fullyQualified3";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -104,7 +104,7 @@
 		String projectName = "fullyQualified4";
 		String myBean1 = "MyBean1.java";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), myBean1).toTextEditor());
@@ -129,7 +129,7 @@
 		
 		String projectName = "fullyQualified5";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -166,7 +166,7 @@
 		
 		String projectName = "fullyQualified6";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -222,7 +222,7 @@
 		
 		String projectName = "fullyQualified7";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());

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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -36,7 +36,7 @@
 	
 	@BeforeClass
 	public static void setup() {
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 	}
 	
 	/**

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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -46,7 +46,7 @@
 	@Test
 	public void testNoNamedPackaged() {
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				ORG_JBOSS_PACKAGE, MANAGER_JAVA).toTextEditor());
@@ -61,7 +61,7 @@
 	@Test
 	public void testOneNamedPackage() {
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI, 
 				projectName + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA);
@@ -82,7 +82,7 @@
 	@Test
 	public void testBothNamedPackages() {
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI, 
 				projectName + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA);

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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -36,7 +36,7 @@
 		String manager = "Manager";
 		String projectName = "requires1";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -59,7 +59,7 @@
 		String manager = "Manager";
 		String projectName = "requires2";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -82,7 +82,7 @@
 		String manager = "Manager";
 		String projectName = "requires3";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -106,7 +106,7 @@
 		String manager = "Manager";
 		String projectName = "requires4";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -131,7 +131,7 @@
 		String projectName = "requires5";
 		String eventAttribute = "eventAttribute";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());

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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -30,7 +30,7 @@
 	
 	@BeforeClass
 	public static void setup() {
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 	}
 
 	/**

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-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -36,7 +36,7 @@
 		String otherBean = "OtherBean";
 		String projectName = "veto1";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -59,7 +59,7 @@
 		String otherBean = "OtherBean";
 		String projectName = "veto2";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -81,7 +81,7 @@
 		String vetoBean = "Bean";
 		String projectName = "veto3";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -103,7 +103,7 @@
 		String vetoBean = "Bean";
 		String projectName = "veto4";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());
@@ -126,7 +126,7 @@
 		String projectName = "veto5";
 		String eventAttribute = "eventAttribute";
 		
-		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER);
+		importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3);
 		
 		setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, 
 				getPackageName(), APPLICATION_CLASS).toTextEditor());

Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java	2012-06-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -18,9 +18,7 @@
 import java.nio.channels.FileChannel;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.swtbot.swt.finder.SWTBot;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
 import org.jboss.tools.cdi.bot.test.CDIConstants;
 import org.jboss.tools.cdi.seam3.bot.test.Activator;
@@ -83,7 +81,7 @@
 	 * @param libraryName
 	 * @throws IOException
 	 */
-	public void addLibraryIntoProject(String projectName, String libraryName) throws IOException {
+	public void addLibraryIntoProjectFolder(String projectName, String libraryName) throws IOException {
 		File in = null;
 		FileChannel inChannel = null;
 		FileChannel outChannel = null;
@@ -103,35 +101,4 @@
 		if (outChannel != null) outChannel.close();		 	    	   
 	}
 	
-	/**
-	 * Method checks if library named "libraryName" is set on classpath 
-	 * of project named "projectName"
-	 * @param projectName
-	 * @param libraryName
-	 * @return boolean - represents fact if library is/isn't set on project classpath
-	 */
-	public boolean isLibraryInProjectClassPath(String projectName, String libraryName) {
-		SWTBotTree tree = projectExplorer.bot().tree();
-					
-		ContextMenuHelper.prepareTreeItemForContextMenu(tree);
-	    new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, CDIConstants.PROPERTIES, false)).click();
-	    
-	    SWTBotShell shell = bot.shell("Properties for " + projectName);
-	    SWTBot bot = shell.bot();
-	    	   
-	    bot.tree().expandNode(CDIConstants.JAVA_BUILD_PATH).select();
-	   
-	    bot.tabItem(CDIConstants.LIBRARIES).activate();
-	    	
-	    boolean libraryInProject = false;
-	    for (int i = 0; i < bot.tree(1).rowCount(); i++) {
-	    	if (bot.tree(1).getAllItems()[i].getText().contains(libraryName)) {
-	    		libraryInProject = true;
-	    		break;
-	    	}
-	    }
-	    bot.button(IDELabel.Button.CANCEL).click();	    	    
-	    return libraryInProject;
-	}
-	
 }

Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/SeamLibrary.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/SeamLibrary.java	2012-06-13 08:38:19 UTC (rev 41921)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/SeamLibrary.java	2012-06-13 08:41:44 UTC (rev 41922)
@@ -11,6 +11,9 @@
 
 package org.jboss.tools.cdi.seam3.bot.test.util;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 /**
  * 
  * @author jjankovi
@@ -18,14 +21,27 @@
  */
 public enum SeamLibrary {
 
-	SOLDER, INTERNATIONAL, UNKNOWN;
+	SOLDER_3, SOLDER_3_1, INTERNATIONAL, UNKNOWN;
 	
-	public String getName() {
+	private Collection<String> libraries;
+	
+	public Collection<String> getLibrariesNames() {
 		switch (this) {
-		case SOLDER:
-			return "seam-solder.jar";			
+		case SOLDER_3:
+			libraries = new ArrayList<String>();
+			libraries.add("seam-solder.jar");
+			return libraries;			
 		case INTERNATIONAL:
-			return "seam-international.jar";
+			libraries = new ArrayList<String>();
+			libraries.add("seam-international.jar");
+			return libraries;
+		case SOLDER_3_1:	
+			libraries = new ArrayList<String>();
+			libraries.add("solder-api.jar");
+			libraries.add("solder-impl.jar");
+			libraries.add("solder-logging.jar");
+			libraries.add("solder-tooling.jar");
+			return libraries;
 		case UNKNOWN:
 		default:
 			throw new AssertionError("Unknown libraries");



More information about the jbosstools-commits mailing list