Run CorrectnessTestCase in nonstrict mode

* the test was not running in nonstrict-read-write mode but in read-write mode instead * for collections, we have to fallback to read-write mode * there are expected failures in nonstrict mode, as the test does not allow stale reads (adding a switch to handle these is TODO)

Author: rvansa

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/CorrectnessTestCase.java

@@ -273,9 +273,7 @@ public static Class[] getAnnotatedClasses() {
  return new Class[] {Family.class, Person.class, Address.class};
  }
 
- private static Metadata buildMetadata(StandardServiceRegistry registry) {
- final String cacheStrategy = "transactional";
-
+ private Metadata buildMetadata(StandardServiceRegistry registry) {
  MetadataSources metadataSources = new MetadataSources( registry );
  for ( Class entityClass : getAnnotatedClasses() ) {
  metadataSources.addAnnotatedClass( entityClass );
@@ -285,12 +283,15 @@ private static Metadata buildMetadata(StandardServiceRegistry registry) {
 
  for ( PersistentClass entityBinding : metadata.getEntityBindings() ) {
  if (!entityBinding.isInherited()) {
- ( (RootClass) entityBinding ).setCacheConcurrencyStrategy( cacheStrategy);
+ ( (RootClass) entityBinding ).setCacheConcurrencyStrategy( accessType.getExternalName() );
  }
  }
 
+ // Collections don't have integrated version, these piggyback on parent's owner version (for DB).
+ // However, this version number isn't extractable and is not passed to cache methods.
+ AccessType collectionAccessType = accessType == AccessType.NONSTRICT_READ_WRITE ? AccessType.READ_WRITE : accessType;
  for ( Collection collectionBinding : metadata.getCollectionBindings() ) {
- collectionBinding.setCacheConcurrencyStrategy( cacheStrategy );
+ collectionBinding.setCacheConcurrencyStrategy( collectionAccessType.getExternalName() );
  }
 
  return metadata;
@@ -410,7 +411,7 @@ public void test() throws Exception {
  }));
  }
  }
- Exception failure = exceptions.poll(EXECUTION_TIME, TimeUnit.SECONDS);
+ Exception failure = exceptions.poll(EXECUTION_TIME, TimeUnit.MILLISECONDS);
  if (failure != null) exceptions.addFirst(failure);
  running = false;
  exec.shutdown();

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/entities/Address.java

@@ -11,6 +11,8 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import javax.persistence.Version;
+
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -28,6 +30,7 @@ public final class Address {
  private String zipCode;
  @OneToMany
  private Set<Person> inhabitants;
+ @Version
  private int version;
 
  public Address(int streetNumber, String streetName, String cityName, String countryName) {

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/entities/Person.java

@@ -11,6 +11,8 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
 import java.util.Date;
 
 @Entity
@@ -26,6 +28,7 @@ public class Person {
  @ManyToOne
  private Address address;
  private boolean checked;
+ @Version
  private int version;
 
  public Person(String firstName, Family family) {