Author: konstantin.mishin
Date: 2009-01-13 13:21:41 -0500 (Tue, 13 Jan 2009)
New Revision: 12258
Modified:
trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/SeleniumTestBase.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
Log:
algorithm of search of firefox was fixed
Modified:
trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
---
trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-13
16:59:19 UTC (rev 12257)
+++
trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-13
18:21:41 UTC (rev 12258)
@@ -133,10 +133,11 @@
return result;
}
});
- for (int k = firefoxes.length - 1; browser == null && k >= 0; k--) {
- System.out.println("-------->firefox#" + k + ": " +
firefoxes[k].getPath());
- browser = "*firefox " + firefoxes[k].getPath();
- }
+ if (firefoxes.length > 1 &&
"firefox-bin".equals(firefoxes[1].getName())) {
+ browser = "*firefox " + firefoxes[1].getPath();
+ } else if (firefoxes.length > 0){
+ browser = "*firefox " + firefoxes[0].getPath();
+ }
}
}
}
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-13
16:59:19 UTC (rev 12257)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-13
18:21:41 UTC (rev 12258)
@@ -184,10 +184,11 @@
return result;
}
});
- for (int k = firefoxes.length - 1; browser == null && k >= 0; k--) {
- System.out.println("-------->firefox#" + k + ": " +
firefoxes[k].getPath());
- browser = "*firefox " + firefoxes[k].getPath();
- }
+ if (firefoxes.length > 1 &&
"firefox-bin".equals(firefoxes[1].getName())) {
+ browser = "*firefox " + firefoxes[1].getPath();
+ } else if (firefoxes.length > 0){
+ browser = "*firefox " + firefoxes[0].getPath();
+ }
}
}
}
Show replies by date