Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@harmony.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r996762 - in /harmony/enhanced/java/branches/java6: ./
 classlib/
 classlib/depends/libs/
 classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
 drlvm/ jdktools/
Date: Tue, 14 Sep 2010 05:59:31 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
Message-Id: <20100914055931.82EF223889CB@eris.apache.org>

Author: hindessm
Date: Tue Sep 14 05:59:31 2010
New Revision: 996762

URL: http://svn.apache.org/viewvc?rev=996762&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@996687:

  r996687 | jessewilson | 2010-09-13 21:58:14 +0100 (Mon, 13 Sep 2010) | 3 lines
  
  Populate test byte buffers with garbage data before using them for testing.
  
  This change makes it more likely for the test to catch broken implementations. We had a bug in one of our buffers that wasn't being caught by tests. Adding this ensures it is.


Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:59:31 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-996210,996457,996567
+/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:59:31 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567
+/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567,996687
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:59:31 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java?rev=996762&r1=996761&r2=996762&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java Tue Sep 14 05:59:31 2010
@@ -43,6 +43,7 @@ public class ByteBufferTest extends Abst
 
     protected void setUp() throws Exception {
         buf = ByteBuffer.allocate(10);
+        loadTestData1(buf);
         baseBuf = buf;
     }
 

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:59:31 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567
+/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 05:59:31 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567
+/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147