[jbosstools-commits] JBoss Tools SVN: r41257 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.
Author: ldimaggio
Date: 2012-05-22 12:59:09 -0400 (Tue, 22 May 2012)
New Revision: 41257
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
Log:
Removed commented out/unused code in examples/ESBExampleTest.java
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
===================================================================
---
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-22
15:27:09 UTC (rev 41256)
+++
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-22
16:59:09 UTC (rev 41257)
@@ -97,33 +97,6 @@
eclipse.runTreeItemAsJavaApplication(jmsCall);
bot.sleep(Timing.time5S());
util.waitForNonIgnoredJobs();
-
- // New - the consoles fail to switch....sometimes
- boolean consoleSwitched = false;
- int switchLimit = 30;
- int switchCounter = 0;
- consoleSwitched = console.switchConsole(configuredState.getServer().name);
- while (!consoleSwitched) {
- consoleSwitched = console.switchConsole(configuredState.getServer().name);
- bot.sleep(Timing.time10S());
- log.error("Console did not switch - retrying.");
- if (switchCounter++ > switchLimit) {
- break;
- }
- }
- //console.switchConsole(configuredState.getServer().name);
-
-// //String text2 = console.getConsoleText(TIME_5S, TIME_20S, false);
-// String text2 = console.getConsoleText(TIME_5S, TIME_30S, false); /*
https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */
-// log.info("text2 = " + text2);
-// //console.clearConsole();
-//
-// if (text2.length() == 0) {
-// return null;
-// }
-// else {
-// return text2;
-// }
String returnString = consoleWaiting();
return returnString;
}
@@ -152,39 +125,6 @@
protected String executeClientGetServerOutput(String className, String arguments) {
String text = console.getConsoleText();
eclipse.runJavaApplication(getExampleClientProjectName(), className, arguments);
-// console.switchConsole(configuredState.getServer().name);
-// String text2 = console.getConsoleText(TIME_5S, TIME_30S, false);
-// if (text.length()>=text2.length()) {
-// return null;
-// }
-// return text2.substring(text.length());
-
-// // New - the consoles fail to switch....sometimes
-// boolean consoleSwitched = false;
-// int switchLimit = 30;
-// int switchCounter = 0;
-// consoleSwitched = console.switchConsole(configuredState.getServer().name);
-// while (!consoleSwitched) {
-// consoleSwitched = console.switchConsole(configuredState.getServer().name);
-// bot.sleep(Timing.time10S());
-// log.error("Console did not switch - retrying.");
-// if (switchCounter++ > switchLimit) {
-// break;
-// }
-// }
-// //console.switchConsole(configuredState.getServer().name);
-//
-// //String text2 = console.getConsoleText(TIME_5S, TIME_20S, false);
-// String text2 = console.getConsoleText(TIME_5S, TIME_30S, false); /*
https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */
-// log.info("text2 = " + text2);
-// //console.clearConsole();
-//
-// if (text2.length() == 0) {
-// return null;
-// }
-// else {
-// return text2;
-// }
String returnString = consoleWaiting();
return returnString;
}
@@ -205,7 +145,6 @@
}
}
//console.switchConsole(configuredState.getServer().name);
-
//String text2 = console.getConsoleText(TIME_5S, TIME_20S, false);
String text2 = console.getConsoleText(TIME_5S, TIME_30S, false); /*
https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */
log.info("text2 = " + text2);