syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdisabat...@apache.org
Subject svn commit: r1411194 [3/3] - in /incubator/syncope/trunk: ./ console/ console/src/main/java/org/apache/syncope/console/ console/src/main/java/org/apache/syncope/console/commons/ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/j...
Date Mon, 19 Nov 2012 14:17:42 GMT
Added: incubator/syncope/trunk/console/src/main/webapp/scripts/jquery-1.8.2.min.js
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/webapp/scripts/jquery-1.8.2.min.js?rev=1411194&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/webapp/scripts/jquery-1.8.2.min.js (added)
+++ incubator/syncope/trunk/console/src/main/webapp/scripts/jquery-1.8.2.min.js Mon Nov 19
14:17:33 2012
@@ -0,0 +1,2 @@
+/*! jQuery v1.8.2 jquery.com | jquery.org/license */

[... 3 lines stripped ...]
Propchange: incubator/syncope/trunk/console/src/main/webapp/scripts/jquery-1.8.2.min.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/syncope/trunk/console/src/main/webapp/scripts/jquery-1.8.2.min.js
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/syncope/trunk/console/src/main/webapp/scripts/jquery-1.8.2.min.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
(original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
Mon Nov 19 14:17:33 2012
@@ -45,7 +45,7 @@ public class ConfigurationTestITCase ext
 
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//tr/td[3]/span/span[7]/a");
+        selenium.click("//tr/td[3]/div/span[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='key:textField']\");",
"30000");
 
@@ -106,7 +106,7 @@ public class ConfigurationTestITCase ext
 
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//tr[7]/td[3]/span/span[9]/a");
+        selenium.click("//tr[7]/td[3]/div/span[9]/a");
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the
selected item[\\s\\S]$"));
 

Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
(original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
Mon Nov 19 14:17:33 2012
@@ -78,7 +78,7 @@ public class ConnInstanceTestITCase exte
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
         selenium.click("//div[3]/ul/li[2]/a");
-        selenium.click("//tr[4]/td[6]/span/span[7]/a");
+        selenium.click("//tr[4]/td[6]/div/span[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent(" + "\"//input[@name='version:textField']\");",
"30000");
 
@@ -98,7 +98,7 @@ public class ConnInstanceTestITCase exte
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
         selenium.click("//div[3]/ul/li[2]/a");
-        selenium.click("//tr[4]/td[6]/span/span[9]/a");
+        selenium.click("//tr[4]/td[6]/div/span[9]/a");
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the
selected item[\\s\\S]$"));
 
@@ -113,7 +113,7 @@ public class ConnInstanceTestITCase exte
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
         selenium.click("//div[3]/ul/li[2]/a");
-        selenium.click("//tr[2]/td[6]/span/span[7]/a");
+        selenium.click("//tr[2]/td[6]/div/span[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent(" + "\"//input[@name='version:textField']\");",
"30000");
 

Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
(original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
Mon Nov 19 14:17:33 2012
@@ -27,17 +27,22 @@ public class ReportTestITCase extends Ab
         selenium.click("css=img[alt=\"Reports\"]");
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//table/tbody/tr/td[8]/span/span[7]/a");
+        selenium.click("//table/tbody/tr/td[8]/div/span[7]/a");
         selenium.waitForCondition("selenium.isElementPresent("
-                + "\"//form/div[2]/div/div/span/div/div[5]/div[2]/span/div[2]/div/a\");",
"30000");
+                + "\"//div[2]/form/div[2]/div/div/span/div/div/div/span\");", "30000");
 
-        selenium.click("css=img[alt=\"plus icon\"]");
+        selenium.click("//div[2]/form/div[2]/div/div/span/div/div[5]/div[2]/div/div[2]/div/a");
         selenium.waitForCondition("selenium.isElementPresent("
-                + "\"//form/div[2]/div/div/div[2]/div[2]/span/select\");", "30000");
+                + "\"//div[2]/form/div[2]/div/div/span/div/div[5]/div[2]/div/div/select\");",
"30000");
+
+        selenium.select("//div[2]/form/div[2]/div/div/span/div/div[5]/div[2]/div/div/select",
"testUserReportlet");
+        selenium.click("//div[2]/form/div[2]/div/div/span/div/div[5]/div[2]/div[2]/div[2]/a");
+
+        selenium.waitForCondition("selenium.isElementPresent("
+                + "\"//div[2]/form/div[2]/div/div/div/div/label\");", "30000");
 
         selenium.select("//form/div[2]/div/div/div[2]/div[2]/span/select",
                 "label=org.apache.syncope.client.report.UserReportletConf");
-        selenium.waitForCondition("selenium.isElementPresent(\"//form/div[2]/div[2]/div/span/div/div/span\")",
"30000");
 
         selenium.click("css=a.w_close");
         selenium.click("css=a.w_close");
@@ -49,7 +54,7 @@ public class ReportTestITCase extends Ab
 
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//table/tbody/tr/td[8]/span/span[3]/a");
+        selenium.click("//table/tbody/tr/td[8]/div/span[3]/a");
 
         selenium.waitForCondition("selenium.isTextPresent(\"Operation executed successfully\");",
"30000");
     }

Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
(original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
Mon Nov 19 14:17:33 2012
@@ -42,7 +42,7 @@ public class ResourceTestITCase extends 
 
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//td[4]/span/span[7]/a");
+        selenium.click("//td[4]/div/span[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent("
                 + "\"//form/div[2]/div/span/div/div/div/label[text()='Name']\");", "30000");
@@ -64,7 +64,7 @@ public class ResourceTestITCase extends 
 
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//tr[3]/td[4]/span/span[9]/a");
+        selenium.click("//tr[3]/td[4]/div/span[9]/a");
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the
selected item[\\s\\S]$"));
     }
