r2060 - in trunk/nuiton-validator/src/test/java/org/nuiton/validator: . model - Nuiton-utils-commits

26 Jan 2011

Author: tchemit
Date: 2011-01-26 11:39:56 +0100 (Wed, 26 Jan 2011)
New Revision: 2060

Url: http://nuiton.org/repositories/revision/nuiton-utils/2060

Log:
improve AbstractValidatorDetectorTest

Modified:
   trunk/nuiton-validator/src/test/java/org/nuiton/validator/AbstractValidatorDetectorTest.java
   trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/ModelValidatorDetectorTestImpl.java

Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/AbstractValidatorDetectorTest.java
===================================================================

--- trunk/nuiton-validator/src/test/java/org/nuiton/validator/AbstractValidatorDetectorTest.java	2011-01-26 10:39:27 UTC (rev 2059)
+++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/AbstractValidatorDetectorTest.java	2011-01-26 10:39:56 UTC (rev 2060)
@@ -25,9 +25,11 @@
 package org.nuiton.validator;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 
 import java.io.File;
+import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.regex.Pattern;
 
@@ -76,5 +78,83 @@
         return validators;
     }
 
+    public void assertValidatorModel(NuitonValidator<?> validator,
+                                     String expectedContext,
+                                     Class<?> expectedType,
+                                     NuitonValidatorScope... expectedScopes) {
+        ValidatorTestHelper.assertValidatorModel(
+                validator,
+                expectedContext,
+                expectedType,
+                expectedScopes
+        );
+    }
 
+    public void assertValidatorEffectiveScopes(NuitonValidator<?> validator,
+                                               NuitonValidatorScope... expectedScopes) {
+        ValidatorTestHelper.assertValidatorEffectiveScopes(validator,
+                                                           expectedScopes
+        );
+    }
+
+    public void assertValidatorEffectiveFields(NuitonValidator<?> validator,
+                                                      String... expectedFields) {
+
+        ValidatorTestHelper.assertValidatorEffectiveFields(validator,
+                                                           expectedFields);
+    }
+
+    public void assertValidatorEffectiveFields(NuitonValidator<?> validator,
+                                                      NuitonValidatorScope scope,
+                                                      String... expectedFields) {
+        ValidatorTestHelper.assertValidatorEffectiveFields(validator,
+                                                           scope,
+                                                           expectedFields);
+    }
+
+    public void assertValidatorSetWithMultiContextName(SortedSet<NuitonValidator<?>> result,
+                                                       Object... contextThenClass) {
+
+        Assert.assertNotNull(result);
+        Assert.assertEquals(contextThenClass.length / 2, result.size());
+
+        Iterator<NuitonValidator<?>> itr = result.iterator();
+        int index = 0;
+
+        NuitonValidatorScope[] scopes = NuitonValidatorScope.values();
+
+        while (itr.hasNext()) {
+            NuitonValidator<?> next = itr.next();
+            ValidatorTestHelper.assertValidatorModel(next,
+                                                     (String) contextThenClass[2 * index],
+                                                     (Class<?>) contextThenClass[2 * index + 1],
+                                                     scopes);
+            index++;
+        }
+
+    }
+
+    public void assertValidatorSetWithSameContextName(SortedSet<NuitonValidator<?>> result,
+                                                      String context,
+                                                      Class<?>... contextThenClass) {
+
+        Assert.assertNotNull(result);
+        Assert.assertEquals(contextThenClass.length, result.size());
+
+        Iterator<NuitonValidator<?>> itr = result.iterator();
+        int index = 0;
+
+        NuitonValidatorScope[] scopes = NuitonValidatorScope.values();
+
+        while (itr.hasNext()) {
+            NuitonValidator<?> next = itr.next();
+            ValidatorTestHelper.assertValidatorModel(next,
+                                                     context,
+                                                     contextThenClass[index++],
+                                                     scopes);
+        }
+
+    }
+
+
 }

Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/ModelValidatorDetectorTestImpl.java
===================================================================
--- trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/ModelValidatorDetectorTestImpl.java	2011-01-26 10:39:27 UTC (rev 2059)
+++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/ModelValidatorDetectorTestImpl.java	2011-01-26 10:39:56 UTC (rev 2060)
@@ -29,7 +29,6 @@
 import org.nuiton.validator.AbstractValidatorDetectorTest;
 import org.nuiton.validator.NuitonValidator;
 import org.nuiton.validator.NuitonValidatorScope;
