Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 772DFE097 for ; Fri, 1 Feb 2013 12:46:25 +0000 (UTC) Received: (qmail 28930 invoked by uid 500); 1 Feb 2013 12:39:10 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 28807 invoked by uid 500); 1 Feb 2013 12:39:07 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 28712 invoked by uid 99); 1 Feb 2013 12:39:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 12:39:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 12:39:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6BE13238897F; Fri, 1 Feb 2013 12:38:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1441426 - in /syncope/trunk/core/src/test: java/org/apache/syncope/core/persistence/dao/VirAttrTest.java resources/content.xml Date: Fri, 01 Feb 2013 12:38:40 -0000 To: commits@syncope.apache.org From: ashakirin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130201123840.6BE13238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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. - +