# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1381504475 -7200
# Node ID 1e4d1c150ed54703bd2b709986231c92684d2eca
# Parent  380ef624593c35d595a63de343c367cc8e20fb58
Augment unit tests to account for deferred init barriers

diff -r 380ef624593c -r 1e4d1c150ed5 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java	Fri Oct 11 17:14:18 2013 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java	Fri Oct 11 17:14:35 2013 +0200
@@ -73,7 +73,13 @@
      */
     @Test
     public void test1() throws Exception {
-        test("test1Snippet", useG1GC() ? 4 : 2);
+        int expectedBarriers = 0;
+        if (useG1GC()) {
+            expectedBarriers = (useDeferredInitBarriers() ? 0 : 4);
+        } else {
+            expectedBarriers = (useDeferredInitBarriers() ? 0 : 2);
+        }
+        test("test1Snippet", expectedBarriers);
     }
 
     public static void test1Snippet() {
@@ -89,7 +95,13 @@
      */
     @Test
     public void test2() throws Exception {
-        test("test2Snippet", useG1GC() ? 8 : 4);
+        int expectedBarriers = 0;
+        if (useG1GC()) {
+            expectedBarriers = (useDeferredInitBarriers() ? 0 : 8);
+        } else {
+            expectedBarriers = (useDeferredInitBarriers() ? 0 : 4);
+        }
+        test("test2Snippet", expectedBarriers);
     }
 
     public static void test2Snippet(boolean test) {
@@ -135,7 +147,13 @@
      */
     @Test
     public void test4() throws Exception {
-        test("test4Snippet", useG1GC() ? 5 : 2);
+        int expectedBarriers = 0;
+        if (useG1GC()) {
+            expectedBarriers = (useDeferredInitBarriers() ? 1 : 5);
+        } else {
+            expectedBarriers = (useDeferredInitBarriers() ? 0 : 2);
+        }
+        test("test4Snippet", expectedBarriers);
     }
 
     public static Object test4Snippet() {
diff -r 380ef624593c -r 1e4d1c150ed5 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java	Fri Oct 11 17:14:18 2013 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java	Fri Oct 11 17:14:35 2013 +0200
@@ -62,8 +62,7 @@
 
     private static native void safepoint();
 
-    public static void test1Snippet() {
-        Container main = new Container();
+    public static void test1Snippet(Container main) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         barrierIndex = 0;
@@ -86,8 +85,7 @@
         test("test1Snippet", 2, new int[]{2});
     }
 
-    public static void test2Snippet() {
-        Container main = new Container();
+    public static void test2Snippet(Container main) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         barrierIndex = 0;
@@ -109,8 +107,7 @@
         test("test2Snippet", 2, new int[]{2});
     }
 
-    public static void test3Snippet(boolean test) {
-        Container main = new Container();
+    public static void test3Snippet(Container main, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         barrierIndex = 0;
@@ -160,8 +157,7 @@
         test("test3Snippet", 4, new int[]{4});
     }
 
-    public static void test4Snippet(boolean test) {
-        Container main = new Container();
+    public static void test4Snippet(Container main, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         safepoint();
@@ -197,8 +193,7 @@
         test("test4Snippet", 5, new int[]{1});
     }
 
-    public static void test5Snippet() {
-        Container main = new Container();
+    public static void test5Snippet(Container main) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         safepoint();
@@ -253,8 +248,7 @@
         test("test5Snippet", 5, new int[]{4, 5});
     }
 
-    public static void test6Snippet(boolean test) {
-        Container main = new Container();
+    public static void test6Snippet(Container main, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         safepoint();
@@ -294,8 +288,7 @@
         test("test6Snippet", 5, new int[]{4});
     }
 
-    public static void test7Snippet(boolean test) {
-        Container main = new Container();
+    public static void test7Snippet(Container main, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         safepoint();
@@ -330,8 +323,7 @@
         test("test7Snippet", 3, new int[]{1});
     }
 
-    public static void test8Snippet(boolean test) {
-        Container main = new Container();
+    public static void test8Snippet(Container main, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         safepoint();
@@ -359,9 +351,7 @@
         test("test8Snippet", 2, new int[]{1, 2});
     }
 
-    public static void test9Snippet(boolean test) {
-        Container main1 = new Container();
-        Container main2 = new Container();
+    public static void test9Snippet(Container main1, Container main2, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         safepoint();
@@ -409,9 +399,7 @@
         test("test9Snippet", 4, new int[]{3, 4});
     }
 
-    public static void test10Snippet(boolean test) {
-        Container main1 = new Container();
-        Container main2 = new Container();
+    public static void test10Snippet(Container main1, Container main2, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         safepoint();
@@ -471,10 +459,7 @@
         test("test10Snippet", 5, new int[]{3, 4});
     }
 
-    public static void test11Snippet(boolean test) {
-        Container main1 = new Container();
-        Container main2 = new Container();
-        Container main3 = new Container();
+    public static void test11Snippet(Container main1, Container main2, Container main3, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         safepoint();
@@ -561,14 +546,12 @@
         test("test11Snippet", 11, new int[]{5});
     }
 
-    @Test
+    @Test(expected = AssertionError.class)
     public void test56() {
         test("test11Snippet", 11, new int[]{11});
     }
 
-    public static void test12Snippet(boolean test) {
-        Container main = new Container();
-        Container main1 = new Container();
+    public static void test12Snippet(Container main, Container main1, boolean test) {
         Container temp1 = new Container();
         Container temp2 = new Container();
         barrierIndex = 0;
@@ -718,7 +701,7 @@
                      * Catch assertion, test for expected one and re-throw in order to validate unit
                      * test.
                      */
-                    Assert.assertTrue(error.getMessage().equals("Write barrier must be present"));
+                    Assert.assertTrue(error.getMessage().contains("Write barrier must be present"));
                     return error;
                 } finally {
                     Debug.setConfig(config);