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

[jbosstools-commits at lists.jboss.org]

Author: jjankovi
Date: 2011-10-28 07:19:44 -0400 (Fri, 28 Oct 2011)
New Revision: 36067

Modified:
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java
Log:
CDI bot tests correction against 5.0.0M4

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java	2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java	2011-10-28 11:19:44 UTC (rev 36067)
@@ -48,7 +48,7 @@
  */
 @RunWith(RequirementAwareSuite.class)
 @SuiteClasses({	
-	CDIPerspectiveTest.class,
+	//CDIPerspectiveTest.class,
 	CDIATWizardTest.class,
 	BeansEditorTest.class,
 	CDIQuickFixTest.class,

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java	2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java	2011-10-28 11:19:44 UTC (rev 36067)
@@ -42,7 +42,7 @@
  */
 @RunWith(RequirementAwareSuite.class)
 @SuiteClasses({
-	CDIPerspectiveTest.class,
+	//CDIPerspectiveTest.class,
 	CDIATWizardTest.class,	
 	})
 public class CDISmokeBotTests extends CDIBase {

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java	2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java	2011-10-28 11:19:44 UTC (rev 36067)
@@ -66,7 +66,7 @@
 	public void waitForJobs() {
 		util.waitForNonIgnoredJobs();
 	}
-		
+	
 	@Test
 	public void testBeanInjectOpenOn() {
 
@@ -103,7 +103,7 @@
 		bot.editorByTitle("beans.xml").show();
 		bot.cTabItem("Source").activate();
 		openOn(PACKAGE_NAME + ".D1", "beans.xml", null);
-		assertTrue("ERROR: redirected to " + getEd(),
+		assertTrue("ERROR: redirected to " + getEd().getTitle(),
 				getEd().getTitle().equals("D1.java"));
 		
 		createComponent(CDICOMPONENT.INTERCEPTOR, "Interceptor1", PACKAGE_NAME,
@@ -132,6 +132,7 @@
 	/*
 	 * https://issues.jboss.org/browse/JBIDE-6251
 	 */
+	
 	@Test
 	public void testDisposerProducerOpenOn() {
 		
@@ -164,10 +165,10 @@
 		setEd(bot.activeEditor().toTextEditor());
 		CDIUtil.replaceInEditor(getEd(), bot, " event", " event");
 		
-		openOn("observerMethod", "MyBean4.java", "Open CDI Events");
+		openOn("observerMethod", "MyBean4.java", "Open CDI Event");
 		assertTrue(getEd().toTextEditor().getSelection().equals("event"));
 		
-		openOn("Event<MyBean4> event", "MyBean3.java", "Open CDI Observer Methods");
+		openOn("Event<MyBean4> event", "MyBean3.java", "Open CDI Observer Method");
 		assertTrue(getEd().toTextEditor().getSelection().equals("observerMethod"));				
 	}
 	

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java	2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java	2011-10-28 11:19:44 UTC (rev 36067)
@@ -152,6 +152,7 @@
 	 * CDI Quick Fix test operates over validation 
 	 * concerning about general Bean component
 	 */
+	
 	@Test
 	public void testBeanQF() {
 		String className = "MyBean";
@@ -655,8 +656,7 @@
 		case SPECIALIZES:
 		case SERIALIZABLE:
 			warningType = ((comp == CDICOMPONENT.BEAN)?true:false);
-			break;
-		case TYPED:
+			break;		
 		case DISPOSES:
 		case OBSERVES:
 		case DECORATOR:
@@ -676,7 +676,10 @@
 			case SERIALIZABLE:
 				problemsContains = "declares a passivating scope SessionScoped";
 				break;
+			case NAMED:
+				problemsContains = "should not have a name";
 			}
+			
 			if (className.equals("BrokenFarm.java")) {
 				problemsContains = "Multiple beans are eligible";
 			}

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java	2011-10-28 01:27:02 UTC (rev 36066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java	2011-10-28 11:19:44 UTC (rev 36067)
@@ -180,7 +180,7 @@
 			}							
 		} else {							
 			getEd().setFocus();	
-			bot.sleep(Timing.time500MS());
+			bot.sleep(Timing.time2S());
 			getEd().pressShortcut(Keystrokes.F3);			
 		}		
 		bot.sleep(Timing.time1S());