Author: echatellier Date: 2010-09-13 10:56:11 +0200 (Mon, 13 Sep 2010) New Revision: 302 Url: http://nuiton.org/repositories/revision/wikitty/302 Log: Move junit import to junit4 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractTestApi.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractTestApi.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractTestApi.java 2010-09-10 07:44:07 UTC (rev 301) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractTestApi.java 2010-09-13 08:56:11 UTC (rev 302) @@ -2,10 +2,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -@RunWith(JUnit4.class) public abstract class AbstractTestApi { protected final static Log log = LogFactory.getLog(AbstractTestApi.class); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-10 07:44:07 UTC (rev 301) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-13 08:56:11 UTC (rev 302) @@ -1,11 +1,5 @@ package org.nuiton.wikitty.api; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; - import java.util.Arrays; import java.util.Calendar; import java.util.Date; @@ -17,6 +11,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.ExtensionFactory; import org.nuiton.wikitty.FieldType; @@ -27,7 +22,6 @@ import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.conform.StorageTest; -import org.springframework.test.annotation.ExpectedException; /** * Test Wikitty, Extensions, Field and FieldType through the Wikitty Object @@ -37,18 +31,19 @@ */ public class CommonTest extends AbstractTestApi { - static private Log log = LogFactory.getLog(CommonTest.class); + private static Log log = LogFactory.getLog(CommonTest.class); + private static String UNKNOWN = "unknown"; @Test public void testWikittyId() throws Exception { Wikitty w = new WikittyImpl(); // as soon as a wikitty object is created, it got an ID. - assertNotNull("Wikitty should got an ID", w.getId() ); + Assert.assertNotNull("Wikitty should got an ID", w.getId() ); Wikitty w2 = new WikittyImpl( w.getId() ); // two wikitty with a similar id are equals. - assertEquals("Wikitty with same ID must be equals", w, w2); + Assert.assertEquals("Wikitty with same ID must be equals", w, w2); } @Test @@ -60,31 +55,31 @@ WikittyExtension ext = new WikittyExtension( "invalidExt", "1", null, null ); wikitty.addExtension(ext); // yes we want to handle empty extension - assertTrue( wikitty.hasExtension("invalidExt") ); + Assert.assertTrue( wikitty.hasExtension("invalidExt") ); // empty extension should be ignored (?) ext = new WikittyExtension( "invalideExt2", "1", null, new LinkedHashMap<String, FieldType>() ); wikitty.addExtension(ext); - assertFalse( wikitty.hasExtension("invalidExt2") ); + Assert.assertFalse( wikitty.hasExtension("invalidExt2") ); // test requires extension ext = new WikittyExtension( "master", "1", null, null); wikitty.addExtension(ext); - assertTrue( wikitty.hasExtension("master") ); + Assert.assertTrue( wikitty.hasExtension("master") ); ext = new WikittyExtension( "slave", "1", "master", null); wikitty.addExtension(ext); - assertTrue( wikitty.hasExtension("slave") ); + Assert.assertTrue( wikitty.hasExtension("slave") ); ext = new WikittyExtension("badslave", "1", "nomaster", null); try { wikitty.addExtension(ext); - assertFalse(true); + Assert.assertFalse(true); } catch (Exception eee) { // add extension that depend another not in wikitty must throw exception - assertTrue(true); + Assert.assertTrue(true); } - assertFalse( wikitty.hasExtension("badslave") ); + Assert.assertFalse( wikitty.hasExtension("badslave") ); // test data ... String testExtName = "testExt"; @@ -94,12 +89,12 @@ .addField("fieldName2", TYPE.NUMERIC) .extension(); Wikitty w = new WikittyImpl(); - assertFalse( w.hasExtension(testExtName) ); + Assert.assertFalse( w.hasExtension(testExtName) ); w.addExtension(ext); - assertTrue( w.hasExtension(testExtName) ); + Assert.assertTrue( w.hasExtension(testExtName) ); for ( int i = 0; i < 3; i++ ) { String fieldName = "fieldName" + i; - assertTrue( "Field " + fieldName + " not found" + Assert.assertTrue( "Field " + fieldName + " not found" , w.hasField(testExtName, fieldName) ); } @@ -116,10 +111,10 @@ for ( int i = 0; i < 5; i++ ) { String fieldName = "fieldName" + i; if ( i < 3 ) { // fields in the first implem should be kept - assertTrue( "Field " + fieldName + " not found" + Assert.assertTrue( "Field " + fieldName + " not found" , w.hasField(testExtName, fieldName) ); } - assertTrue( "Field " + fieldName + " not found", + Assert.assertTrue( "Field " + fieldName + " not found", w.hasField("otherExt", fieldName) ); } @@ -145,7 +140,7 @@ // test assignment on a non-existing extension. try { w.setField(UNKNOWN, "fieldName", "fieldValue"); - fail( "Should throw a runtime exception !" ); + Assert.fail("Should throw a runtime exception !"); } catch (RuntimeException e) { // OK ! } @@ -153,7 +148,7 @@ // test assignment on a non-existing field. try { w.setField(StorageTest.EXTNAME, "non-existing-fieldName", "fieldValue"); - fail( "Should throw a runtime exception !" ); + Assert.fail( "Should throw a runtime exception !" ); } catch (RuntimeException e) { // OK ! } @@ -163,15 +158,15 @@ // basic valid assignment ... String stringValue = "A Test Value"; w.setField(StorageTest.EXTNAME, "fieldName0", stringValue); - assertEquals(stringValue, w.getFieldAsString(StorageTest.EXTNAME, "fieldName0") ); + Assert.assertEquals(stringValue, w.getFieldAsString(StorageTest.EXTNAME, "fieldName0") ); int intValue = 123456; w.setField(StorageTest.EXTNAME, "fieldName1", intValue); - assertEquals(intValue, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); + Assert.assertEquals(intValue, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); Date dateValue = new Date(); w.setField(StorageTest.EXTNAME, "fieldName2", new Date() ); - assertEquals(dateValue, w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2") ); + Assert.assertEquals(dateValue, w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2") ); // null or empty assignment ... for ( int i = 0; i < 3; i++ ) { @@ -205,15 +200,15 @@ }); // test java.lang.Integer => int w.setField(StorageTest.EXTNAME, "fieldName1", new Integer(123)); - assertEquals(123, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); + Assert.assertEquals(123, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); // test String => int w.setField(StorageTest.EXTNAME, "fieldName1", "123"); - assertEquals(123, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); + Assert.assertEquals(123, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); // test String => Date Calendar cal = Calendar.getInstance(Locale.ROOT); cal.set(1982, 0, 23, 0, 0, 0); cal.set( Calendar.MILLISECOND, 0 ); w.setField( StorageTest.EXTNAME, "fieldName2", WikittyUtil.formatDate(cal.getTime()) ); - assertEquals(cal.getTime(), w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2") ); + Assert.assertEquals(cal.getTime(), w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2") ); } @Test @@ -230,7 +225,7 @@ // test setting a (primitive) value to the field ... try { w.setField(StorageTest.EXTNAME, fieldName, 123); - fail("setting an int to a list of int is forbidden !"); + Assert.fail("setting an int to a list of int is forbidden !"); } catch (WikittyException e) { // OK } @@ -241,7 +236,7 @@ } int z = 0; for ( int value : w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class) ) { - assertEquals( "element " + z + " failed", + Assert.assertEquals( "element " + z + " failed", z, value ); z++; } @@ -251,7 +246,7 @@ w.setField( StorageTest.EXTNAME, fieldName, Arrays.asList(listInt) ); z = 0; for ( int value : w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class) ) { - assertEquals( listInt[z++].intValue(), value ); + Assert.assertEquals( listInt[z++].intValue(), value ); } // test remove an element ... @@ -259,7 +254,7 @@ List<Integer> values = w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class); z = 0; for ( int value : w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class) ) { - assertEquals( + Assert.assertEquals( // on the last element, we expect MAX_VALUE because MIN_VALUE was deleted. z == values.size() - 1 ? Integer.MAX_VALUE : listInt[z++].intValue() , value ); @@ -268,7 +263,7 @@ // test clear field ... w.clearField(StorageTest.EXTNAME, fieldName); values = w.getFieldAsList(StorageTest.EXTNAME, fieldName, Integer.class); - assertTrue( values.isEmpty() ); + Assert.assertTrue( values.isEmpty() ); } @@ -348,7 +343,6 @@ int intValue = 123456; w.setField(StorageTest.EXTNAME, "fieldName1", intValue); - Date dateValue = new Date(); w.setField(StorageTest.EXTNAME, "fieldName2", new Date()); } long timeSetW = System.currentTimeMillis() - time; @@ -394,10 +388,4 @@ log.info("Time w set: " + timeSetW + " Time w get: " + timeGetW); log.info("Time z set: " + timeSetZ + " Time z get: " + timeGetZ); } - - /** main is used for profile test */ - public static void main(String [] args) throws Exception { - new CommonTest().testPerfFieldAccess(); - } - } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java 2010-09-10 07:44:07 UTC (rev 301) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java 2010-09-13 08:56:11 UTC (rev 302) @@ -1,13 +1,11 @@ package org.nuiton.wikitty.api; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; - +import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.ExtensionFactory; import org.nuiton.wikitty.FieldType; -import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.FieldType.TYPE; +import org.nuiton.wikitty.WikittyExtension; public class ExtensionFactoryTest extends AbstractTestApi { @@ -24,8 +22,8 @@ .addField("fired", TYPE.BOOLEAN) .extension(); - assertEquals("testExtension", ext.getName()); - assertEquals("1.0", ext.getVersion()); + Assert.assertEquals("testExtension", ext.getName()); + Assert.assertEquals("1.0", ext.getVersion()); checkField( ext, "name", TYPE.STRING, 0, 1, false, true); checkField( ext, "phoneNumbers", TYPE.STRING, 2, 10, false, false); checkField( ext, "matricule", TYPE.NUMERIC, 0, 1, true, false); @@ -37,12 +35,12 @@ int min, int max, boolean unique, boolean notNull) { FieldType fieldType = ext.getFieldType(fieldName); String str = "Checking " + ext.getName() + "." + fieldName + " field..."; - assertNotNull(str, fieldType ); - assertEquals(str, type, fieldType.getType()); - assertEquals(str, min, fieldType.getLowerBound()); - assertEquals(str, max, fieldType.getUpperBound()); - assertEquals(str, unique, fieldType.isUnique()); - assertEquals(str, notNull, fieldType.isNotNull()); + Assert.assertNotNull(str, fieldType ); + Assert.assertEquals(str, type, fieldType.getType()); + Assert.assertEquals(str, min, fieldType.getLowerBound()); + Assert.assertEquals(str, max, fieldType.getUpperBound()); + Assert.assertEquals(str, unique, fieldType.isUnique()); + Assert.assertEquals(str, notNull, fieldType.isNotNull()); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java 2010-09-10 07:44:07 UTC (rev 301) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java 2010-09-13 08:56:11 UTC (rev 302) @@ -1,11 +1,8 @@ package org.nuiton.wikitty.api; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.search.And; @@ -41,10 +38,10 @@ public void testBetween() throws Exception { Criteria criteria = q().bw(elementName, "from", "to").criteria(); Restriction restriction = criteria.getRestriction(); - assertTrue( restriction instanceof Between ); + Assert.assertTrue( restriction instanceof Between ); Between between = (Between) restriction; - assertEquals( "from", between.getMin() ); - assertEquals( "to", between.getMax() ); + Assert.assertEquals( "from", between.getMin() ); + Assert.assertEquals( "to", between.getMax() ); } @Test @@ -54,7 +51,7 @@ .gt(elementName + "1", value + "1") .ew(elementName + "2", value + "2") .criteria().getRestriction(); - assertTrue( dto instanceof And ); + Assert.assertTrue( dto instanceof And ); And and = (And) dto; Restriction[] dtos = and.getRestrictions().toArray(new Restriction[]{}); checkRestriction(dtos[0], RestrictionName.EQUALS, elementName + "0", value + "0"); @@ -78,11 +75,11 @@ .ew(elementNames[2], values[2]) .lt(elementNames[3], values[3]); Restriction dto = q.criteria().getRestriction(); - assertTrue( "Restriction is " + dto.getClass().getName(), dto instanceof And ); + Assert.assertTrue( "Restriction is " + dto.getClass().getName(), dto instanceof And ); And and = (And) dto; Restriction[] dtos = and.getRestrictions().toArray(new Restriction[]{}); checkRestriction(dtos[0], RestrictionName.EQUALS, elementName + "0", value + "0"); - assertTrue( "Restriction is " + dtos[1].getClass().getName(), dtos[1] instanceof Or ); + Assert.assertTrue( "Restriction is " + dtos[1].getClass().getName(), dtos[1] instanceof Or ); Or or = (Or) dtos[1]; dtos = or.getRestrictions().toArray(new Restriction[]{}); checkRestriction(dtos[0], RestrictionName.GREATER, elementName + "1", value + "1"); @@ -105,17 +102,17 @@ .eq( "Category.name", "Hardware" ) .criteria().getRestriction(); - assertTrue( "Restriction is " + dto.getClass().getName(), dto instanceof AssociatedRestriction ); + Assert.assertTrue( "Restriction is " + dto.getClass().getName(), dto instanceof AssociatedRestriction ); AssociatedRestriction ass = (AssociatedRestriction) dto; Restriction embedded = ass.getRestriction(); - assertTrue( "Restriction is " + dto.getClass().getName(), embedded instanceof Equals ); + Assert.assertTrue( "Restriction is " + dto.getClass().getName(), embedded instanceof Equals ); checkRestriction(embedded, RestrictionName.EQUALS, "Category.name", "Hardware"); - assertEquals( "Product.category", ass.getElement().getName() ); + Assert.assertEquals( "Product.category", ass.getElement().getName() ); Restriction parentRestriction = ass.getParentRestrictionDto(); - assertTrue( "Restriction is " + dto.getClass().getName(), parentRestriction instanceof And ); + Assert.assertTrue( "Restriction is " + dto.getClass().getName(), parentRestriction instanceof And ); And and = (And) parentRestriction; Restriction[] dtos = and.getRestrictions().toArray(new Restriction[]{}); - assertTrue( dtos[0] instanceof Between ); + Assert.assertTrue( dtos[0] instanceof Between ); checkRestriction(dtos[1], RestrictionName.STARTS_WITH, "Product.name", "Paint"); } @@ -126,32 +123,32 @@ // Serialize String xml = Criteria.toXML(criteria); log.debug("[XML] " + xml); - assertNotNull(xml); + Assert.assertNotNull(xml); // Deserialize criteria = Criteria.fromXML(xml); - assertNotNull(criteria); + Assert.assertNotNull(criteria); } /* * -============ private test utils operations ============- */ - private final static Search q() { + protected final static Search q() { return Search.query(); } - private void checkSearch( Search search, RestrictionName name ) throws Exception { + protected void checkSearch( Search search, RestrictionName name ) throws Exception { Restriction dto = search.criteria().getRestriction(); checkRestriction( dto, name, elementName, value ); } - private void checkRestriction(Restriction dto, RestrictionName name, + protected void checkRestriction(Restriction dto, RestrictionName name, String element, String value) throws Exception { - assertTrue( dto instanceof BinaryOperator ); + Assert.assertTrue( dto instanceof BinaryOperator ); BinaryOperator bop = (BinaryOperator) dto; - assertEquals( name, dto.getName() ); - assertEquals( element, bop.getElement().getName() ); - assertEquals( value, bop.getValue() ); + Assert.assertEquals( name, dto.getName() ); + Assert.assertEquals( element, bop.getElement().getName() ); + Assert.assertEquals( value, bop.getValue() ); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-09-10 07:44:07 UTC (rev 301) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-09-13 08:56:11 UTC (rev 302) @@ -17,10 +17,6 @@ package org.nuiton.wikitty.api; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.fail; - import java.math.BigDecimal; import java.util.Date; import java.util.LinkedHashMap; @@ -28,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.FieldType; import org.nuiton.wikitty.LabelImpl; @@ -40,7 +37,6 @@ */ public class WikittyUtilTest extends AbstractTestApi { - static private Log log = LogFactory.getLog(WikittyUtilTest.class); /** @@ -52,15 +48,15 @@ String version = null; String expResult = "0.0"; String result = WikittyUtil.normalizeVersion(version); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { String version = ""; String expResult = "0.0"; String result = WikittyUtil.normalizeVersion(version); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } -} + } /** * Test of versionEquals method, of class WikittyUtil. @@ -72,14 +68,14 @@ String v2 = "0.4"; boolean expResult = true; boolean result = WikittyUtil.versionEquals(v1, v2); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { String v1 = "0.4.0"; String v2 = "0.4"; boolean expResult = false; boolean result = WikittyUtil.versionEquals(v1, v2); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } } @@ -92,7 +88,7 @@ String v2 = "4.4"; boolean expResult = true; boolean result = WikittyUtil.versionGreaterThan(v1, v2); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** @@ -104,31 +100,31 @@ String v = ""; String expResult = "0.1"; String result = WikittyUtil.incrementMinorRevision(v); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { String v = "0"; String expResult = "0.1"; String result = WikittyUtil.incrementMinorRevision(v); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { String v = "1.0"; String expResult = "1.1"; String result = WikittyUtil.incrementMinorRevision(v); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { String v = "1.4"; String expResult = "1.5"; String result = WikittyUtil.incrementMinorRevision(v); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { String v = "1.9"; String expResult = "1.10"; String result = WikittyUtil.incrementMinorRevision(v); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } } @@ -146,7 +142,7 @@ String v = "0"; long time = System.currentTimeMillis(); - for (int cpt=0; cpt < MAX; cpt++) { + for (int cpt = 0; cpt < MAX; cpt++) { int i = Integer.parseInt(v) + 1; v = String.valueOf(i); } @@ -154,28 +150,57 @@ v = "0"; time = System.currentTimeMillis(); - for (int cpt=0; cpt < MAX; cpt++) { + for (int cpt = 0; cpt < MAX; cpt++) { v = inc(v); } long timeCall = System.currentTimeMillis() - time; v = "0"; time = System.currentTimeMillis(); - for (int cpt=0; cpt < MAX; cpt++) { - char [] c = v.toCharArray(); + for (int cpt = 0; cpt < MAX; cpt++) { + char[] c = v.toCharArray(); boolean retenue = true; - for (int i=c.length-1; retenue && i>=0; i--) { - switch(c[i]) { - case '0': c[i] = '1'; retenue = false; break; - case '1': c[i] = '2'; retenue = false; break; - case '2': c[i] = '3'; retenue = false; break; - case '3': c[i] = '4'; retenue = false; break; - case '4': c[i] = '5'; retenue = false; break; - case '5': c[i] = '6'; retenue = false; break; - case '6': c[i] = '7'; retenue = false; break; - case '7': c[i] = '8'; retenue = false; break; - case '8': c[i] = '9'; retenue = false; break; - default: c[i] = '0'; break; + for (int i = c.length - 1; retenue && i >= 0; i--) { + switch (c[i]) { + case '0': + c[i] = '1'; + retenue = false; + break; + case '1': + c[i] = '2'; + retenue = false; + break; + case '2': + c[i] = '3'; + retenue = false; + break; + case '3': + c[i] = '4'; + retenue = false; + break; + case '4': + c[i] = '5'; + retenue = false; + break; + case '5': + c[i] = '6'; + retenue = false; + break; + case '6': + c[i] = '7'; + retenue = false; + break; + case '7': + c[i] = '8'; + retenue = false; + break; + case '8': + c[i] = '9'; + retenue = false; + break; + default: + c[i] = '0'; + break; } } if (retenue) { @@ -186,31 +211,61 @@ } long timeSwitch = System.currentTimeMillis() - time; - log.info("Inc parse: " + timeParse + " call: "+ timeCall + " switch: " + timeSwitch + " (" + v + ")"); + log.info("Inc parse: " + timeParse + " call: " + timeCall + " switch: " + + timeSwitch + " (" + v + ")"); } protected String inc(String v) { - char [] c = v.toCharArray(); - boolean retenue = true; - for (int i=c.length-1; retenue && i>=0; i--) { - switch(c[i]) { - case '0': c[i] = '1'; retenue = false; break; - case '1': c[i] = '2'; retenue = false; break; - case '2': c[i] = '3'; retenue = false; break; - case '3': c[i] = '4'; retenue = false; break; - case '4': c[i] = '5'; retenue = false; break; - case '5': c[i] = '6'; retenue = false; break; - case '6': c[i] = '7'; retenue = false; break; - case '7': c[i] = '8'; retenue = false; break; - case '8': c[i] = '9'; retenue = false; break; - default: c[i] = '0'; break; - } + char[] c = v.toCharArray(); + boolean retenue = true; + for (int i = c.length - 1; retenue && i >= 0; i--) { + switch (c[i]) { + case '0': + c[i] = '1'; + retenue = false; + break; + case '1': + c[i] = '2'; + retenue = false; + break; + case '2': + c[i] = '3'; + retenue = false; + break; + case '3': + c[i] = '4'; + retenue = false; + break; + case '4': + c[i] = '5'; + retenue = false; + break; + case '5': + c[i] = '6'; + retenue = false; + break; + case '6': + c[i] = '7'; + retenue = false; + break; + case '7': + c[i] = '8'; + retenue = false; + break; + case '8': + c[i] = '9'; + retenue = false; + break; + default: + c[i] = '0'; + break; } - if (retenue) { - v = "1" + String.valueOf(c); - } else { - v = String.valueOf(c); - } + } + if (retenue) { + v = "1" + String.valueOf(c); + } else { + v = String.valueOf(c); + } return v; } @@ -223,19 +278,19 @@ String v = ""; String expResult = "1.0"; String result = WikittyUtil.incrementMajorRevision(v); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { String v = "0"; String expResult = "1.0"; String result = WikittyUtil.incrementMajorRevision(v); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { String v = "1.5"; String expResult = "2.0"; String result = WikittyUtil.incrementMajorRevision(v); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } } @@ -247,7 +302,7 @@ Object value = null; BigDecimal expResult = new BigDecimal(0); BigDecimal result = WikittyUtil.toBigDecimal(value); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** @@ -258,7 +313,7 @@ Object value = null; boolean expResult = false; boolean result = WikittyUtil.toBoolean(value); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** @@ -269,7 +324,7 @@ Object value = null; String expResult = null; String result = WikittyUtil.toString(value); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** @@ -280,7 +335,7 @@ Object value = null; Date expResult = null; Date result = WikittyUtil.toDate(value); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** @@ -291,7 +346,7 @@ Object value = null; String expResult = null; String result = WikittyUtil.toWikitty(value); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** @@ -303,7 +358,7 @@ Class clazz = Object.class; List<Object> expResult = null; List<Object> result = WikittyUtil.toList(value, clazz); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** @@ -314,7 +369,7 @@ Object value = null; Class expResult = null; Class result = WikittyUtil.getClass(value); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** @@ -327,14 +382,14 @@ Class<Object> clazz = null; Object expResult = null; Object result = WikittyUtil.cast(obj, clazz); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { Object obj = "Toto"; Class<Object> clazz = Object.class; Object expResult = "Toto"; Object result = WikittyUtil.cast(obj, clazz); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } { Object obj = new Object(); @@ -342,57 +397,58 @@ Object expResult = obj; try { Object result = WikittyUtil.cast(obj, clazz); - fail("cast object to string !!!"); + Assert.fail("cast object to string !!!"); } catch (Exception eee) { // ok } } } - + @Test public void testUID() throws Exception { - for ( int i = 0; i < 8; i++ ) { + for (int i = 0; i < 8; i++) { String uid = WikittyUtil.genUID(); log.info("uid = " + uid); } } - + @Test public void testWikittyExtensionBuild() { String extName = "Produit"; - LinkedHashMap<String, FieldType> fields = WikittyUtil.buildFieldMapExtension( - "String name", - "Numeric amount", - "Date buildDate"); + LinkedHashMap<String, FieldType> fields = WikittyUtil + .buildFieldMapExtension("String name", "Numeric amount", + "Date buildDate"); - assertNotNull( fields.get("name") ); - assertNotNull( fields.get("amount") ); - assertNotNull( fields.get("buildDate") ); + Assert.assertNotNull(fields.get("name")); + Assert.assertNotNull(fields.get("amount")); + Assert.assertNotNull(fields.get("buildDate")); WikittyExtension ext = new WikittyExtension(extName, "1", null, fields); - - assertNotNull( ext.getFieldType("name") ); - assertNotNull( ext.getFieldType("amount") ); - assertNotNull( ext.getFieldType("buildDate") ); + + Assert.assertNotNull(ext.getFieldType("name")); + Assert.assertNotNull(ext.getFieldType("amount")); + Assert.assertNotNull(ext.getFieldType("buildDate")); } - + @Test public void testWikittyExtensionTagValue() { String accentValue = "Avèc_dés_açcents"; String floatValue = "3.3"; String dateValue = "2009-12-10T12:45:31:551Z"; String whitespaceCharacters = "ertyuio\n <df ds \r\rf sf >sd f\n\tdf"; - - LinkedHashMap<String, FieldType> fields = WikittyUtil.buildFieldMapExtension( - "String name test=" + accentValue, - "Numeric amount defaultValue=" + floatValue, - "Date buildDate now=" + dateValue); + LinkedHashMap<String, FieldType> fields = WikittyUtil + .buildFieldMapExtension("String name test=" + accentValue, + "Numeric amount defaultValue=" + floatValue, + "Date buildDate now=" + dateValue); + FieldType fieldName = fields.get("name"); - assertEquals(accentValue, fieldName.getTagValue("test")); - assertEquals(floatValue, fields.get("amount").getTagValue("defaultValue")); - assertEquals(dateValue, fields.get("buildDate").getTagValue("now")); + Assert.assertEquals(accentValue, fieldName.getTagValue("test")); + Assert.assertEquals(floatValue, + fields.get("amount").getTagValue("defaultValue")); + Assert.assertEquals(dateValue, + fields.get("buildDate").getTagValue("now")); fieldName.addTagValue("whitespaceCharacters", whitespaceCharacters); String toDefinition = fieldName.toDefinition("name"); @@ -403,35 +459,18 @@ static class MonLabel extends LabelImpl { } - /** - * test newInstance method, and verify that we can configure implementation - * for specifique interface - * @throws Exception - */ - /* Deprecated operation no more tested + /** check that a date is the same after parse and format */ @Test - public void testNewInstance() throws Exception { - Label label = WikittyUtil.newInstance(Label.class, null); - assertNull(label); + public void testDateConsistency() throws Exception { + Date date = WikittyUtil.parseDate("30/01/2009"); + Date dateFormatedAndParsed = WikittyUtil.parseDate(WikittyUtil + .formatDate(date)); + Assert.assertEquals(date, dateFormatedAndParsed); - WikittyUtil.interfaceToClass.put(Label.class, MonLabel.class); - label = WikittyUtil.newInstance(Label.class, null); - assertNull(label); - } - */ - - /** check that a date is the same after parse and format */ - @Test - public void testDateConsistency() throws Exception { - Date date = WikittyUtil.parseDate( "30/01/2009" ); - Date dateFormatedAndParsed = WikittyUtil.parseDate( - WikittyUtil.formatDate(date)); - assertEquals(date, dateFormatedAndParsed); - date = new Date(); - dateFormatedAndParsed = WikittyUtil.parseDate( - WikittyUtil.formatDate(date)); - assertEquals(date, dateFormatedAndParsed); - + dateFormatedAndParsed = WikittyUtil.parseDate(WikittyUtil + .formatDate(date)); + Assert.assertEquals(date, dateFormatedAndParsed); + } }