Return-Path: Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: (qmail 85453 invoked from network); 24 Jan 2011 14:31:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Jan 2011 14:31:15 -0000 Received: (qmail 1766 invoked by uid 500); 24 Jan 2011 14:31:13 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 1759 invoked by uid 99); 24 Jan 2011 14:31:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jan 2011 14:31:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 24 Jan 2011 14:31:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1319423889E0; Mon, 24 Jan 2011 14:30:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1062797 - /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java Date: Mon, 24 Jan 2011 14:30:49 -0000 To: commits@lucene.apache.org From: rmuir@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110124143049.1319423889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Mon Jan 24 14:30:48 2011 New Revision: 1062797 URL: http://svn.apache.org/viewvc?rev=1062797&view=rev Log: improve seed compatibility across trunk/3x Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java?rev=1062797&r1=1062796&r2=1062797&view=diff ============================================================================== --- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java (original) +++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java Mon Jan 24 14:30:48 2011 @@ -212,6 +212,12 @@ public abstract class LuceneTestCase ext staticSeed = "random".equals(TEST_SEED) ? seedRand.nextLong() : TwoLongs.fromString(TEST_SEED).l1; random.setSeed(staticSeed); stores = Collections.synchronizedMap(new IdentityHashMap()); + // this code consumes randoms where 4.0's lucenetestcase would: to make seeds work across both branches. + // TODO: doesn't completely work, because what if we get mockrandom codec?! + if (random.nextInt(4) != 0) { + random.nextInt(); // consume RandomCodecProvider's seed. + } + // end compatibility random-consumption savedLocale = Locale.getDefault(); locale = TEST_LOCALE.equals("random") ? randomLocale(random) : localeForName(TEST_LOCALE); Locale.setDefault(locale);