@@ -75,7 +75,7 @@ public class ResourceTestITCase extends 
 
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//td[4]/span/span[7]/a");
+        selenium.click("//td[4]/div/span[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent("
                 + "\"//form/div[2]/div/span/div/div/div/label[text()='Name']\");", "30000");
@@ -97,7 +97,7 @@ public class ResourceTestITCase extends 
 
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//*[@id=\"users-contain\"]//*[span=\"ws-target-resource-delete\"]/../td[4]/span/span[7]/a");
+        selenium.click("//*[@id=\"users-contain\"]//*[div=\"ws-target-resource-delete\"]/../td[4]/div/span[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent("
                 + "\"//form/div[2]/div/span/div/div/div/label[text()='Name']\");", "30000");

Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
(original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
Mon Nov 19 14:17:33 2012
@@ -88,12 +88,12 @@ public class RoleTestITCase extends Abst
 
         selenium.waitForCondition("selenium.isElementPresent(" + "\"//div[2]/form/div[2]/ul/li[1]/a/span\");",
"30000");
 
-        selenium.click("//div[2]/form/div[2]/ul/li[1]/a/span");
         selenium.click("//div[2]/form/div[2]/ul/li[2]/a/span");
         selenium.click("//div[2]/form/div[2]/ul/li[3]/a/span");
         selenium.click("//div[2]/form/div[2]/ul/li[4]/a/span");
         selenium.click("//div[2]/form/div[2]/ul/li[5]/a/span");
         selenium.click("//div[2]/form/div[2]/ul/li[6]/a/span");
+        selenium.click("//div[2]/form/div[2]/ul/li[7]/a/span");
 
         selenium.click("css=a.w_close");
     }
@@ -111,7 +111,7 @@ public class RoleTestITCase extends Abst
         selenium.click("//div/form/div[2]/ul/li[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent("
-                + "\"//form/div[2]/div/div[7]/span/div/div[2]/div/label\");", "30000");
+                + "\"//form/div[2]/div/div[7]/span/div/div/div/label\");", "30000");
     }
 
     @Test
@@ -122,17 +122,16 @@ public class RoleTestITCase extends Abst
 
         selenium.click("//div[3]/span/div/div/table[2]/tbody/tr/td[3]/table/tbody/tr/td[2]/a");
 
-        selenium.waitForCondition("selenium.isElementPresent(\"//div/form/div[2]/ul/li[7]/a\");",
"30000");
+        selenium.waitForCondition("selenium.isElementPresent(\"//div/form/div[2]/ul/li[7]/a\");",
"50000");
 
         selenium.click("//div/form/div[2]/ul/li[7]/a");
 
         selenium.click("//input[@name=\"userListContainer:search\"]");
 
-        selenium.waitForCondition("selenium.isElementPresent(\"//table/tbody/tr/td[4]/span/span[7]/a\");",
"30000");
-
-        selenium.click("//div[3]/span[2]/span/span/div/form/div"
-                + "[2]/div[2]/div/div/span/div/table/tbody/tr/td[4]/span/span[7]/a");
+        selenium.waitForCondition("selenium.isElementPresent(\"//table/tbody/tr/td[4]/div/span[7]/a\");",
"30000");
 
+        selenium.click("//table/tbody/tr/td[4]/div/span[7]/a");
+        
         selenium.waitForCondition("selenium.isElementPresent("
                 + "\"//form/div[2]/div/span/div/div/div[contains(text(),'Username')]\");",
"30000");
 
