Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 26447 invoked from network); 11 Aug 2006 23:22:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Aug 2006 23:22:16 -0000 Received: (qmail 11026 invoked by uid 500); 11 Aug 2006 23:22:15 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 10998 invoked by uid 500); 11 Aug 2006 23:22:15 -0000 Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "OJB Developers List" Reply-To: "OJB Developers List" Delivered-To: mailing list ojb-dev@db.apache.org Received: (qmail 10987 invoked by uid 500); 11 Aug 2006 23:22:15 -0000 Received: (qmail 10984 invoked by uid 99); 11 Aug 2006 23:22:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Aug 2006 16:22:15 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Aug 2006 16:22:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 87C521A981A; Fri, 11 Aug 2006 16:21:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r430915 - /db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/cache/ObjectCacheTest.java Date: Fri, 11 Aug 2006 23:21:54 -0000 To: ojb-commits@db.apache.org From: arminw@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060811232154.87C521A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: arminw Date: Fri Aug 11 16:21:53 2006 New Revision: 430915 URL: http://svn.apache.org/viewvc?rev=430915&view=rev Log: minor changes Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/cache/ObjectCacheTest.java Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/cache/ObjectCacheTest.java URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/cache/ObjectCacheTest.java?rev=430915&r1=430914&r2=430915&view=diff ============================================================================== --- db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/cache/ObjectCacheTest.java (original) +++ db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/cache/ObjectCacheTest.java Fri Aug 11 16:21:53 2006 @@ -16,7 +16,6 @@ import org.apache.ojb.broker.query.QueryByIdentity; import org.apache.ojb.broker.sequence.Repository; import org.apache.ojb.broker.util.ClassHelper; -import org.apache.ojb.broker.util.GUID; import org.apache.ojb.junit.OJBTestCase; /** @@ -232,7 +231,7 @@ } finally { - jcd.addAttribute(CacheDistributor.CACHE_EXCLUDES_STRING, old); + if(old != null) jcd.addAttribute(CacheDistributor.CACHE_EXCLUDES_STRING, old); if (broker != null) broker.close(); } } @@ -392,11 +391,9 @@ Object[] pk = new Object[]{new Long(42)}; Identity oid = broker1.serviceIdentity().buildIdentity(Article.class, InterfaceArticle.class, pk); - GUID guid = new GUID(); - Article a1 = (Article) broker1.getObjectByQuery(new QueryByIdentity(oid)); String originalName = a1.getArticleName(); - a1.setArticleName(guid.toString()); + a1.setArticleName("testName"); // start a second transaction PersistenceBroker broker2 = PersistenceBrokerFactory.defaultPersistenceBroker(); @@ -404,7 +401,7 @@ Article a2 = (Article) broker2.getObjectByQuery(new QueryByIdentity(oid)); - assertEquals(guid.toString(), a1.getArticleName()); + assertEquals("testName", a1.getArticleName()); assertEquals(originalName, a2.getArticleName()); assertNotSame(a1, a2); --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org