changeset 104:9f6496370824

Migrate init.(arrays|objects).* test descriptions to new API.
author shade
date Fri, 14 Mar 2014 01:59:16 +0400
parents da2ebe220a00
children a68df4d2111e
files tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java
diffstat 36 files changed, 493 insertions(+), 759 deletions(-) [+]
line wrap: on
line diff
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,26 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class BooleanArrayInitTest implements Actor2_Test<BooleanArrayInitTest.State, BooleanResult4> {
+@ConcurrencyStressTest
+@State
+public class BooleanArrayInitTest {
 
-    public static class State {
-        boolean[] arr;
+    boolean[] arr;
+
+    @Actor
+    public void actor1(BooleanResult4 r) {
+        arr = new boolean[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, BooleanResult4 r) {
-        s.arr = new boolean[4];
-    }
-
-    @Override
-    public void actor2(State s, BooleanResult4 r) {
-        boolean[] arr = s.arr;
+    @Actor
+    public void actor2(BooleanResult4 r) {
+        boolean[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = false;
         } else {
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public BooleanResult4 newResult() {
-        return new BooleanResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,26 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ByteArrayInitTest implements Actor2_Test<ByteArrayInitTest.State, ByteResult4> {
+@ConcurrencyStressTest
+@State
+public class ByteArrayInitTest {
 
-    public static class State {
-        byte[] arr;
+    byte[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new byte[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, ByteResult4 r) {
-        s.arr = new byte[4];
-    }
-
-    @Override
-    public void actor2(State s, ByteResult4 r) {
-        byte[] arr = s.arr;
+    @Actor
+    public void actor2(ByteResult4 r) {
+        byte[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public ByteResult4 newResult() {
-        return new ByteResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,26 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class CharArrayInitTest implements Actor2_Test<CharArrayInitTest.State, CharResult4> {
+@ConcurrencyStressTest
+@State
+public class CharArrayInitTest {
 
-    public static class State {
-        char[] arr;
+    char[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new char[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, CharResult4 r) {
-        s.arr = new char[4];
-    }
-
-    @Override
-    public void actor2(State s, CharResult4 r) {
-        char[] arr = s.arr;
+    @Actor
+    public void actor2(CharResult4 r) {
+        char[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = 'N';
         } else {
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public CharResult4 newResult() {
-        return new CharResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,26 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class DoubleArrayInitTest implements Actor2_Test<DoubleArrayInitTest.State, DoubleResult4> {
+@ConcurrencyStressTest
+@State
+public class DoubleArrayInitTest {
 
-    public static class State {
-        double[] arr;
+    double[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new double[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, DoubleResult4 r) {
-        s.arr = new double[4];
-    }
-
-    @Override
-    public void actor2(State s, DoubleResult4 r) {
-        double[] arr = s.arr;
+    @Actor
+    public void actor2(DoubleResult4 r) {
+        double[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public DoubleResult4 newResult() {
-        return new DoubleResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,26 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class FloatArrayInitTest implements Actor2_Test<FloatArrayInitTest.State, FloatResult4> {
+@ConcurrencyStressTest
+@State
+public class FloatArrayInitTest {
 
-    public static class State {
-        float[] arr;
+    float[] arr;
+
+    @Actor
+    public void actor1() {
+       arr = new float[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, FloatResult4 r) {
-        s.arr = new float[4];
-    }
-
-    @Override
-    public void actor2(State s, FloatResult4 r) {
-        float[] arr = s.arr;
+    @Actor
+    public void actor2(FloatResult4 r) {
+        float[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public FloatResult4 newResult() {
-        return new FloatResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -25,28 +25,26 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class IntArrayInitTest implements Actor2_Test<IntArrayInitTest.State, IntResult4> {
+@ConcurrencyStressTest
+@State
+public class IntArrayInitTest {
 
-    public static class State {
-        int[] arr;
+    int[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new int[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, IntResult4 r) {
-        s.arr = new int[4];
-    }
-
-    @Override
-    public void actor2(State s, IntResult4 r) {
-        int[] arr = s.arr;
+    @Actor
+    public void actor2(IntResult4 r) {
+        int[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -57,9 +55,4 @@
         }
     }
 
-    @Override
-    public IntResult4 newResult() {
-        return new IntResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,26 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class LongArrayInitTest implements Actor2_Test<LongArrayInitTest.State, LongResult4> {
+@ConcurrencyStressTest
+@State
+public class LongArrayInitTest {
 
-    public static class State {
-        long[] arr;
+    long[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new long[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, LongResult4 r) {
-        s.arr = new long[4];
-    }
-
-    @Override
-    public void actor2(State s, LongResult4 r) {
-        long[] arr = s.arr;
+    @Actor
+    public void actor2(LongResult4 r) {
+        long[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public LongResult4 newResult() {
-        return new LongResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,26 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ObjectArrayInitTest implements Actor2_Test<ObjectArrayInitTest.State, IntResult4> {
+@ConcurrencyStressTest
+@State
+public class ObjectArrayInitTest {
 
-    public static class State {
-        Object[] arr;
+    Object[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new Object[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, IntResult4 r) {
-        s.arr = new Object[4];
-    }
-
-    @Override
-    public void actor2(State s, IntResult4 r) {
-        Object[] arr = s.arr;
+    @Actor
+    public void actor2(IntResult4 r) {
+        Object[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public IntResult4 newResult() {
-        return new IntResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,30 +24,28 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ShortArrayInitTest implements Actor2_Test<ShortArrayInitTest.State, ShortResult4> {
+@ConcurrencyStressTest
+@State
+public class ShortArrayInitTest {
 
-    public static class State {
-        short[] arr;
+    short[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new short[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, ShortResult4 r) {
-        s.arr = new short[4];
-    }
-
-    @Override
-    public void actor2(State s, ShortResult4 r) {
-        short[] arr = s.arr;
+    @Actor
+    public void actor2(ShortResult4 r) {
+        short[] arr = this.arr;
         if (arr == null) {
-            r.r1 = r.r2 = r.r3 = r.r3 = r.r4 = -1;
+            r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
             r.r1 = arr[0];
             r.r2 = arr[1];
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public ShortResult4 newResult() {
-        return new ShortResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,25 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class BooleanArrayInitTest implements Actor2_Test<BooleanArrayInitTest.State, BooleanResult4> {
+@ConcurrencyStressTest
+@State
+public class BooleanArrayInitTest {
 
-    public static class State {
-        volatile boolean[] arr;
+    volatile boolean[] arr;
+
+    @Actor
+    public void actor1(BooleanResult4 r) {
+        arr = new boolean[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, BooleanResult4 r) {
-        s.arr = new boolean[4];
-    }
-
-    @Override
-    public void actor2(State s, BooleanResult4 r) {
-        boolean[] arr = s.arr;
+    @Actor
+    public void actor2(BooleanResult4 r) {
+        boolean[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = false;
         } else {
@@ -56,9 +53,4 @@
         }
     }
 
-    @Override
-    public BooleanResult4 newResult() {
-        return new BooleanResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,25 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ByteArrayInitTest implements Actor2_Test<ByteArrayInitTest.State, ByteResult4> {
+@ConcurrencyStressTest
+@State
+public class ByteArrayInitTest {
 
-    public static class State {
-        volatile byte[] arr;
+    volatile byte[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new byte[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, ByteResult4 r) {
-        s.arr = new byte[4];
-    }
-
-    @Override
-    public void actor2(State s, ByteResult4 r) {
-        byte[] arr = s.arr;
+    @Actor
+    public void actor2(ByteResult4 r) {
+        byte[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +53,4 @@
         }
     }
 
-    @Override
-    public ByteResult4 newResult() {
-        return new ByteResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,25 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class CharArrayInitTest implements Actor2_Test<CharArrayInitTest.State, CharResult4> {
+@ConcurrencyStressTest
+@State
+public class CharArrayInitTest {
 
-    public static class State {
-        volatile char[] arr;
+    volatile char[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new char[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, CharResult4 r) {
-        s.arr = new char[4];
-    }
-
-    @Override
-    public void actor2(State s, CharResult4 r) {
-        char[] arr = s.arr;
+    @Actor
+    public void actor2(CharResult4 r) {
+        char[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = 'N';
         } else {
@@ -56,9 +53,4 @@
         }
     }
 
-    @Override
-    public CharResult4 newResult() {
-        return new CharResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,25 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class DoubleArrayInitTest implements Actor2_Test<DoubleArrayInitTest.State, DoubleResult4> {
+@ConcurrencyStressTest
+@State
+public class DoubleArrayInitTest {
 
-    public static class State {
-        volatile double[] arr;
+    volatile double[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new double[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, DoubleResult4 r) {
-        s.arr = new double[4];
-    }
-
-    @Override
-    public void actor2(State s, DoubleResult4 r) {
-        double[] arr = s.arr;
+    @Actor
+    public void actor2(DoubleResult4 r) {
+        double[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +53,4 @@
         }
     }
 
-    @Override
-    public DoubleResult4 newResult() {
-        return new DoubleResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,25 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class FloatArrayInitTest implements Actor2_Test<FloatArrayInitTest.State, FloatResult4> {
+@ConcurrencyStressTest
+@State
+public class FloatArrayInitTest {
 
-    public static class State {
-        volatile float[] arr;
+    volatile float[] arr;
+
+    @Actor
+    public void actor1() {
+       arr = new float[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, FloatResult4 r) {
-        s.arr = new float[4];
-    }
-
-    @Override
-    public void actor2(State s, FloatResult4 r) {
-        float[] arr = s.arr;
+    @Actor
+    public void actor2(FloatResult4 r) {
+        float[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +53,4 @@
         }
     }
 
-    @Override
-    public FloatResult4 newResult() {
-        return new FloatResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,26 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class IntArrayInitTest implements Actor2_Test<IntArrayInitTest.State, IntResult4> {
+@ConcurrencyStressTest
+@State
+public class IntArrayInitTest {
 
-    public static class State {
-        volatile int[] arr;
+    volatile int[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new int[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, IntResult4 r) {
-        s.arr = new int[4];
-    }
-
-    @Override
-    public void actor2(State s, IntResult4 r) {
-        int[] arr = s.arr;
+    @Actor
+    public void actor2(IntResult4 r) {
+        int[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +54,4 @@
         }
     }
 
-    @Override
-    public IntResult4 newResult() {
-        return new IntResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,25 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class LongArrayInitTest implements Actor2_Test<LongArrayInitTest.State, LongResult4> {
+@ConcurrencyStressTest
+@State
+public class LongArrayInitTest {
 
-    public static class State {
-        volatile long[] arr;
+    volatile long[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new long[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, LongResult4 r) {
-        s.arr = new long[4];
-    }
-
-    @Override
-    public void actor2(State s, LongResult4 r) {
-        long[] arr = s.arr;
+    @Actor
+    public void actor2(LongResult4 r) {
+        long[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +53,4 @@
         }
     }
 
-    @Override
-    public LongResult4 newResult() {
-        return new LongResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,25 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ObjectArrayInitTest implements Actor2_Test<ObjectArrayInitTest.State, IntResult4> {
+@ConcurrencyStressTest
+@State
+public class ObjectArrayInitTest {
 
-    public static class State {
-        volatile Object[] arr;
+    volatile Object[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new Object[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, IntResult4 r) {
-        s.arr = new Object[4];
-    }
-
-    @Override
-    public void actor2(State s, IntResult4 r) {
-        Object[] arr = s.arr;
+    @Actor
+    public void actor2(IntResult4 r) {
+        Object[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +53,4 @@
         }
     }
 
-    @Override
-    public IntResult4 newResult() {
-        return new IntResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,28 +24,25 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ShortArrayInitTest implements Actor2_Test<ShortArrayInitTest.State, ShortResult4> {
+@ConcurrencyStressTest
+@State
+public class ShortArrayInitTest {
 
-    public static class State {
-        volatile short[] arr;
+    volatile short[] arr;
+
+    @Actor
+    public void actor1() {
+        arr = new short[4];
     }
 
-    @Override
-    public State newState() {
-        return new State();
-    }
-
-    @Override
-    public void actor1(State s, ShortResult4 r) {
-        s.arr = new short[4];
-    }
-
-    @Override
-    public void actor2(State s, ShortResult4 r) {
-        short[] arr = s.arr;
+    @Actor
+    public void actor2(ShortResult4 r) {
+        short[] arr = this.arr;
         if (arr == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -56,9 +53,4 @@
         }
     }
 
-    @Override
-    public ShortResult4 newResult() {
-        return new ShortResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,30 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class BooleanFieldsTest implements Actor2_Test<BooleanFieldsTest.State, BooleanResult4> {
+@ConcurrencyStressTest
+@State
+public class BooleanFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         boolean v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, BooleanResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, BooleanResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(BooleanResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = false;
         } else {
@@ -60,9 +58,4 @@
         }
     }
 
-    @Override
-    public BooleanResult4 newResult() {
-        return new BooleanResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,31 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.infra.results.BooleanResult4;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ByteFieldsTest implements Actor2_Test<ByteFieldsTest.State, ByteResult4> {
+@ConcurrencyStressTest
+@State
+public class ByteFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         byte v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, ByteResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, ByteResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(ByteResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +59,5 @@
         }
     }
 
-    @Override
-    public ByteResult4 newResult() {
-        return new ByteResult4();
-    }
+}
 
-}
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,30 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class CharFieldsTest implements Actor2_Test<CharFieldsTest.State, CharResult4> {
+@ConcurrencyStressTest
+@State
+public class CharFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         char v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, CharResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, CharResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(CharResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = 'N';
         } else {
@@ -60,9 +58,4 @@
         }
     }
 
-    @Override
-    public CharResult4 newResult() {
-        return new CharResult4();
-    }
-
-}
+}
\ No newline at end of file
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,30 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class DoubleFieldsTest implements Actor2_Test<DoubleFieldsTest.State, DoubleResult4> {
+@ConcurrencyStressTest
+@State
+public class DoubleFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         double v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, DoubleResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, DoubleResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(DoubleResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +58,4 @@
         }
     }
 
-    @Override
-    public DoubleResult4 newResult() {
-        return new DoubleResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,30 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class FloatFieldsTest implements Actor2_Test<FloatFieldsTest.State, FloatResult4> {
+@ConcurrencyStressTest
+@State
+public class FloatFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         float v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, FloatResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, FloatResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(FloatResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +58,4 @@
         }
     }
 
-    @Override
-    public FloatResult4 newResult() {
-        return new FloatResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,30 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class IntFieldsTest implements Actor2_Test<IntFieldsTest.State, IntResult4> {
+@ConcurrencyStressTest
+@State
+public class IntFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         int v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, IntResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, IntResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(IntResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +58,4 @@
         }
     }
 
-    @Override
-    public IntResult4 newResult() {
-        return new IntResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,30 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class LongFieldsTest implements Actor2_Test<LongFieldsTest.State, LongResult4> {
+@ConcurrencyStressTest
+@State
+public class LongFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         long v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, LongResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, LongResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(LongResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +58,4 @@
         }
     }
 
-    @Override
-    public LongResult4 newResult() {
-        return new LongResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,30 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ObjectFieldsTest implements Actor2_Test<ObjectFieldsTest.State, IntResult4> {
+@ConcurrencyStressTest
+@State
+public class ObjectFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         Object v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, IntResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, IntResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(IntResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +58,4 @@
         }
     }
 
-    @Override
-    public IntResult4 newResult() {
-        return new IntResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,30 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ShortFieldsTest implements Actor2_Test<ShortFieldsTest.State, ShortResult4> {
+@ConcurrencyStressTest
+@State
+public class ShortFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         short v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, ShortResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, ShortResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(ShortResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +58,4 @@
         }
     }
 
-    @Override
-    public ShortResult4 newResult() {
-        return new ShortResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class BooleanFieldsTest implements Actor2_Test<BooleanFieldsTest.State, BooleanResult4> {
+@ConcurrencyStressTest
+@State
+public class BooleanFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile boolean v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, BooleanResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, BooleanResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(BooleanResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = false;
         } else {
@@ -60,9 +57,4 @@
         }
     }
 
-    @Override
-    public BooleanResult4 newResult() {
-        return new BooleanResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ByteFieldsTest implements Actor2_Test<ByteFieldsTest.State, ByteResult4> {
+@ConcurrencyStressTest
+@State
+public class ByteFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile byte v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, ByteResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, ByteResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(ByteResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +57,5 @@
         }
     }
 
-    @Override
-    public ByteResult4 newResult() {
-        return new ByteResult4();
-    }
+}
 
-}
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class CharFieldsTest implements Actor2_Test<CharFieldsTest.State, CharResult4> {
+@ConcurrencyStressTest
+@State
+public class CharFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile char v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, CharResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, CharResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(CharResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = 'N';
         } else {
@@ -60,9 +57,4 @@
         }
     }
 
-    @Override
-    public CharResult4 newResult() {
-        return new CharResult4();
-    }
-
-}
+}
\ No newline at end of file
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class DoubleFieldsTest implements Actor2_Test<DoubleFieldsTest.State, DoubleResult4> {
+@ConcurrencyStressTest
+@State
+public class DoubleFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile double v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, DoubleResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, DoubleResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(DoubleResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +57,4 @@
         }
     }
 
-    @Override
-    public DoubleResult4 newResult() {
-        return new DoubleResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class FloatFieldsTest implements Actor2_Test<FloatFieldsTest.State, FloatResult4> {
+@ConcurrencyStressTest
+@State
+public class FloatFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile float v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, FloatResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, FloatResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(FloatResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +57,4 @@
         }
     }
 
-    @Override
-    public FloatResult4 newResult() {
-        return new FloatResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class IntFieldsTest implements Actor2_Test<IntFieldsTest.State, IntResult4> {
+@ConcurrencyStressTest
+@State
+public class IntFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile int v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, IntResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, IntResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(IntResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +57,4 @@
         }
     }
 
-    @Override
-    public IntResult4 newResult() {
-        return new IntResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class LongFieldsTest implements Actor2_Test<LongFieldsTest.State, LongResult4> {
+@ConcurrencyStressTest
+@State
+public class LongFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile long v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, LongResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, LongResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(LongResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +57,4 @@
         }
     }
 
-    @Override
-    public LongResult4 newResult() {
-        return new LongResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ObjectFieldsTest implements Actor2_Test<ObjectFieldsTest.State, IntResult4> {
+@ConcurrencyStressTest
+@State
+public class ObjectFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile Object v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, IntResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, IntResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(IntResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +57,4 @@
         }
     }
 
-    @Override
-    public IntResult4 newResult() {
-        return new IntResult4();
-    }
-
 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java	Fri Mar 14 01:35:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java	Fri Mar 14 01:59:16 2014 +0400
@@ -24,32 +24,29 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
-public class ShortFieldsTest implements Actor2_Test<ShortFieldsTest.State, ShortResult4> {
+@ConcurrencyStressTest
+@State
+public class ShortFieldsTest {
 
-    public static class State {
-        Data data;
-    }
+    Data data;
 
     public static class Data {
         volatile short v0, v1, v2, v3;
     }
 
-    @Override
-    public State newState() {
-        return new State();
+    @Actor
+    public void actor1() {
+        data = new Data();
     }
 
-    @Override
-    public void actor1(State s, ShortResult4 r) {
-        s.data = new Data();
-    }
-
-    @Override
-    public void actor2(State s, ShortResult4 r) {
-        Data d = s.data;
+    @Actor
+    public void actor2(ShortResult4 r) {
+        Data d = this.data;
         if (d == null) {
             r.r1 = r.r2 = r.r3 = r.r4 = -1;
         } else {
@@ -60,9 +57,4 @@
         }
     }
 
-    @Override
-    public ShortResult4 newResult() {
-        return new ShortResult4();
-    }
-
 }