changeset 191:0c2915e2c4e4

Migrate atomicity.primitives.plain.* tests to annotation API.
author shade
date Wed, 13 Aug 2014 01:10:35 +0400
parents de3a9167efde
children 083ada2e421f
files tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomicity-primitive-plain.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomicity-primitive-reflect.xml
diffstat 30 files changed, 124 insertions(+), 874 deletions(-) [+]
line wrap: on
line diff
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class ByteAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
@@ -35,6 +37,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[N]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[A]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class CharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,10 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
+import org.openjdk.jcstress.annotations.Ref;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +39,10 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0.0]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[NaN]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
+@Outcome(              expect = Expect.ACCEPTABLE_SPEC, desc = "Seeing the torn value. This is specifically allowed by JLS. This is not a surprising behavior on some 32-bit systems which do not have full-width 64-bit instructions.")
+@Ref("http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.7")
 @State
 public class DoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0.0]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[NaN]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class FloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class IntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,10 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
+import org.openjdk.jcstress.annotations.Ref;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +39,10 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
+@Outcome(             expect = Expect.ACCEPTABLE_SPEC, desc = "Seeing the torn value. This is specifically allowed by JLS. This is not a surprising behavior on some 32-bit systems which do not have full-width 64-bit instructions.")
+@Ref("http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.7")
 @State
 public class LongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class ShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileByteAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
@@ -35,6 +37,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[N]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[A]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileCharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0.0]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[NaN]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileDoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0.0]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[NaN]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileFloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileIntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileLongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class ByteAtomicityTest  {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[N]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[A]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class CharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,10 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
+import org.openjdk.jcstress.annotations.Ref;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +41,10 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0.0]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[NaN]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
+@Outcome(              expect = Expect.ACCEPTABLE_SPEC, desc = "Seeing the torn value. This is specifically allowed by JLS. This is not a surprising behavior on some 32-bit systems which do not have full-width 64-bit instructions.")
+@Ref("http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.7")
 @State
 public class DoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0.0]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[NaN]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class FloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class IntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,10 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
+import org.openjdk.jcstress.annotations.Ref;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +41,10 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
+@Outcome(             expect = Expect.ACCEPTABLE_SPEC, desc = "Seeing the torn value. This is specifically allowed by JLS. This is not a surprising behavior on some 32-bit systems which do not have full-width 64-bit instructions.")
+@Ref("http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.7")
 @State
 public class LongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class ShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileByteAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[N]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[A]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileCharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0.0]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[NaN]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileDoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -36,6 +38,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0.0]", expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[NaN]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileFloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileIntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileLongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java	Wed Aug 13 00:57:41 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java	Wed Aug 13 01:10:35 2014 +0400
@@ -25,7 +25,9 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Expect;
 import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Outcome;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -38,6 +40,8 @@
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
 @JCStressTest
