Author: dwoods
Date: Mon Jul 6 19:59:04 2009
New Revision: 791594
URL: http://svn.apache.org/viewvc?rev=791594&view=rev
Log:
OPENJPA-1157 Integration tests for Bean Validation providers - Part 2. Added
@Min and @Max constraint tests.
Added:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java
(with props)
Modified:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
Modified:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java?rev=791594&r1=791593&r2=791594&view=diff
==============================================================================
---
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java
(original)
+++
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java
Mon Jul 6 19:59:04 2009
@@ -20,7 +20,6 @@
import java.io.Serializable;
import java.math.BigDecimal;
-//import java.math.BigDecimal;
import javax.persistence.Basic;
import javax.persistence.Entity;
Added:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java?rev=791594&view=auto
==============================================================================
---
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java
(added)
+++
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java
Mon Jul 6 19:59:04 2009
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.integration.validation;
+
+import java.io.Serializable;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+
+...@namedqueries( {
+ @NamedQuery(name="FindFirst",
+ query="select c from VNUMBER c where c.id = 1"),
+ @NamedQuery(name="FindAll", query="select c from VNUMBER c")
+})
+
+...@entity(name = "VNUMBER")
+...@table(name = "NUMBER_ENTITY")
+public class ConstraintNumber implements Serializable {
+
+ @Transient
+ private static final long serialVersionUID = 1L;
+
+ @Transient
+ private static final long negative = -99;
+
+ @Transient
+ private static final long positive = 99;
+
+ @Id
+ @GeneratedValue
+ private long id;
+
+ @Basic
+ @Min(value = 0)
+ private long minZero;
+
+ @Basic
+ private long maxZero; // @Max(value = 0) constraint is on the getter
+
+
+ /*
+ * Some helper methods to create the entities to test with
+ */
+ public static ConstraintNumber createInvalidMin() {
+ ConstraintNumber c = new ConstraintNumber();
+ c.setMinZero(negative);
+ c.setMaxZero(negative);
+ return c;
+ }
+
+ public static ConstraintNumber createInvalidMax() {
+ ConstraintNumber c = new ConstraintNumber();
+ c.setMinZero(positive);
+ c.setMaxZero(positive);
+ return c;
+ }
+
+ public static ConstraintNumber createInvalidMinMax() {
+ ConstraintNumber c = new ConstraintNumber();
+ c.setMinZero(negative);
+ c.setMaxZero(positive);
+ return c;
+ }
+
+ public static ConstraintNumber createValid() {
+ ConstraintNumber c = new ConstraintNumber();
+ c.setMinZero(positive);
+ c.setMaxZero(negative);
+ return c;
+ }
+
+
+ /*
+ * Main entity code
+ */
+ public ConstraintNumber() {
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public long getMinZero() {
+ return minZero;
+ }
+
+ public void setMinZero(long d) {
+ minZero = d;
+ }
+
+ @Max(value = 0)
+ public long getMaxZero() {
+ return maxZero;
+ }
+
+ public void setMaxZero(long d) {
+ maxZero = d;
+ }
+}
Propchange:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNumber.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java?rev=791594&r1=791593&r2=791594&view=diff
==============================================================================
---
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
(original)
+++
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
Mon Jul 6 19:59:04 2009
@@ -13,8 +13,6 @@
*/
package org.apache.openjpa.integration.validation;
-import java.util.List;
-
import javax.persistence.Query;
import javax.persistence.ValidationMode;
import javax.validation.ConstraintViolationException;
@@ -45,11 +43,14 @@
* 8) Test @AssertFalse constraint exception on getter in mode=AUTO
* 10) Test @DecimalMin constraint exception on variables in mode=AUTO
* 11) Test @DecimalMax constraint exception on getter in mode=AUTO
+ * 13) Test @Min constraint exception on variables in mode=AUTO
+ * 14) Test @Max constraint exception on getter in mode=AUTO
*
* Basic constraint test for no violations:
* 6) Persist @NotNull and @Null constraints pass in mode=AUTO
* 9) Test @AssertFalse and @AssertTrue constraints pass in mode=AUTO
* 12) Test @DecimalMin and @DecimalMax constraints pass in mode=AUTO
+ * 15) Test @Min and @Max constraints pass in mode=AUTO
*
* @version $Rev$ $Date$
*/
@@ -59,7 +60,7 @@
public void setUp() {
super.setUp(CLEAR_TABLES,
ConstraintNull.class, ConstraintBoolean.class,
- ConstraintDecimal.class);
+ ConstraintDecimal.class, ConstraintNumber.class);
}
/**
@@ -571,9 +572,115 @@
}
}
-
+ /**
+ * Scenario being tested:
+ * 13) Test @Min constraint exception on variables in mode=AUTO
+ * Basic constraint test for a violation exception.
+ */
+ public void testMinConstraint() {
+ getLog().trace("testMinConstraint() started");
+ // create EM from default EMF
+ OpenJPAEntityManager em = emf.createEntityManager();
+ assertNotNull(em);
+ try {
+ // verify Validation Mode
+ OpenJPAConfiguration conf = em.getConfiguration();
+ assertNotNull(conf);
+ assertTrue("ValidationMode",
+ conf.getValidationMode().equalsIgnoreCase("AUTO"));
+ // create invalid ConstraintBoolean instance
+ em.getTransaction().begin();
+ ConstraintNumber c = ConstraintNumber.createInvalidMin();
+ em.persist(c);
+ em.getTransaction().commit();
+ getLog().trace("testMinConstraint() failed");
+ fail("Expected a ConstraintViolationException");
+ } catch (ConstraintViolationException e) {
+ // expected
+ getLog().trace("Caught expected ConstraintViolationException = " +
e);
+ getLog().trace("testMinConstraint() passed");
+ } finally {
+ if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
+ em.close();
+ }
+ }
+ }
/**
+ * Scenario being tested:
+ * 14) Test @Max constraint exception on getter in mode=AUTO
+ * Basic constraint test for a violation exception.
+ */
+ public void testMaxConstraint() {
+ getLog().trace("testMaxConstraint() started");
+ // create EM from default EMF
+ OpenJPAEntityManager em = emf.createEntityManager();
+ assertNotNull(em);
+ try {
+ // verify Validation Mode
+ OpenJPAConfiguration conf = em.getConfiguration();
+ assertNotNull(conf);
+ assertTrue("ValidationMode",
+ conf.getValidationMode().equalsIgnoreCase("AUTO"));
+ // create invalid ConstraintBoolean instance
+ em.getTransaction().begin();
+ ConstraintNumber c = ConstraintNumber.createInvalidMax();
+ em.persist(c);
+ em.getTransaction().commit();
+ getLog().trace("testMaxConstraint() failed");
+ fail("Expected a ConstraintViolationException");
+ } catch (Exception e) {
+ // expected
+ getLog().trace("Caught expected ConstraintViolationException = " +
e);
+ getLog().trace("testMaxConstraint() passed");
+ } finally {
+ if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
+ em.close();
+ }
+ }
+ }
+
+ /**
+ * Scenario being tested:
+ * 15) Test @Min and @Max constraints pass in mode=AUTO
+ * Basic constraint test for no violations.
+ */
+ public void testMinMaxConstraint() {
+ getLog().trace("testMinMaxConstraint() started");
+ // create EM from default EMF
+ OpenJPAEntityManager em = emf.createEntityManager();
+ assertNotNull(em);
+ try {
+ // verify Validation Mode
+ OpenJPAConfiguration conf = em.getConfiguration();
+ assertNotNull(conf);
+ assertTrue("ValidationMode",
+ conf.getValidationMode().equalsIgnoreCase("AUTO"));
+ // create valid ConstraintBoolean instance
+ em.getTransaction().begin();
+ ConstraintNumber c = ConstraintNumber.createValid();
+ em.persist(c);
+ em.getTransaction().commit();
+ getLog().trace("testMinMaxConstraint() passed");
+ } catch (Exception e) {
+ // unexpected
+ getLog().trace("testMinMaxConstraint() failed");
+ fail("Caught unexpected exception = " + e);
+ } finally {
+ if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
+ em.close();
+ }
+ }
+ }
+
+
+ /**
* Internal convenience method for getting the OpenJPA logger
*
* @return
