svn commit: r1461563 - in /syncope/trunk: console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java pom.xml

[il...@apache.org]

Author: ilgrosso
Date: Wed Mar 27 13:14:27 2013
New Revision: 1461563

URL: http://svn.apache.org/r1461563
Log:
[SYNCOPE-137] Fixing Selenium tests

Modified:
    syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
    syncope/trunk/pom.xml

Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java?rev=1461563&r1=1461562&r2=1461563&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java Wed Mar 27 13:14:27 2013
@@ -32,6 +32,7 @@ public class ConnInstanceTestITCase exte
 
         selenium.waitForCondition(
                 "selenium.isElementPresent(\"//form/div[2]/div/div/div[3]/div[2]/span/select\");", "30000");
+        selenium.select("//select[@name='location:dropDownChoiceField']", "value=0");
         selenium.select("//select[@name='connectorName:dropDownChoiceField']", "label=org.connid.bundles.soap");
 
         selenium.click("//div[2]/form/div[2]/ul/li[2]/a/span");
@@ -51,13 +52,13 @@ public class ConnInstanceTestITCase exte
         selenium.click("//div[3]/ul/li[2]/a");
         selenium.click("//tr[4]/td[7]/div/span[9]/a");
 
-        selenium.waitForCondition(""
-                + "selenium.isElementPresent(\"//div[2]/form/div[2]/div/div/div[3]/div[2]/span/select\");", "30000");
+        selenium.waitForCondition(
+                "selenium.isElementPresent(\"//div[2]/form/div[2]/div/div/div[3]/div[2]/span/select\");", "30000");
 
         assertEquals("ConnInstance103", selenium.getAttribute("//input[@name='displayName:textField']/@value"));
 
-        assertEquals("org.connid.bundles.soap", selenium
-                .getSelectedLabel("//select[@name='connectorName:dropDownChoiceField']"));
+        assertEquals("org.connid.bundles.soap",
+                selenium.getSelectedLabel("//select[@name='connectorName:dropDownChoiceField']"));
 
         selenium.click("//div[2]/form/div[2]/ul/li[2]/a/span");
         selenium.click("css=a.w_close");
@@ -74,8 +75,7 @@ public class ConnInstanceTestITCase exte
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
 
-        selenium.waitForCondition("selenium.isTextPresent(" + "\"Error occurred during the requested operation\");",
-                "10000");
+        selenium.waitForCondition("selenium.isTextPresent(\"Error:\");", "10000");
     }
 
     @Test

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1461563&r1=1461562&r2=1461563&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Mar 27 13:14:27 2013
@@ -323,7 +323,7 @@ under the License.
     <jasypt.version>1.9.0</jasypt.version>
  
     <bundles.directory>${project.build.directory}/bundles</bundles.directory>
-    <connid.location>file://${bundles.directory}</connid.location>
+    <connid.location>file:${bundles.directory}/</connid.location>
     <log.directory>${project.build.directory}/log</log.directory>
                 
     <cargo.servlet.port>9080</cargo.servlet.port>