Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-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 BD551108C0 for ; Mon, 4 Nov 2013 11:58:51 +0000 (UTC) Received: (qmail 74580 invoked by uid 500); 4 Nov 2013 11:58:51 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 74545 invoked by uid 500); 4 Nov 2013 11:58:50 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 74537 invoked by uid 99); 4 Nov 2013 11:58:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Nov 2013 11:58:50 +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; Mon, 04 Nov 2013 11:58:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 14F6F2388A56; Mon, 4 Nov 2013 11:58:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1538569 - /sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java Date: Mon, 04 Nov 2013 11:58:27 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131104115827.14F6F2388A56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Mon Nov 4 11:58:26 2013 New Revision: 1538569 URL: http://svn.apache.org/r1538569 Log: add uniqueName utility Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java?rev=1538569&r1=1538568&r2=1538569&view=diff ============================================================================== --- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java (original) +++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java Mon Nov 4 11:58:26 2013 @@ -57,7 +57,6 @@ import org.slf4j.LoggerFactory; public abstract class CommonTests { private final Logger log = LoggerFactory.getLogger(getClass()); - private final AtomicInteger counter = new AtomicInteger(); @Inject protected SlingRepository repository; @@ -70,6 +69,7 @@ public abstract class CommonTests { protected abstract void doCheckRepositoryDescriptors(); private final List toDelete = new LinkedList(); + private final AtomicInteger uniqueNameCounter = new AtomicInteger(); private ItemType deleteAfterTests(ItemType it) throws RepositoryException { toDelete.add(it.getPath()); @@ -83,7 +83,7 @@ public abstract class CommonTests { Session s = repository.loginAdministrative(null); try { final Node root = s.getRootNode(); - final String name = "TEST_" + counter.incrementAndGet() + "_" + System.currentTimeMillis(); + final String name = uniqueName("assertCreateRetrieveNode"); final String propName = "PN_" + name; final String propValue = "PV_" + name; final Node child = nodeType == null ? root.addNode(name) : root.addNode(name, nodeType); @@ -100,6 +100,10 @@ public abstract class CommonTests { s.logout(); } } + + protected String uniqueName(String hint) { + return hint + "_" + uniqueNameCounter.incrementAndGet() + "_" + System.currentTimeMillis(); + } @After public void deleteTestItems() throws RepositoryException { @@ -287,7 +291,7 @@ public abstract class CommonTests { final Session s = repository.loginAdministrative(null); final int nPaths = 500; final int timeoutMsec = 5000; - final String prefix = "testOsgiResourceEvents_" + counter.incrementAndGet() + "_" + System.currentTimeMillis(); + final String prefix = uniqueName("testOsgiResourceEvents"); try { for(int i=0; i < nPaths; i++) {