You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2014/06/19 14:11:05 UTC
svn commit: r1603852 - in /syncope/trunk:
common/src/main/java/org/apache/syncope/common/search/
console/src/main/java/org/apache/syncope/console/pages/panels/
console/src/test/java/org/apache/syncope/console/
Author: andreapatricelli
Date: Thu Jun 19 12:11:05 2014
New Revision: 1603852
URL: http://svn.apache.org/r1603852
Log:
[SYNCOPE-510] Restored resource search for roles
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeFiqlSearchConditionBuilder.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeProperty.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserFiqlSearchConditionBuilder.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserProperty.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeFiqlSearchConditionBuilder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeFiqlSearchConditionBuilder.java?rev=1603852&r1=1603851&r2=1603852&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeFiqlSearchConditionBuilder.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeFiqlSearchConditionBuilder.java Thu Jun 19 12:11:05 2014
@@ -59,6 +59,14 @@ public abstract class SyncopeFiqlSearchC
return newBuilderInstance().is(property).notNullValue();
}
+ public CompleteCondition hasResources(final String resource, final String... moreResources) {
+ return newBuilderInstance().is(SpecialAttr.RESOURCES.toString()).hasResources(resource, moreResources);
+ }
+
+ public CompleteCondition hasNotResources(final String resource, final String... moreResources) {
+ return newBuilderInstance().is(SpecialAttr.RESOURCES.toString()).hasNotResources(resource, moreResources);
+ }
+
protected static class Builder extends FiqlSearchConditionBuilder.Builder
implements SyncopeProperty, CompleteCondition {
@@ -87,5 +95,16 @@ public abstract class SyncopeFiqlSearchC
return condition(FiqlParser.NEQ, SpecialAttr.NULL);
}
+ @Override
+ public CompleteCondition hasResources(final String resource, final String... moreResources) {
+ this.result = SpecialAttr.RESOURCES.toString();
+ return condition(FiqlParser.EQ, resource, (Object[]) moreResources);
+ }
+
+ @Override
+ public CompleteCondition hasNotResources(final String resource, final String... moreResources) {
+ this.result = SpecialAttr.RESOURCES.toString();
+ return condition(FiqlParser.NEQ, resource, (Object[]) moreResources);
+ }
}
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeProperty.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeProperty.java?rev=1603852&r1=1603851&r2=1603852&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeProperty.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/search/SyncopeProperty.java Thu Jun 19 12:11:05 2014
@@ -29,5 +29,9 @@ public abstract interface SyncopePropert
CompleteCondition nullValue();
CompleteCondition notNullValue();
+
+ CompleteCondition hasResources(String resource, String... moreResources);
+
+ CompleteCondition hasNotResources(String resource, String... moreResources);
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserFiqlSearchConditionBuilder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserFiqlSearchConditionBuilder.java?rev=1603852&r1=1603851&r2=1603852&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserFiqlSearchConditionBuilder.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserFiqlSearchConditionBuilder.java Thu Jun 19 12:11:05 2014
@@ -91,19 +91,5 @@ public class UserFiqlSearchConditionBuil
this.result = SpecialAttr.ROLES.toString();
return condition(FiqlParser.NEQ, role, (Object[]) moreRoles);
}
-
- @Override
- public CompleteCondition hasResources(final String resource, final String... moreResources) {
- this.result = SpecialAttr.RESOURCES.toString();
- return condition(FiqlParser.EQ, resource, (Object[]) moreResources);
- }
-
- @Override
- public CompleteCondition hasNotResources(final String resource, final String... moreResources) {
- this.result = SpecialAttr.RESOURCES.toString();
- return condition(FiqlParser.NEQ, resource, (Object[]) moreResources);
- }
-
}
-
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserProperty.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserProperty.java?rev=1603852&r1=1603851&r2=1603852&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserProperty.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/search/UserProperty.java Thu Jun 19 12:11:05 2014
@@ -26,8 +26,4 @@ public interface UserProperty extends Sy
CompleteCondition hasNotRoles(Long role, Long... moreRoles);
- CompleteCondition hasResources(String resource, String... moreResources);
-
- CompleteCondition hasNotResources(String resource, String... moreResources);
-
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java?rev=1603852&r1=1603851&r2=1603852&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java Thu Jun 19 12:11:05 2014
@@ -330,10 +330,8 @@ public abstract class AbstractSearchPane
case RESOURCE:
condition = searchClauses.get(i).getComparator() == SearchClause.Comparator.EQUALS
- ? ((UserFiqlSearchConditionBuilder) builder).
- hasResources(searchClauses.get(i).getProperty())
- : ((UserFiqlSearchConditionBuilder) builder).
- hasNotResources(searchClauses.get(i).getProperty());
+ ? builder.hasResources(searchClauses.get(i).getProperty())
+ : builder.hasNotResources(searchClauses.get(i).getProperty());
break;
case ATTRIBUTE:
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java?rev=1603852&r1=1603851&r2=1603852&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java Thu Jun 19 12:11:05 2014
@@ -176,4 +176,24 @@ public class RoleTestITCase extends Abst
assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
}
+
+ @Test
+ public void issueSYNCOPE510() {
+ selenium.click("css=img[alt=\"Roles\"]");
+
+ selenium.waitForCondition("selenium.isElementPresent(\"link=Search\");", "30000");
+
+ selenium.click("link=Search");
+ selenium.select("//td[2]/select", "label=RESOURCE");
+
+ selenium.waitForCondition("selenium.isElementPresent(\"//td[3]/select[option='ws-target-resource-2']\");",
+ "30000");
+
+ selenium.select("//td[3]/select", "label=ws-target-resource-2");
+ selenium.click("//form/a");
+
+ selenium.waitForCondition(
+ "selenium.isElementPresent(\"//div[3]/div[2]/div[2]/span/div[1]/span[1]/span/form/span/table/tbody/"
+ + "tr/td[3]/div\");", "30000");
+ }
}