+@Outcome(id = "[0]",  expect = Expect.ACCEPTABLE, desc = "Default value for the field. Observers are allowed to see the default value for the field, because there is the data race between reader and writer.")
+@Outcome(id = "[-1]", expect = Expect.ACCEPTABLE, desc = "The value set by the actor thread. Observer sees the complete update.")
 @State
 public class VolatileShortAtomicityTest {
 
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomicity-primitive-plain.xml	Wed Aug 13 00:57:41 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,437 +0,0 @@
-<!--
-
-    Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-    This code is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License version 2 only, as
-    published by the Free Software Foundation.  Oracle designates this
-    particular file as subject to the "Classpath" exception as provided
-    by Oracle in the LICENSE file that accompanied this code.
-
-    This code is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    version 2 for more details (a copy is included in the LICENSE file that
-    accompanied this code).
-
-    You should have received a copy of the GNU General Public License version
-    2 along with this work; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-    or visit www.oracle.com if you need additional information or have any
-    questions.
-
--->
-<testsuite>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.ByteAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive bytes experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.VolatileByteAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive bytes experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.CharAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive chars experience non-atomic updates.
-        </description>
-        <case>
-            <match>[N]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[A]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.VolatileCharAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive chars experience non-atomic updates.
-        </description>
-        <case>
-            <match>[N]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[A]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.DoubleAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive doubles experience non-atomic updates.
-        </description>
-        <case>
-            <match>[NaN]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[0.0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>ACCEPTABLE_SPEC</expect>
-            <description>
-                Seeing the torn value. This is specifically allowed by JLS.
-                This is not a surprising behavior on some 32-bit systems which do not have full-width 64-bit instructions.
-            </description>
-            <refs>
-                <url>http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.7</url>
-            </refs>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.VolatileDoubleAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive doubles experience non-atomic updates.
-        </description>
-        <case>
-            <match>[NaN]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[0.0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.FloatAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive floats experience non-atomic updates.
-        </description>
-        <case>
-            <match>[NaN]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[0.0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.VolatileFloatAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive floats experience non-atomic updates.
-        </description>
-        <case>
-            <match>[NaN]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[0.0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.IntAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive ints experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.VolatileIntAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive ints experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.LongAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive longs experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <case>
-            <match>[4294967295]</match>
-            <match>[-4294967296]</match>
-            <expect>ACCEPTABLE_SPEC</expect>
-            <description>
-                Seeing the torn value. This is specifically allowed by JLS.
-                This is not a surprising behavior on some 32-bit systems which do not have full-width 64-bit instructions.
-            </description>
-            <refs>
-                <url>http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.7</url>
-            </refs>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.VolatileLongAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive longs experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.ShortAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive shorts experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.plain.VolatileShortAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive shorts experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-</testsuite>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomicity-primitive-reflect.xml	Wed Aug 13 00:57:41 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,437 +0,0 @@
-<!--
-
-    Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-    This code is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License version 2 only, as
-    published by the Free Software Foundation.  Oracle designates this
-    particular file as subject to the "Classpath" exception as provided
-    by Oracle in the LICENSE file that accompanied this code.
-
-    This code is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    version 2 for more details (a copy is included in the LICENSE file that
-    accompanied this code).
-
-    You should have received a copy of the GNU General Public License version
-    2 along with this work; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-    or visit www.oracle.com if you need additional information or have any
-    questions.
-
--->
-<testsuite>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.ByteAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive bytes experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.VolatileByteAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive bytes experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.CharAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive chars experience non-atomic updates.
-        </description>
-        <case>
-            <match>[N]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[A]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.VolatileCharAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive chars experience non-atomic updates.
-        </description>
-        <case>
-            <match>[N]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[A]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.DoubleAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive doubles experience non-atomic updates.
-        </description>
-        <case>
-            <match>[NaN]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[0.0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>ACCEPTABLE_SPEC</expect>
-            <description>
-                Seeing the torn value. This is specifically allowed by JLS.
-                This is not a surprising behavior on some 32-bit systems which do not have full-width 64-bit instructions.
-            </description>
-            <refs>
-                <url>http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.7</url>
-            </refs>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.VolatileDoubleAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive doubles experience non-atomic updates.
-        </description>
-        <case>
-            <match>[NaN]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[0.0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.FloatAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive floats experience non-atomic updates.
-        </description>
-        <case>
-            <match>[NaN]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[0.0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.VolatileFloatAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive floats experience non-atomic updates.
-        </description>
-        <case>
-            <match>[NaN]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[0.0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.IntAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive ints experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.VolatileIntAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive ints experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.LongAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive longs experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <case>
-            <match>[4294967295]</match>
-            <match>[-4294967296]</match>
-            <expect>ACCEPTABLE_SPEC</expect>
-            <description>
-                Seeing the torn value. This is specifically allowed by JLS.
-                This is not a surprising behavior on some 32-bit systems which do not have full-width 64-bit instructions.
-            </description>
-            <refs>
-                <url>http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.7</url>
-            </refs>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.VolatileLongAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive longs experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.ShortAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive shorts experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-    <test name="org.openjdk.jcstress.tests.atomicity.primitives.reflect.VolatileShortAtomicityTest">
-        <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
-        <description>
-            Tests if primitive shorts experience non-atomic updates.
-        </description>
-        <case>
-            <match>[0]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                Default value for the field. Observers are allowed to see the default value for the field,
-                because there is the data race between reader and writer.
-            </description>
-        </case>
-        <case>
-            <match>[-1]</match>
-            <expect>ACCEPTABLE</expect>
-            <description>
-                The value set by the actor thread. Observer sees the complete update.
-            </description>
-        </case>
-        <unmatched>
-            <expect>FORBIDDEN</expect>
-            <description>
-                This case is not expected.
-            </description>
-        </unmatched>
-    </test>
-
-</testsuite>