svn commit: r1441426 - in /syncope/trunk/core/src/test: java/org/apache/syncope/core/persistence/dao/VirAttrTest.java resources/content.xml

[ashakirin]

Author: ashakirin
Date: Fri Feb  1 12:38:39 2013
New Revision: 1441426

URL: http://svn.apache.org/viewvc?rev=1441426&view=rev
Log:
[SYNCOPE-298] Workaround for Id conflicts in integration tests

Modified:
    
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/VirAttrTest.java
    syncope/trunk/core/src/test/resources/content.xml

Modified: 
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/VirAttrTest.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/VirAttrTest.java?rev=1441426&r1=1441425&r2=1441426&view=diff
==============================================================================
--- 
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/VirAttrTest.java
 (original)
+++ 
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/VirAttrTest.java
 Fri Feb  1 12:38:39 2013
@@ -63,7 +63,7 @@ public class VirAttrTest extends Abstrac
 
     @Test
     public void findById() {
-        UVirAttr attribute = virAttrDAO.find(100L, UVirAttr.class);
+        UVirAttr attribute = virAttrDAO.find(1000L, UVirAttr.class);
         assertNotNull("did not find expected attribute schema", attribute);
     }
 
@@ -128,12 +128,12 @@ public class VirAttrTest extends Abstrac
 
     @Test
     public void delete() {
-        UVirAttr attribute = virAttrDAO.find(100L, UVirAttr.class);
+        UVirAttr attribute = virAttrDAO.find(1000L, UVirAttr.class);
         String attributeSchemaName = attribute.getVirtualSchema().getName();
 
         virAttrDAO.delete(attribute.getId(), UVirAttr.class);
 
-        UVirAttr actual = virAttrDAO.find(100L, UVirAttr.class);
+        UVirAttr actual = virAttrDAO.find(1000L, UVirAttr.class);
         assertNull("delete did not work", actual);
 
         UVirSchema attributeSchema = virSchemaDAO.find(attributeSchemaName, 
UVirSchema.class);

Modified: syncope/trunk/core/src/test/resources/content.xml
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1441426&r1=1441425&r2=1441426&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Fri Feb  1 12:38:39 2013
@@ -232,7 +232,7 @@ under the License.
   <MDerSchema name="mderToBePropagated" expression="mderived_sx + '-' + 
mderived_dx"/>
 
   <UVirSchema name="virtualdata"/>
-  <UVirAttr id="100" virtualSchema_name="virtualdata" owner_id="3"/>
+  <UVirAttr id="1000" virtualSchema_name="virtualdata" owner_id="3"/>
 
   <UDerSchema name="cn" expression="surname + ', ' + firstname"/>
   <UDerAttr id="100" derivedSchema_name="cn" owner_id="3"/>