You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/09/20 17:33:37 UTC
svn commit: r1388076 - in /incubator/syncope/trunk: ./
core/src/test/java/org/apache/syncope/core/persistence/relationships/AttrTest.java
Author: ilgrosso
Date: Thu Sep 20 15:33:36 2012
New Revision: 1388076
URL: http://svn.apache.org/viewvc?rev=1388076&view=rev
Log:
Merge from branch 1_0_X
Modified:
incubator/syncope/trunk/ (props changed)
incubator/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttrTest.java
Propchange: incubator/syncope/trunk/
------------------------------------------------------------------------------
Merged /incubator/syncope/branches/1_0_X:r1382958-1388075
Modified: incubator/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttrTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttrTest.java?rev=1388076&r1=1388075&r2=1388076&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttrTest.java (original)
+++ incubator/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttrTest.java Thu Sep 20 15:33:36 2012
@@ -123,12 +123,13 @@ public class AttrTest extends AbstractTe
assertEquals(membership.getAttribute(schema.getName()).getValues().size(), 1);
}
+ @Test
public void derAttrFromSpecialAttrs() {
UDerSchema sderived = new UDerSchema();
sderived.setName("sderived");
- sderived.setExpression("username - creationDate[failedLogins]");
+ sderived.setExpression("username + ' - ' + creationDate + '[' + failedLogins + ']'");
- derSchemaDAO.save(sderived);
+ sderived = derSchemaDAO.save(sderived);
derSchemaDAO.flush();
UDerSchema actual = derSchemaDAO.find("sderived", UDerSchema.class);
@@ -152,6 +153,6 @@ public class AttrTest extends AbstractTe
assertNotNull(value);
assertFalse(value.isEmpty());
assertTrue(value.startsWith("user3 - 2010-10-20T11:00:00"));
- assertTrue(value.endsWith("[]"));
+ assertTrue(value.endsWith("[0]"));
}
}