@@ -156,8 +155,7 @@ public class RoleTestITCase extends Abst
 
         selenium.waitForCondition("selenium.isElementPresent(\"//span[9]/a\");", "30000");
 
-        selenium.click("//div[3]/span[2]/span/span/div/form/div"
-                + "[2]/div[2]/div/div/span/div/table/tbody/tr[2]/td[4]/span/span[9]/a");
+        selenium.click("//span[9]/a");
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the
selected item[\\s\\S]$"));
     }

Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
(original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
Mon Nov 19 14:17:33 2012
@@ -51,7 +51,7 @@ public class SchemaTestITCase extends Ab
         selenium.click("//div[@id='tabs']/ul/li[3]/a/span");
         selenium.click("//div[@id='membership']/ul/li[3]/a/span");
 
-        selenium.click("//table/tbody/tr/td[3]/span/span[9]/a");
+        selenium.click("//table/tbody/tr/td[3]/div/span[9]/a");
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the
selected item[\\s\\S]$"));
     }

Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
(original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
Mon Nov 19 14:17:33 2012
@@ -29,11 +29,11 @@ public class TaskTestITCase extends Abst
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
         selenium.click("//div[@id='tabs']/ul/li[4]/a");
-        selenium.click("//*[span=1]/../td[9]/span/span[3]/a");
+        selenium.click("//*[div=1]/../td[9]/div/span[3]/a");
 
         selenium.waitForCondition("selenium.isTextPresent(" + "\"Operation executed successfully\");",
"30000");
 
-        selenium.click("//*[span=1]/../td[9]/span/span[7]/a");
+        selenium.click("//*[div=1]/../td[9]/div/span[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent("
                 + "\"//form/div[2]/div/div/span/div/div/div[2]/span/input\");", "30000");
@@ -50,7 +50,7 @@ public class TaskTestITCase extends Abst
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
         selenium.click("//div[@id='tabs']/ul/li[3]/a/span");
-        selenium.click("//table/tbody/tr/td[7]/span/span[9]/a");
+        selenium.click("//table/tbody/tr/td[7]/div/span[9]/a");
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the
selected item[\\s\\S]$"));
 

Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
(original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
Mon Nov 19 14:17:33 2012
@@ -50,7 +50,7 @@ public class UserTestITCase extends Abst
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
         //Edit user3
-        selenium.click("//*[@id=\"users-contain\"]//*[span=3]/../td[4]/span/span[7]/a");
+        selenium.click("//*[@id=\"users-contain\"]//*[div=3]/../td[4]/div/span[7]/a");
 
         selenium.waitForCondition("selenium.isElementPresent(" + "\"//input[@value='testUsername']\");",
"30000");
 
@@ -74,12 +74,13 @@ public class UserTestITCase extends Abst
         selenium.select("//td[3]/select", "label=MEMBERSHIP");
 
         selenium
-                .waitForCondition("selenium.isElementPresent(" + "\"//td[4]/select[option='8
otherchild']\");", "30000");
+                .waitForCondition("selenium.isElementPresent(" + "\"//td[4]/select[option='3
citizen']\");", "30000");
 
-        selenium.select("//td[4]/select", "label=8 otherchild");
+        selenium.select("//td[4]/select", "label=3 citizen");
         selenium.click("name=search");
 
-        selenium.waitForCondition("selenium.isElementPresent(" + "\"//*[@id='users-contain']//*[span=1]\");",
"30000");
+        selenium.waitForCondition(
+                "selenium.isElementPresent(\"//*[@id=\"users-contain\"]//*[div=2]\");", "30000");
     }
 
     @Test
@@ -88,7 +89,7 @@ public class UserTestITCase extends Abst
 
         selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
 
-        selenium.click("//*[@id=\"users-contain\"]//*[span=4]/../td[4]/span/span[9]/a");
+        selenium.click("//*[@id=\"users-contain\"]//*[div=4]/../td[4]/div/span[9]/a");
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the
selected item[\\s\\S]$"));
 

Modified: incubator/syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/pom.xml?rev=1411194&r1=1411193&r2=1411194&view=diff
==============================================================================
--- incubator/syncope/trunk/pom.xml (original)
+++ incubator/syncope/trunk/pom.xml Mon Nov 19 14:17:33 2012
@@ -279,7 +279,7 @@ under the License.
         
     <cocoon.version>3.0.0-alpha-3</cocoon.version>
 
-    <wicket.version>1.5.9</wicket.version>
+    <wicket.version>6.2.0</wicket.version>
 
     <groovy.version>1.6.9</groovy.version>
 
@@ -323,7 +323,7 @@ under the License.
   <dependencyManagement>
 
     <dependencies>
-
+            
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>



Mime
View raw message