Hibernate SVN: r17520 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2009-09-16 05:00:15 -0400 (Wed, 16 Sep 2009)
New Revision: 17520
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
Log:
fix minor inconsistency
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-09-15 19:03:34 UTC (rev 17519)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-09-16 09:00:15 UTC (rev 17520)
@@ -170,7 +170,7 @@
Set<ConstraintViolation<C>> violations = validator.validate( c );
assertCorrectNumberOfViolations( violations, 2 );
- assertCorrectConstraintTypes( violations, Size.class, Max.class );
+ assertCorrectConstraintTypes( violations, Max.class, Size.class );
assertCorrectPropertyPaths( violations, "size", "d.nickname" );
c.size = 10;
@@ -204,7 +204,7 @@
Set<ConstraintViolation<E>> violations = validator.validate( e );
assertCorrectNumberOfViolations( violations, 2 );
- assertCorrectConstraintTypes( violations, Size.class, Max.class );
+ assertCorrectConstraintTypes( violations, Max.class, Size.class );
assertCorrectPropertyPaths( violations, "size", "f.nickname" );
e.size = 10;
14 years, 7 months
Hibernate SVN: r17519 - in beanvalidation/trunk/validation-tck/src/main: resources and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-15 15:03:34 -0400 (Tue, 15 Sep 2009)
New Revision: 17519
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
HV-225
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-09-15 18:01:59 UTC (rev 17518)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-09-15 19:03:34 UTC (rev 17519)
@@ -47,7 +47,8 @@
@SpecAssertions({
@SpecAssertion(section = "3.4.3", id = "a"),
@SpecAssertion(section = "3.4.3", id = "b"),
- @SpecAssertion(section = "3.4.3", id = "c")
+ @SpecAssertion(section = "3.4.3", id = "c"),
+ @SpecAssertion(section = "3.4.5", id = "a")
})
public void testCorrectDefaultSequenceInheritance() {
Validator validator = TestUtil.getValidatorUnderTest();
@@ -84,7 +85,8 @@
@SpecAssertions({
@SpecAssertion(section = "3.4.3", id = "a"),
@SpecAssertion(section = "3.4.3", id = "b"),
- @SpecAssertion(section = "3.4.3", id = "c")
+ @SpecAssertion(section = "3.4.3", id = "c"),
+ @SpecAssertion(section = "3.4.5", id = "a")
})
public void testCorrectDefaultSequenceInheritance2() {
Validator validator = TestUtil.getValidatorUnderTest();
@@ -123,6 +125,7 @@
}
@Test
+ @SpecAssertion(section = "3.4.5", id = "b")
public void testCorrectDefaultSequenceInheritance3() {
Validator validator = TestUtil.getValidatorUnderTest();
B3 b = new B3();
@@ -135,14 +138,28 @@
assertCorrectNumberOfViolations( violations, 2 );
assertCorrectConstraintTypes( violations, Max.class, Size.class );
assertCorrectPropertyPaths( violations, "size", "nickname" );
+
+ b.nickname = "nick";
+ violations = validator.validate( b );
+ assertCorrectNumberOfViolations( violations, 1 );
+ assertCorrectConstraintTypes( violations, Max.class );
+ assertCorrectPropertyPaths( violations, "size" );
+
+ b.size = 10;
+ violations = validator.validate( b );
+ assertCorrectNumberOfViolations( violations, 1 );
+ assertCorrectConstraintTypes( violations, Size.class );
+ assertCorrectPropertyPaths( violations, "name" );
+
+ b.nickname = "and this nickname as well";
+ violations = validator.validate( b );
+ assertCorrectNumberOfViolations( violations, 2 );
+ assertCorrectConstraintTypes( violations, Size.class, Size.class );
+ assertCorrectPropertyPaths( violations, "name", "nickname" );
}
@Test
- @SpecAssertions({
- @SpecAssertion(section = "3.4.3", id = "a"),
- @SpecAssertion(section = "3.4.3", id = "b"),
- @SpecAssertion(section = "3.4.3", id = "c")
- })
+ @SpecAssertion(section = "3.5.1", id = "e")
public void testCorrectDefaultSequenceContainedCaseWithoutGroupRedefinitionOnContainedEntity() {
Validator validator = TestUtil.getValidatorUnderTest();
C c = new C();
@@ -174,6 +191,7 @@
}
@Test
+ @SpecAssertion(section = "3.5.1", id = "e")
public void testCorrectDefaultSequenceContainedCaseWithGroupRedefinitionOnContainedEntity() {
Validator validator = TestUtil.getValidatorUnderTest();
E e = new E();
Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-09-15 18:01:59 UTC (rev 17518)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-09-15 19:03:34 UTC (rev 17519)
@@ -137,7 +137,7 @@
</assertion>
<assertion id="p">
<text>Any payload definition on a composing annotation is ignored</text>
- </assertion>
+ </assertion>
</section>
<section id="2.4" title="Constraint validation implementation">
<assertion id="a">
@@ -207,8 +207,8 @@
builder fluent API.</text>
</assertion>
<assertion id="r">
- <text>If disableDefaultError is called, no custom error is added (using the error builder)
- and if the constraint is not valid, a ValidationException is raised.</text>
+ <text>If disableDefaultError is called, no custom error is added (using the error
+ builder) and if the constraint is not valid, a ValidationException is raised.</text>
</assertion>
</section>
<section id="2.5" title="The ConstraintValidatorFactory">
@@ -428,6 +428,18 @@
(implicitly or explicitly) belongs to the group Z</text>
</assertion>
</section>
+ <section id="3.4.5" title="Formal group definitions">
+ <assertion id="a">
+ <text>If a class does have a @GroupSequence annotation, the group Default contains every
+ constraint belonging to every group declared by the @GroupSequence
+ annotation.</text>
+ </assertion>
+ <assertion id="b">
+ <text>If class X has no @GroupSequence annotation, the group Default contains every
+ constraint in the group X and if X has a direct superclass Y, every constraint in
+ the group Default of Y this rule</text>
+ </assertion>
+ </section>
<section id="3.5" title="Validation routine">
<assertion id="a" testable="false">
<text>For a given group to validate, the validation routine applied on a given bean
@@ -460,6 +472,11 @@
cascading operation if the associated object instance has already been validated in
the current navigation path (starting from the root object)</text>
</assertion>
+ <assertion id="e">
+ <text>@Valid is an orthogonal concept to the notion of group. If two groups are in
+ sequence, the first group must pass for all associated objects before the second
+ group is evaluated.</text>
+ </assertion>
</section>
<section id="3.5.2" title="Traversable property">
<assertion id="a">
@@ -943,7 +960,7 @@
<assertion id="c">
<text>getConstraintsForProperty throws an IllegalArgumentException if the propertyName
parameter is null</text>
- </assertion>
+ </assertion>
</section>
<section id="5.4" title="PropertyDescriptor">
<assertion id="a">
@@ -951,7 +968,7 @@
</assertion>
<assertion id="b">
<text>getPropertyName returns the property name</text>
- </assertion>
+ </assertion>
</section>
<section id="5.5" title="ConstraintDescriptor">
<assertion id="a">
@@ -1165,8 +1182,8 @@
constraints.</text>
</assertion>
<assertion id="e">
- <text>The only way to disable cascading on a property marked as @Valid is to
- use ignore-annotations=true</text>
+ <text>The only way to disable cascading on a property marked as @Valid is to use
+ ignore-annotations=true</text>
</assertion>
<assertion id="f">
<text>If the name of the property does not correspond to a property in the given bean a
@@ -1235,8 +1252,8 @@
<assertion id="a">
<text>Every (runtime) exception raised either at initialization time or execution time
by any of the extension interfaces (ConstraintValidator, ConstraintValidatorFactory,
- MessageInterpolator, TraversableResolver, ValidationProviderResolver) is wrapped
- in a ValidationException</text>
+ MessageInterpolator, TraversableResolver, ValidationProviderResolver) is wrapped in
+ a ValidationException</text>
</assertion>
</section>
<section id="8.2" title="ConstraintDefinitionException">
14 years, 7 months
Hibernate SVN: r17518 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-15 14:01:59 -0400 (Tue, 15 Sep 2009)
New Revision: 17518
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
Log:
HV-225
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-09-15 14:05:40 UTC (rev 17517)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-09-15 18:01:59 UTC (rev 17518)
@@ -23,6 +23,8 @@
import javax.validation.constraints.Max;
import javax.validation.constraints.Size;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.testharness.AbstractTest;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ArtifactType;
@@ -42,6 +44,11 @@
public class GroupSequenceIsolationTest extends AbstractTest {
@Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.3", id = "a"),
+ @SpecAssertion(section = "3.4.3", id = "b"),
+ @SpecAssertion(section = "3.4.3", id = "c")
+ })
public void testCorrectDefaultSequenceInheritance() {
Validator validator = TestUtil.getValidatorUnderTest();
B1 b = new B1();
@@ -74,6 +81,11 @@
}
@Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.3", id = "a"),
+ @SpecAssertion(section = "3.4.3", id = "b"),
+ @SpecAssertion(section = "3.4.3", id = "c")
+ })
public void testCorrectDefaultSequenceInheritance2() {
Validator validator = TestUtil.getValidatorUnderTest();
B2 b = new B2();
@@ -126,6 +138,11 @@
}
@Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.3", id = "a"),
+ @SpecAssertion(section = "3.4.3", id = "b"),
+ @SpecAssertion(section = "3.4.3", id = "c")
+ })
public void testCorrectDefaultSequenceContainedCaseWithoutGroupRedefinitionOnContainedEntity() {
Validator validator = TestUtil.getValidatorUnderTest();
C c = new C();
14 years, 7 months
Hibernate SVN: r17517 - in search/trunk/src: test/java/org/hibernate/search/test/filter and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2009-09-15 10:05:40 -0400 (Tue, 15 Sep 2009)
New Revision: 17517
Modified:
search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
search/trunk/src/test/java/org/hibernate/search/test/filter/FilterTest.java
Log:
HSEARCH-398 NPE when named FullTextFilter is disabled without being enabled first (on trunk)
Modified: search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2009-09-15 13:28:56 UTC (rev 17516)
+++ search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2009-09-15 14:05:40 UTC (rev 17517)
@@ -94,7 +94,7 @@
private boolean allowFieldSelectionInProjection = true;
private ResultTransformer resultTransformer;
private SearchFactoryImplementor searchFactoryImplementor;
- private Map<String, FullTextFilterImpl> filterDefinitions;
+ private final Map<String, FullTextFilterImpl> filterDefinitions = new HashMap<String, FullTextFilterImpl>();
private int fetchSize = 1;
private static final FullTextFilterImplementor[] EMPTY_FULL_TEXT_FILTER_IMPLEMENTOR = new FullTextFilterImplementor[0];
@@ -406,7 +406,7 @@
private void buildFilters() {
ChainedFilter chainedFilter = null;
- if ( ! ( filterDefinitions == null || filterDefinitions.size() == 0 ) ) {
+ if ( ! filterDefinitions.isEmpty() ) {
chainedFilter = new ChainedFilter();
for ( FullTextFilterImpl fullTextFilter : filterDefinitions.values() ) {
Filter filter = buildLuceneFilter( fullTextFilter );
@@ -874,9 +874,6 @@
}
public FullTextFilter enableFullTextFilter(String name) {
- if ( filterDefinitions == null ) {
- filterDefinitions = new HashMap<String, FullTextFilterImpl>();
- }
FullTextFilterImpl filterDefinition = filterDefinitions.get( name );
if ( filterDefinition != null ) {
return filterDefinition;
Modified: search/trunk/src/test/java/org/hibernate/search/test/filter/FilterTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/filter/FilterTest.java 2009-09-15 13:28:56 UTC (rev 17516)
+++ search/trunk/src/test/java/org/hibernate/search/test/filter/FilterTest.java 2009-09-15 14:05:40 UTC (rev 17517)
@@ -33,7 +33,8 @@
assertEquals("No filter should happen", 3, ftQuery.getResultSize() );
ftQuery = s.createFullTextQuery( query, Driver.class );
- ftQuery.enableFullTextFilter( "bestDriver");
+ ftQuery.disableFullTextFilter( "bestDriver" ); //was not enabled, but should be harmless
+ ftQuery.enableFullTextFilter( "bestDriver" );
assertEquals("Should filter out Gavin", 2, ftQuery.getResultSize() );
ftQuery = s.createFullTextQuery( query, Driver.class );
14 years, 7 months
Hibernate SVN: r17516 - search/trunk.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2009-09-15 09:28:56 -0400 (Tue, 15 Sep 2009)
New Revision: 17516
Modified:
search/trunk/pom.xml
Log:
Depending on Hibernate Core 3.5.0.Beta-1
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2009-09-15 12:35:28 UTC (rev 17515)
+++ search/trunk/pom.xml 2009-09-15 13:28:56 UTC (rev 17516)
@@ -53,7 +53,7 @@
<properties>
<slf4jVersion>1.5.6</slf4jVersion>
<luceneVersion>2.4.1</luceneVersion>
- <hibernateVersion>3.5.0-SNAPSHOT</hibernateVersion>
+ <hibernateVersion>3.5.0.Beta-1</hibernateVersion>
<hibernateCommonsAnnotationVersion>3.2.0.Beta1</hibernateCommonsAnnotationVersion>
</properties>
14 years, 7 months
Hibernate SVN: r17515 - in core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect: resolver and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-09-15 08:35:28 -0400 (Tue, 15 Sep 2009)
New Revision: 17515
Modified:
core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
Log:
HHH-3461 - Enhance DialectFactory to support Sybase Adaptive Server Anywhere
Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
===================================================================
--- core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SybaseDialect.java 2009-09-15 12:33:28 UTC (rev 17514)
+++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/SybaseDialect.java 2009-09-15 12:35:28 UTC (rev 17515)
@@ -1,8 +1,7 @@
-//$Id $
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Middleware LLC.
@@ -21,20 +20,18 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.dialect;
/**
- * SybaseDialect is being deprecated.
+ * This dialect is being deprecated; it had been used both as the base class
+ * for TransactSQL-based dialects as well as the physical dialect for handling
+ * Sybase. Those functions have now been split.
+ * {@link AbstractTransactSQLDialect} should be used as the base class for
+ * TransactSQL-based dialects.
*
- * AbstractTransactSQLDialect should be used as a base
- * class for Sybase and MS SQL Server dialects.
- *
* @author Gail Badner
- * @deprecated SybaseASE15Dialect or SQLServerDialect should be
- * used instead.
+ * @deprecated use {@link SybaseASE15Dialect} or {@link SQLServerDialect} instead.
*/
-
public class SybaseDialect extends AbstractTransactSQLDialect {
}
Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
===================================================================
--- core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java 2009-09-15 12:33:28 UTC (rev 17514)
+++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java 2009-09-15 12:35:28 UTC (rev 17515)
@@ -44,6 +44,7 @@
import org.hibernate.dialect.Oracle10gDialect;
import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.dialect.Oracle8iDialect;
+import org.hibernate.dialect.SybaseAnywhereDialect;
/**
* The standard Hibernate resolver.
@@ -89,6 +90,10 @@
return new SybaseDialect();
}
+ if ( databaseName.startsWith( "Adaptive Server Anywhere" ) ) {
+ return new SybaseAnywhereDialect();
+ }
+
if ( "Informix Dynamic Server".equals( databaseName ) ) {
return new InformixDialect();
}
14 years, 7 months
Hibernate SVN: r17514 - in core/trunk/core/src/main/java/org/hibernate/dialect: resolver and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-09-15 08:33:28 -0400 (Tue, 15 Sep 2009)
New Revision: 17514
Modified:
core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
core/trunk/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
Log:
HHH-3461 - Enhance DialectFactory to support Sybase Adaptive Server Anywhere
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java 2009-09-14 08:24:47 UTC (rev 17513)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java 2009-09-15 12:33:28 UTC (rev 17514)
@@ -26,15 +26,14 @@
package org.hibernate.dialect;
/**
- * SybaseDialect is being deprecated.
- *
- * AbstractTransactSQLDialect should be used as a base
- * class for Sybase and MS SQL Server dialects.
+ * This dialect is being deprecated; it had been used both as the base class
+ * for TransactSQL-based dialects as well as the physical dialect for handling
+ * Sybase. Those functions have now been split.
+ * {@link AbstractTransactSQLDialect} should be used as the base class for
+ * TransactSQL-based dialects.
*
* @author Gail Badner
- * @deprecated SybaseASE15Dialect or SQLServerDialect should be
- * used instead.
+ * @deprecated use {@link SybaseASE15Dialect} or {@link SQLServerDialect} instead.
*/
-
public class SybaseDialect extends AbstractTransactSQLDialect {
}
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java 2009-09-14 08:24:47 UTC (rev 17513)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java 2009-09-15 12:33:28 UTC (rev 17514)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
@@ -20,7 +20,6 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.dialect.resolver;
@@ -44,6 +43,7 @@
import org.hibernate.dialect.Oracle10gDialect;
import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.dialect.Oracle8iDialect;
+import org.hibernate.dialect.SybaseAnywhereDialect;
/**
* The standard Hibernate resolver.
@@ -89,6 +89,10 @@
return new SybaseDialect();
}
+ if ( databaseName.startsWith( "Adaptive Server Anywhere" ) ) {
+ return new SybaseAnywhereDialect();
+ }
+
if ( "Informix Dynamic Server".equals( databaseName ) ) {
return new InformixDialect();
}
14 years, 7 months
Hibernate SVN: r17513 - in validator/trunk/hibernate-validator/src: test/java/org/hibernate/validator/engine and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-14 04:24:47 -0400 (Mon, 14 Sep 2009)
New Revision: 17513
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java
Log:
HV-132 Added support for hasXYZ
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java 2009-09-14 07:36:58 UTC (rev 17512)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java 2009-09-14 08:24:47 UTC (rev 17513)
@@ -98,6 +98,9 @@
if ( methodName.startsWith( "is" ) ) {
name = Introspector.decapitalize( methodName.substring( 2 ) );
}
+ else if ( methodName.startsWith( "has" ) ) {
+ name = Introspector.decapitalize( methodName.substring( 3 ) );
+ }
else if ( methodName.startsWith( "get" ) ) {
name = Introspector.decapitalize( methodName.substring( 3 ) );
}
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java 2009-09-14 07:36:58 UTC (rev 17512)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java 2009-09-14 08:24:47 UTC (rev 17513)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -20,8 +20,11 @@
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
+import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotNull;
+import javax.validation.metadata.BeanDescriptor;
+import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
import org.hibernate.validator.util.TestUtil;
@@ -45,8 +48,27 @@
assertCorrectPropertyPaths( constraintViolations, "b" );
}
+ /**
+ * HV-132 - supper hasBoolean format
+ */
+ @Test
+ public void testHasBoolean() {
+ Validator validator = TestUtil.getValidator();
+ BeanDescriptor beanDescr = validator.getConstraintsForClass( B.class );
+ assertTrue( beanDescr.isBeanConstrained() );
+ }
+
class A {
@NotNull
String b;
}
+
+ class B {
+ private boolean b;
+
+ @AssertTrue
+ public boolean hasB() {
+ return b;
+ }
+ }
}
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java 2009-09-14 07:36:58 UTC (rev 17512)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java 2009-09-14 08:24:47 UTC (rev 17513)
@@ -123,7 +123,7 @@
}
@Test
- public void testGetMessageParamter() {
+ public void testGetMessageParameter() {
NotNull testAnnotation = new NotNull() {
public String message() {
return "test";
14 years, 7 months
Hibernate SVN: r17512 - validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-14 03:36:58 -0400 (Mon, 14 Sep 2009)
New Revision: 17512
Modified:
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java
Log:
Removed obsolete test
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java 2009-09-14 07:34:28 UTC (rev 17511)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java 2009-09-14 07:36:58 UTC (rev 17512)
@@ -179,16 +179,6 @@
}
@Test
- public void testFallbackToDefaultLocale() {
- interpolator = new ResourceBundleMessageInterpolator();
- MessageInterpolator.Context context = new MessageInterpolatorContext( notNullDescriptor, null );
-
- String expected = "may not be null";
- String actual = interpolator.interpolate( notNull.message(), context, Locale.JAPAN );
- assertEquals( actual, expected, "Wrong substitution" );
- }
-
- @Test
public void testUserResourceBundle() {
interpolator = new ResourceBundleMessageInterpolator();
MessageInterpolator.Context context = new MessageInterpolatorContext( notNullDescriptor, null );
14 years, 7 months