You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/07/15 22:49:20 UTC

svn commit: r794412 - /openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java

Author: dwoods
Date: Wed Jul 15 20:49:20 2009
New Revision: 794412

URL: http://svn.apache.org/viewvc?rev=794412&view=rev
Log:
OPENJPA-1177 Preparing for upgrade to newer JSR-303 1.0.CR3 spec level with some extra tracing, as checkCVE() is going to be broken.

Modified:
    openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java

Modified: openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java?rev=794412&r1=794411&r2=794412&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java (original)
+++ openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java Wed Jul 15 20:49:20 2009
@@ -295,6 +295,7 @@
                 "default-validation-group",
                 "org/apache/openjpa/integration/validation/persistence.xml");
         assertNotNull(emf);
+        getLog(emf).trace("verifyDefaultValidationGroup(" + flush + ")");
         // create EM
         OpenJPAEntityManager em = emf.createEntityManager();
         assertNotNull(em);
@@ -373,6 +374,7 @@
                 "non-default-validation-group",
                 "org/apache/openjpa/integration/validation/persistence.xml");
         assertNotNull(emf);
+        getLog(emf).trace("verifyNonDefaultValidationGroup(" + flush + ")");
         // create EM
         OpenJPAEntityManager em = emf.createEntityManager();
         assertNotNull(em);
@@ -499,6 +501,7 @@
                 "default-validation-group",
                 "org/apache/openjpa/integration/validation/persistence.xml");
         assertNotNull(emf);
+        getLog(emf).trace("verifyDefaultPreRemove(" + flush + ")");
         // create EM
         OpenJPAEntityManager em = emf.createEntityManager();
         assertNotNull(em);
@@ -551,6 +554,7 @@
                 "pre-remove-default-validation-group",
                 "org/apache/openjpa/integration/validation/persistence.xml");
         assertNotNull(emf);
+        getLog(emf).trace("verifySpecifiedDefaultPreRemove(" + flush + ")");
         // create EM
         OpenJPAEntityManager em = emf.createEntityManager();
         assertNotNull(em);
@@ -608,14 +612,16 @@
             ConstraintViolation<?> v = (ConstraintViolation<?>)i.next();
             boolean found = false;
             for (String vio : vioProperties) {
-                if (v.getPropertyPath().equals(vio)) {
+                // TODO - getPropertyPath() will return a Path in future APIs
+                if (v.getPropertyPath().compareTo(vio) == 0) {
                     found = true;
                     break;
                 }
             }
-            if (!found)
+            if (!found) {
                 fail("Unexpected ConstraintViolation for: " + 
                     v.getPropertyPath());
+            }
         }
     }
 
@@ -631,7 +637,7 @@
     /**
      * Internal convenience method for getting the OpenJPA logger
      * 
-     * @return
+     * @return Log
      */
     private Log getLog(OpenJPAEntityManagerFactorySPI emf) {
         return emf.getConfiguration().getLog("Tests");