svn commit: r1459336 - in /syncope/trunk/console/src: main/java/org/apache/syncope/console/pages/SchemaModalPage.java test/java/org/apache/syncope/console/SchemaTestITCase.java

[ilgrosso]

Author: ilgrosso
Date: Thu Mar 21 14:36:29 2013
New Revision: 1459336

URL: http://svn.apache.org/r1459336
Log:
Fixing errors in Selenium tests

Modified:
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
    
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1459336&r1=1459335&r2=1459336&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
 Thu Mar 21 14:36:29 2013
@@ -131,13 +131,13 @@ public class SchemaModalPage extends Abs
 
         enumerationKeys.setModelObject((Serializable) 
getEnumValuesAsList(schema.getEnumerationKeys()));
 
-        if (schema == null || 
AttributeSchemaType.Enum.equals(schema.getType())) {
-            enumerationValues.setEnabled(Boolean.FALSE);
-            enumerationKeys.setEnabled(Boolean.FALSE);
-        } else {
+        if (AttributeSchemaType.Enum == schema.getType()) {
             enumerationValues.setEnabled(Boolean.TRUE);
             enumerationKeys.setEnabled(Boolean.TRUE);
             enumerationValuesPanel.addRequiredLabel();
+        } else {
+            enumerationValues.setEnabled(Boolean.FALSE);
+            enumerationKeys.setEnabled(Boolean.FALSE);
         }
 
         type.getField().add(new AjaxFormComponentUpdatingBehavior("onchange") {

Modified: 
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java?rev=1459336&r1=1459335&r2=1459336&view=diff
==============================================================================
--- 
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
 (original)
+++ 
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
 Thu Mar 21 14:36:29 2013
@@ -28,8 +28,8 @@ public class SchemaTestITCase extends Ab
 
         
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", 
"30000");
 
-        selenium.click("//div[@id='tabs']/ul/li[2]/a/span");
-        selenium.click("//div[@id='role']/div/a");
+        selenium.click("//div[@id='tabs']/ul/li[3]/a");
+        selenium.click("//div[@id='rschema']/div/div/div/a");
 
         selenium.waitForCondition("selenium.isElementPresent(" + 
"\"//*[@id='_wicket_window_0']\");", "30000");
 
@@ -48,10 +48,7 @@ public class SchemaTestITCase extends Ab
 
         
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", 
"30000");
 
-        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]/div/span[11]/a");
+        
selenium.click("//div[3]/div/div/div/div/div/span/table/tbody/tr/td[7]/div/span[11]/a");
 
         assertTrue(selenium.getConfirmation().matches("^Do you really want to 
delete the selected item[\\s\\S]$"));
     }