-import org.nuiton.validator.ValidatorTestHelper;
 import org.nuiton.validator.xwork2.XWork2NuitonValidatorProvider;
 
 import java.io.File;
@@ -70,25 +69,23 @@
         Assert.assertNotNull(result);
         Assert.assertEquals(3, result.size());
 
-
         iterator = result.iterator();
         validator = iterator.next();
 
-        ValidatorTestHelper.assertValidatorModel(validator, null, Person.class, NuitonValidatorScope.values());
-        ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
-        ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.ERROR, Person.PROPERTY_NAME, Person.PROPERTY_FIRSTNAME);
-        ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.WARNING, Person.PROPERTY_PET);
+        assertValidatorModel(validator, null, Person.class, NuitonValidatorScope.values());
+        assertValidatorEffectiveScopes(validator, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
+        assertValidatorEffectiveFields(validator, NuitonValidatorScope.ERROR, Person.PROPERTY_NAME, Person.PROPERTY_FIRSTNAME);
+        assertValidatorEffectiveFields(validator, NuitonValidatorScope.WARNING, Person.PROPERTY_PET);
 
         validator = iterator.next();
-        ValidatorTestHelper.assertValidatorModel(validator, null, Pet.class, NuitonValidatorScope.values());
-        ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.ERROR);
-        ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.ERROR, Pet.PROPERTY_NAME);
+        assertValidatorModel(validator, null, Pet.class, NuitonValidatorScope.values());
+        assertValidatorEffectiveScopes(validator, NuitonValidatorScope.ERROR);
+        assertValidatorEffectiveFields(validator, NuitonValidatorScope.ERROR, Pet.PROPERTY_NAME);
 
         validator = iterator.next();
-        ValidatorTestHelper.assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.values());
-        ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO);
-        ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME);
-
+        assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.values());
+        assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO);
+        assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME);
     }
 
     @Test
@@ -108,9 +105,9 @@
         iterator = result.iterator();
 
         validator = iterator.next();
-        ValidatorTestHelper.assertValidatorModel(validator, null, Person.class, NuitonValidatorScope.WARNING);
-        ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.WARNING);
-        ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.WARNING, Person.PROPERTY_PET);
+        assertValidatorModel(validator, null, Person.class, NuitonValidatorScope.WARNING);
+        assertValidatorEffectiveScopes(validator, NuitonValidatorScope.WARNING);
+        assertValidatorEffectiveFields(validator, NuitonValidatorScope.WARNING, Person.PROPERTY_PET);
 
         // test with no context and only fatal scope : no validator
 
@@ -119,7 +116,6 @@
 
         Assert.assertNotNull(result);
         Assert.assertTrue(result.isEmpty());
-
     }
 
     @Test
@@ -140,9 +136,9 @@
         iterator = result.iterator();
 
         validator = iterator.next();
-        ValidatorTestHelper.assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.values());
-        ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO);
-        ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME);
+        assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.values());
+        assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO);
+        assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME);
 
 
         // test with specific context fake and all scopes : no validator
@@ -152,7 +148,6 @@
 
         Assert.assertNotNull(result);
         Assert.assertTrue(result.isEmpty());
-
     }
 
     @Test
@@ -162,7 +157,6 @@
         NuitonValidator<?> validator;
         Iterator<NuitonValidator<?>> iterator;
 
-
         // test with context 'context' and info-fatal scopes : one validator (Pet)
 
         result = detectValidators(Pattern.compile(CONTEXT),
@@ -175,9 +169,9 @@
         iterator = result.iterator();
 
         validator = iterator.next();
-        ValidatorTestHelper.assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.FATAL, NuitonValidatorScope.INFO);
-        ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO);
-        ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME);
+        assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.FATAL, NuitonValidatorScope.INFO);
+        assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO);
+        assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME);
 
         // test with specific context fake and fatal scope : no validator
 
@@ -187,7 +181,6 @@
 
         Assert.assertNotNull(result);
         Assert.assertTrue(result.isEmpty());
-
     }

    

r2060 - in trunk/nuiton-validator/src/test/java/org/nuiton/validator: . model

tchemit＠users.nuiton.org

tags

participants (1)