Author: dlanglais Date: 2010-02-28 18:23:08 +0100 (Sun, 28 Feb 2010) New Revision: 147 Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellTest.java trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnTest.java trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowTest.java trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/StructureTest.java trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/AssertJdomElement.java Log: Utilisation du logger apache.commons.logging au lieu du logger java.util... (mis par d?\195?\169faut pour les exceptions). variable Log renomm?\195?\169e en LOG Les logs d'information d'exception "lev?\195?\169e correctement" transform?\195?\169s en log.trace() (et non erreur). Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -19,7 +19,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(CellTest.class); + private static final Log LOG = LogFactory.getLog(CellTest.class); private Cell<Object> cellActual; private Cell<Object> cell2Actual; @@ -36,7 +36,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } } @@ -54,7 +54,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } cellActual.put(objectExcepted); @@ -77,7 +77,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } cellActual.put(objectExcepted); Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -17,7 +17,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(ColumnTest.class); + private static final Log LOG = LogFactory.getLog(ColumnTest.class); private Column columnActual; private Column column2Actual; @@ -33,7 +33,7 @@ columnActual.get("test"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } } @@ -49,7 +49,7 @@ columnActual.get("object 1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } columnActual.put("object 1", expected); @@ -82,7 +82,7 @@ columnActual.get("integer 1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } assertEquals(columnActual.get("integer 2"), expected2); @@ -94,7 +94,7 @@ columnActual.get("integer 2"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } } Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -11,7 +11,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(RowTest.class); + private static final Log LOG = LogFactory.getLog(RowTest.class); private Structure structureExpected; private Map<String, Object> contentExpected; Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -5,8 +5,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import junit.framework.TestCase; import org.apache.commons.logging.LogFactory; @@ -17,7 +15,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(StructureTest.class); + private static final Log LOG = LogFactory.getLog(StructureTest.class); private Structure structureActual; private Map<String, Class<?>> structureContentActual; @@ -64,13 +62,13 @@ assertEquals(structureContentExpected, structureContentActual); } catch (IllegalArgumentException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (IllegalAccessException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (SecurityException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } } @@ -131,13 +129,13 @@ } catch (IllegalArgumentException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (IllegalAccessException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (SecurityException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } } Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -10,8 +10,6 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import junit.framework.Assert; import junit.framework.TestCase; import org.apache.commons.logging.LogFactory; @@ -26,7 +24,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(TableTest.class); + private static final Log LOG = LogFactory.getLog(TableTest.class); private Table tableActual; private Structure tableStructureActual; @@ -59,13 +57,13 @@ assertEquals(tableColumnsActual, tableColumnsExpected); } catch (IllegalArgumentException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (IllegalAccessException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (SecurityException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } } @@ -120,13 +118,13 @@ assertEquals(tableColumnsActual, tableColumnsExpected); } catch (IllegalArgumentException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (IllegalAccessException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (SecurityException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } } @@ -190,13 +188,13 @@ } catch (IllegalArgumentException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (IllegalAccessException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (SecurityException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } } @@ -243,13 +241,13 @@ assertEquals(expectedInteger2, tableColumns.get("Integer").get("integer2")); } catch (NoSuchFieldException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (SecurityException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (IllegalArgumentException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (IllegalAccessException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } } @@ -465,7 +463,7 @@ tableActual.get("String", "string1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } assertEquals(expectedString2, tableActual.get("String", "string2")); assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); @@ -476,7 +474,7 @@ tableActual.get("String", "string2"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); @@ -486,7 +484,7 @@ tableActual.get("Integer", "integer1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); @@ -495,7 +493,7 @@ tableActual.get("Integer", "integer2"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } } } Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellTest.java =================================================================== --- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -1,7 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.bighashmapv2; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.CellImpl; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.Cell; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -21,7 +19,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(CellTest.class); + private static final Log LOG = LogFactory.getLog(CellTest.class); private Cell cellActual; private Cell cell2Actual; @@ -38,7 +36,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } } @@ -56,7 +54,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } cellActual.put(objectExpected1); @@ -79,7 +77,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } cellActual.put(objectExpected1); Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnTest.java =================================================================== --- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -17,7 +17,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(ColumnTest.class); + private static final Log LOG = LogFactory.getLog(ColumnTest.class); private Column columnActual1; private Column columnActual2; @@ -33,7 +33,7 @@ columnActual1.get("test"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } } @@ -49,7 +49,7 @@ columnActual1.get("object 1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + LOG.trace("Exception levée correctement"); } columnActual1.put("object 1", expected1); @@ -82,7 +82,7 @@ columnActual1.get("integer 1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } assertEquals(columnActual1.get("integer 2"), expected2); @@ -94,7 +94,7 @@ columnActual1.get("integer 2"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } } Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowTest.java =================================================================== --- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -1,9 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.bighashmapv2; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.StructureImpl; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.Row; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.RowImpl; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.Structure; import java.util.HashMap; import java.util.Map; import junit.framework.TestCase; @@ -15,7 +11,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(RowTest.class); + private static final Log LOG = LogFactory.getLog(RowTest.class); private Structure structureExpected; private Map<String, String> contentExpected; Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/StructureTest.java =================================================================== --- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/StructureTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/StructureTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -1,12 +1,8 @@ package org.nuiton.mapstoragemanager.plugins.bighashmapv2; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.StructureImpl; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.Structure; import java.lang.reflect.Field; import java.util.HashSet; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import junit.framework.TestCase; import org.apache.commons.logging.LogFactory; @@ -17,7 +13,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(StructureTest.class); + private static final Log LOG = LogFactory.getLog(StructureTest.class); private Structure structureActual; private Set<String> structureContentActual; @@ -64,13 +60,13 @@ assertEquals(structureContentExpected, structureContentActual); } catch (IllegalArgumentException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (IllegalAccessException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (SecurityException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } } @@ -131,13 +127,13 @@ } catch (IllegalArgumentException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (IllegalAccessException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } catch (SecurityException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } } Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java =================================================================== --- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-02-28 17:23:08 UTC (rev 147) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.nuiton.mapstoragemanager.plugins.bighashmapv2; import java.lang.reflect.Field; @@ -10,8 +6,6 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import junit.framework.Assert; import junit.framework.TestCase; import org.apache.commons.logging.LogFactory; @@ -26,7 +20,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(TableTest.class); + private static final Log LOG = LogFactory.getLog(TableTest.class); private Table tableActual; private Structure tableStructureActual; @@ -61,13 +55,13 @@ tableColumnsExpected.toString()); } catch (IllegalArgumentException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (IllegalAccessException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (SecurityException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } } @@ -128,13 +122,13 @@ tableColumnsExpected.toString()); } catch (IllegalArgumentException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (IllegalAccessException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (SecurityException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } } @@ -204,13 +198,13 @@ } catch (IllegalArgumentException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (IllegalAccessException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (NoSuchFieldException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (SecurityException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } } @@ -257,13 +251,13 @@ assertEquals(expectedInteger2, tableColumns.get("Integer").get("integer2")); } catch (NoSuchFieldException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (SecurityException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (IllegalArgumentException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } catch (IllegalAccessException ex) { - Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex,ex); } } @@ -479,7 +473,7 @@ tableActual.get("String", "string1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } assertEquals(expectedString2, tableActual.get("String", "string2")); assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); @@ -490,7 +484,7 @@ tableActual.get("String", "string2"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); @@ -500,7 +494,7 @@ tableActual.get("Integer", "integer1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); @@ -509,7 +503,7 @@ tableActual.get("Integer", "integer2"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement."); + LOG.trace("Exception levée correctement."); } } } Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/AssertJdomElement.java =================================================================== --- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/AssertJdomElement.java 2010-02-28 16:50:11 UTC (rev 146) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/AssertJdomElement.java 2010-02-28 17:23:08 UTC (rev 147) @@ -23,7 +23,10 @@ */ private static final Log LOG = LogFactory.getLog(AssertJdomElement.class); - private static boolean test = false; + /** + * trace or not. + */ + private static boolean trace = false; /** * Test if to Element are equivalent. @@ -34,8 +37,8 @@ public static void assertEquivalent(Element expected, Element actual) throws AssertionFailedError { - if(test) { - System.out.println("---------------------------------------------"); + if(trace) { + LOG.trace("------------------------------------------------------"); } String expectedElementName = expected.getName(); @@ -81,8 +84,8 @@ } } - if(test) { - LOG.info("Attribues" + if(trace) { + LOG.trace("Attribues" + '\n' + expectedAttributes + '\n' + actualAttributes + '\n' + "Children" @@ -97,8 +100,8 @@ throw new AssertionFailedError(); // return; } else if (expectedChildren.isEmpty()) { - if(test) { - LOG.info(expectedValue + '\n' + actualValue); + if(trace) { + LOG.trace(expectedValue + '\n' + actualValue); } if (!expected.getValue().equals(actual.getValue())) { throw new AssertionFailedError(); @@ -121,7 +124,7 @@ TF = true; } catch (AssertionFailedError e) { - LOG.error(e); + LOG.trace(e); } /*if (testEquals(expectedChild,actualChild)) { // actualChildren.remove(actualChild); @@ -141,8 +144,8 @@ } } if (TF == false) { - if(test) { - LOG.info("RETURN FALSE"); + if(trace) { + LOG.trace("RETURN FALSE"); } throw new AssertionFailedError(); } @@ -157,14 +160,14 @@ assertEquivalent(expected, actual); } catch (AssertionFailedError e) { - if(test) { - LOG.info(expected.toString() + if(trace) { + LOG.trace(expected.toString() + ' ' + actual.toString() + " : not equals"); } return; } - if(test) { - LOG.info(expected.toString() + if(trace) { + LOG.trace(expected.toString() + ' ' + actual.toString() + " : equals"); } throw new AssertionFailedError();
participants (1)
-
dlanglais＠users.nuiton.org