r35 - in trunk/src: main/java/org/nuiton/mapstoragemanager/plugins/bighashmap test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
Author: dlanglais Date: 2010-01-28 19:54:05 +0100 (Thu, 28 Jan 2010) New Revision: 35 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java Log: Ajout de logger au lieu de system.out.println... Refactoring Structure (remove->delete, add->create)... Passage en private des attributs des classes de test... Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-01-28 18:01:26 UTC (rev 34) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-01-28 18:54:05 UTC (rev 35) @@ -15,7 +15,7 @@ * @param columnName the column name * @param columnClass the column class */ - void addColumn(String columnName, Class < ? > columnClass); + void createColumn(String columnName, Class < ? > columnClass); /** * Get the columns' names. * @return return a set containing the name of the columns. @@ -31,5 +31,18 @@ * Remove a column of the structure by its name. * @param columnName the column name */ - void removeColumn(String columnName); + void deleteColumn(String columnName); + + /** + * get the hashCode of the structure. + * @return return the hashCode of the structure. + */ + int hashCode(); + + /** + * Permit to verify if this is equals to another object. + * @param another the object to compare + * @return true if this is equals to <b>another</b> + */ + boolean equals(Object another); } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-01-28 18:01:26 UTC (rev 34) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-01-28 18:54:05 UTC (rev 35) @@ -29,7 +29,7 @@ /** * {@inheritDoc} */ - public final void addColumn(final String columnName, + public final void createColumn(final String columnName, final Class < ? /**extends Serializable*/ > columnClass) { this.structure.put(columnName, columnClass); } @@ -37,7 +37,7 @@ /** * {@inheritDoc} */ - public final void removeColumn(final String columnName) { + public final void deleteColumn(final String columnName) { this.structure.remove(columnName); } @@ -55,4 +55,23 @@ public final Set < String > getColumnsNames() { return this.structure.keySet(); } + + /** + * {@inheritDoc} + */ + public final int hashCode(){ + return this.structure.hashCode(); + } + /** + * {@inheritDoc} + */ + public final boolean equals(Object another) { + if(another instanceof StructureImpl) { + StructureImpl otherStructure = (StructureImpl) another; + + return this.structure.equals(otherStructure.structure); + } else { + return false; + } + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-28 18:01:26 UTC (rev 34) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-28 18:54:05 UTC (rev 35) @@ -15,7 +15,7 @@ * Table. * hashMap with key as column name and value, a colum of the table. */ - private Map < String, Column < ? > > tableContent; + private Map < String, Column < ? > > tableColumns; /** * Structure of the table. */ @@ -25,7 +25,7 @@ * Default constructor. */ public TableImpl() { - this.tableContent = new HashMap < String, Column < ? > > (); + this.tableColumns = new HashMap < String, Column < ? > > (); this.tableStructure = new StructureImpl(); } @@ -35,16 +35,16 @@ public final < columnClass /**extends Serializable*/ > void createColumn( final String columnName, final Class < ? > columnClass) { ColumnImpl < columnClass > column = new ColumnImpl < columnClass > (); - this.tableContent.put(columnName, column); - this.tableStructure.addColumn(columnName, columnClass); + this.tableColumns.put(columnName, column); + this.tableStructure.createColumn(columnName, columnClass); } /** * {@inheritDoc} */ public final void deleteColumn(final String columnName) { - this.tableContent.remove(columnName); - this.tableStructure.removeColumn(columnName); + this.tableColumns.remove(columnName); + this.tableStructure.deleteColumn(columnName); } /** @@ -55,7 +55,7 @@ new HashMap < String, Object > (); for (String columnName : tableStructure.getColumnsNames()) { rowContent.put(columnName, - tableContent.get(columnName).get(key)); + tableColumns.get(columnName).get(key)); } return new RowImpl(tableStructure, rowContent); } @@ -64,7 +64,7 @@ * {@inheritDoc} */ public void removeRow(final String key) { - for (Column column : tableContent.values()) { + for (Column column : tableColumns.values()) { column.delete(key); } } Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-28 18:01:26 UTC (rev 34) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-28 18:54:05 UTC (rev 35) @@ -1,5 +1,8 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.nuiton.mapstoragemanager.plugins.bighashmap.Cell; import java.util.NoSuchElementException; @@ -13,11 +16,13 @@ * */ public final class CellTest extends TestCase { + + private static final Log log = LogFactory.getLog(CellTest.class); - Cell < Object > cellActual; - Object objectExcepted; - Object object2Excepted; - Object object3Excepted; + private Cell < Object > cellActual; + private Object objectExcepted; + private Object object2Excepted; + private Object object3Excepted; /** * On teste le comportement de get avec une cellule vide. @@ -28,7 +33,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - System.out.println("Exception levée correctement"); + log.info("Exception levée correctement"); } } @@ -46,7 +51,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - System.out.println("Exception levée correctement"); + log.info("Exception levée correctement"); } cellActual.put(objectExcepted); @@ -69,7 +74,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - System.out.println("Exception levée correctement"); + log.info("Exception levée correctement"); } cellActual.put(objectExcepted); Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-28 18:01:26 UTC (rev 34) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-28 18:54:05 UTC (rev 35) @@ -2,13 +2,18 @@ import java.util.NoSuchElementException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import junit.framework.Assert; import junit.framework.TestCase; public final class ColumnTest extends TestCase { - Column columnActual; - Object objectExpected; + private static final Log log = LogFactory.getLog(ColumnTest.class); + + private Column columnActual; + private Object objectExpected; /** * On teste le comportement de get avec une cellule vide. */ @@ -18,7 +23,7 @@ columnActual.get("test"); Assert.fail(); } catch (NoSuchElementException e) { - System.out.println("Exception levée correctement"); + log.info("Exception levée correctement"); } } @@ -35,7 +40,7 @@ columnActual.get("object 1"); Assert.fail(); } catch (NoSuchElementException e) { - System.out.println("Exception levée correctement"); + log.info("Exception levée correctement"); } columnActual.put("object 1", objectExpected); Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-01-28 18:01:26 UTC (rev 34) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-01-28 18:54:05 UTC (rev 35) @@ -3,13 +3,17 @@ import java.util.HashMap; import java.util.Map; import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; public class RowTest extends TestCase { - Structure structureExpected; - Map<String,Object> contentExpected; - Row rowActual; + private static final Log log = LogFactory.getLog(RowTest.class); + private Structure structureExpected; + private Map<String,Object> contentExpected; + private Row rowActual; + public void testToString() { { structureExpected = new StructureImpl(); @@ -21,7 +25,7 @@ { structureExpected = new StructureImpl(); - structureExpected.addColumn("Test", String.class); + structureExpected.createColumn("Test", String.class); contentExpected = new HashMap<String, Object>(); contentExpected.put("Test", "StringDeTest"); rowActual = new RowImpl(structureExpected, contentExpected); @@ -31,9 +35,9 @@ { structureExpected = new StructureImpl(); - structureExpected.addColumn("Test1", String.class); - structureExpected.addColumn("Test2", Integer.class); - structureExpected.addColumn("Test3", Double.class); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); contentExpected = new HashMap<String, Object>(); contentExpected.put("Test1", "StringDeTest"); contentExpected.put("Test2", new Integer(1)); @@ -55,7 +59,7 @@ { structureExpected = new StructureImpl(); - structureExpected.addColumn("Test", String.class); + structureExpected.createColumn("Test", String.class); contentExpected = new HashMap<String, Object>(); contentExpected.put("Test", "StringDeTest"); rowActual = new RowImpl(structureExpected, contentExpected); @@ -65,9 +69,9 @@ { structureExpected = new StructureImpl(); - structureExpected.addColumn("Test1", String.class); - structureExpected.addColumn("Test2", Integer.class); - structureExpected.addColumn("Test3", Double.class); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); contentExpected = new HashMap<String, Object>(); contentExpected.put("Test1", "StringDeTest"); contentExpected.put("Test2", new Integer(1)); @@ -89,7 +93,7 @@ { structureExpected = new StructureImpl(); - structureExpected.addColumn("Test", String.class); + structureExpected.createColumn("Test", String.class); contentExpected = new HashMap<String, Object>(); contentExpected.put("Test", "StringDeTest"); rowActual = new RowImpl(structureExpected, contentExpected); @@ -99,9 +103,9 @@ { structureExpected = new StructureImpl(); - structureExpected.addColumn("Test1", String.class); - structureExpected.addColumn("Test2", Integer.class); - structureExpected.addColumn("Test3", Double.class); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); contentExpected = new HashMap<String, Object>(); contentExpected.put("Test1", "StringDeTest"); contentExpected.put("Test2", new Integer(1)); @@ -123,7 +127,7 @@ { structureExpected = new StructureImpl(); - structureExpected.addColumn("Test", String.class); + structureExpected.createColumn("Test", String.class); contentExpected = new HashMap<String, Object>(); contentExpected.put("Test", "StringDeTest"); rowActual = new RowImpl(structureExpected, contentExpected); @@ -133,9 +137,9 @@ { structureExpected = new StructureImpl(); - structureExpected.addColumn("Test1", String.class); - structureExpected.addColumn("Test2", Integer.class); - structureExpected.addColumn("Test3", Double.class); + structureExpected.createColumn("Test1", String.class); + structureExpected.createColumn("Test2", Integer.class); + structureExpected.createColumn("Test3", Double.class); contentExpected = new HashMap<String, Object>(); contentExpected.put("Test1", "StringDeTest"); contentExpected.put("Test2", new Integer(1)); Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-01-28 18:01:26 UTC (rev 34) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-01-28 18:54:05 UTC (rev 35) @@ -9,18 +9,22 @@ import java.util.logging.Logger; import junit.framework.TestCase; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; public class StructureTest extends TestCase { - Structure structureActual; - Map < String, Class < ? > > structureContentActual; - Map < String, Class < ? > > structureContentExpected; + private static final Log log = LogFactory.getLog(StructureTest.class); - Class < ? > columnsClassActual; - Class < ? > columnsClassExpected; + private Structure structureActual; + private Map < String, Class < ? > > structureContentActual; + private Map < String, Class < ? > > structureContentExpected; - Set < String > columnsNamesActual; - Set < String > columnsNamesExpected; + private Class < ? > columnsClassActual; + private Class < ? > columnsClassExpected; + + private Set < String > columnsNamesActual; + private Set < String > columnsNamesExpected; public void testGetColumnsNamesVoid() { structureActual = new StructureImpl(); @@ -46,15 +50,15 @@ (Map < String, Class < ? > >) fStructure.get(structureActual); - structureActual.addColumn("Test1", String.class); + structureActual.createColumn("Test1", String.class); structureContentExpected.put("Test1", String.class); assertEquals(structureContentExpected, structureContentActual); - structureActual.addColumn("Test2", Object.class); + structureActual.createColumn("Test2", Object.class); structureContentExpected.put("Test2", Object.class); assertEquals(structureContentExpected, structureContentActual); - structureActual.addColumn("Test3", Map.class); + structureActual.createColumn("Test3", Map.class); structureContentExpected.put("Test3", Map.class); assertEquals(structureContentExpected, structureContentActual); @@ -89,37 +93,37 @@ (Map < String, Class < ? > >) fStructure.get(structureActual); - structureActual.addColumn("Test1", String.class); + structureActual.createColumn("Test1", String.class); structureContentExpected.put("Test1", String.class); - structureActual.addColumn("Test2", Object.class); + structureActual.createColumn("Test2", Object.class); structureContentExpected.put("Test2", Object.class); - structureActual.addColumn("Test3", Map.class); + structureActual.createColumn("Test3", Map.class); structureContentExpected.put("Test3", Map.class); assertEquals(structureContentExpected, structureContentActual); - structureActual.removeColumn("Test1"); + structureActual.deleteColumn("Test1"); structureContentExpected.remove("Test1"); assertEquals(structureContentExpected, structureContentActual); /** * the key "Test1TOTO" is not in the structure. */ - structureActual.removeColumn("Test1TOTO"); + structureActual.deleteColumn("Test1TOTO"); structureContentExpected.remove("Test1TOTO"); assertEquals(structureContentExpected, structureContentActual); - structureActual.removeColumn("Test2"); + structureActual.deleteColumn("Test2"); structureContentExpected.remove("Test2"); assertEquals(structureContentExpected, structureContentActual); - structureActual.removeColumn("Test3"); + structureActual.deleteColumn("Test3"); structureContentExpected.remove("Test3"); assertEquals(structureContentExpected, structureContentActual); /** * We try to remove an other key, but the map is empty. */ - structureActual.removeColumn("Test4"); + structureActual.deleteColumn("Test4"); structureContentExpected.remove("Test4"); assertEquals(structureContentExpected, structureContentActual); @@ -150,41 +154,41 @@ columnsNamesActual = structureActual.getColumnsNames(); - structureActual.addColumn("Test1", String.class); + structureActual.createColumn("Test1", String.class); columnsNamesExpected.add("Test1"); assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.addColumn("Test2", Object.class); + structureActual.createColumn("Test2", Object.class); columnsNamesExpected.add("Test2"); assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.addColumn("Test3", Map.class); + structureActual.createColumn("Test3", Map.class); columnsNamesExpected.add("Test3"); assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.removeColumn("Test1"); + structureActual.deleteColumn("Test1"); columnsNamesExpected.remove("Test1"); assertEquals(columnsNamesExpected, columnsNamesActual); /** * the key "Test1TOTO" is not in the structure. */ - structureActual.removeColumn("Test1TOTO"); + structureActual.deleteColumn("Test1TOTO"); columnsNamesExpected.remove("Test1TOTO"); assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.removeColumn("Test2"); + structureActual.deleteColumn("Test2"); columnsNamesExpected.remove("Test2"); assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.removeColumn("Test3"); + structureActual.deleteColumn("Test3"); columnsNamesExpected.remove("Test3"); assertEquals(columnsNamesExpected, columnsNamesActual); /** * We try to remove an other key, but the map is empty. */ - structureActual.removeColumn("Test4"); + structureActual.deleteColumn("Test4"); columnsNamesExpected.remove("Test4"); assertEquals(columnsNamesExpected, columnsNamesActual); @@ -208,7 +212,7 @@ /** * We put "Test1" */ - s.addColumn("Test1", String.class); + s.createColumn("Test1", String.class); columnsClassActual = s.getColumnClass("Test1"); columnsClassExpected = String.class; assertEquals(columnsClassExpected, columnsClassActual); @@ -216,7 +220,7 @@ /** * We put "Test2" */ - s.addColumn("Test2", Object.class); + s.createColumn("Test2", Object.class); columnsClassActual = s.getColumnClass("Test1"); columnsClassExpected = String.class; assertEquals(columnsClassExpected, columnsClassActual); @@ -227,7 +231,7 @@ /** * We put "Test3" */ - s.addColumn("Test3", Map.class); + s.createColumn("Test3", Map.class); columnsClassActual = s.getColumnClass("Test1"); columnsClassExpected = String.class; assertEquals(columnsClassExpected, columnsClassActual); @@ -241,7 +245,7 @@ /** * we remove "Test1" */ - s.removeColumn("Test1"); + s.deleteColumn("Test1"); columnsClassActual = s.getColumnClass("Test1"); columnsClassExpected = null; assertEquals(columnsClassExpected, columnsClassActual); @@ -256,7 +260,7 @@ * the key "Test1TOTO" is not in the structure. * We try to remove it. */ - s.removeColumn("Test1TOTO"); + s.deleteColumn("Test1TOTO"); columnsClassActual = s.getColumnClass("Test1TOTO"); columnsClassExpected = null; assertEquals(columnsClassExpected, columnsClassActual); @@ -270,7 +274,7 @@ /** * We remove "Test2" */ - s.removeColumn("Test2"); + s.deleteColumn("Test2"); assertEquals(columnsClassExpected, columnsClassActual); columnsClassActual = s.getColumnClass("Test2"); columnsClassExpected = null; @@ -282,7 +286,7 @@ /** * We remove "Test3" */ - s.removeColumn("Test3"); + s.deleteColumn("Test3"); assertEquals(columnsClassExpected, columnsClassActual); columnsClassActual = s.getColumnClass("Test3"); columnsClassExpected = null; @@ -291,7 +295,7 @@ /** * We try to remove an other key, but the map is empty. */ - s.removeColumn("Test4"); + s.deleteColumn("Test4"); columnsClassActual = s.getColumnClass("Test4"); columnsClassExpected = null;
participants (1)
-
dlanglais@users.nuiton.org