[Mapstoragemanager-commits] r36 - in trunk/src: main/java/org/nuiton/mapstoragemanager/core main/java/org/nuiton/mapstoragemanager/plugins/bighashmap test/java/org/nuiton/mapstoragemanager/core test/java/org/nuiton/mapstoragemanager/plugins/bighashmap

Author: dlanglais Date: 2010-01-28 22:02:49 +0100 (Thu, 28 Jan 2010) New Revision: 36 Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 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/Table.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.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: (oula... j'aurais peut-?\195?\170tre du commit un peu plus t?\195?\180t..) "checkstyle" sur plusieurs fichiers auxquels j'ai touch?\195?\169 (prise en compte de la remarque concernant les tabulations au lieu d'espaces.. (netBeans non configur?\195?\169). Ajout de fonctions 'non fonctionnelles' : toString(), hashCode() et equals() sur certaines classes (utiles notamment pour les assertions. Cr?\195?\169ation d'une classe de test de Table. Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-01-28 21:02:49 UTC (rev 36) @@ -17,7 +17,7 @@ /** * The BigTable Set Loader. */ - private ServiceLoader < BigTable > bigTableSetLoader; + private ServiceLoader<BigTable> bigTableSetLoader; /** * Class constructor. @@ -26,10 +26,10 @@ * @throws MalformedURLException if the plugin folder is not found */ public BigTableLoader(final String pluginsFolderPath, - final ClassLoader classLoader) throws MalformedURLException { + final ClassLoader classLoader) throws MalformedURLException { super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, - classLoader); + classLoader); for (File file : new File(pluginsFolderPath).listFiles()) { if (file.getAbsolutePath().endsWith(".jar")) { @@ -54,15 +54,15 @@ s += "\t* "; if (!bigTableSetLoader.iterator().hasNext()) { - s += "No plugin."; + s += "No plugin."; } else { for (BigTable bt : bigTableSetLoader) { s += bt.getClass().getName(); bt.put("key", "value"); if (bt.get("key").equals("value")) { - s += " (working)" + "\n"; + s += " (working)" + "\n"; } else { - s += " (not working)" + "\n"; + s += " (not working)" + "\n"; } } } @@ -73,8 +73,7 @@ * Returns the BigTable Set Loader. * @return the BigTable Set Loader */ - public final ServiceLoader < BigTable > getBigTableSetLoader() { + public final ServiceLoader<BigTable> getBigTableSetLoader() { return bigTableSetLoader; } - } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-01-28 21:02:49 UTC (rev 36) @@ -6,7 +6,7 @@ * * @param <T> Class of the object stored in the cells. */ -public interface Cell < T > { +public interface Cell<T> { /** * Get the most recent object put in the cell. @@ -26,4 +26,9 @@ * @return The object corresponding to the "version". */ T get(Long t); + + /** + * toString(). + */ + String toString(); } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-28 21:02:49 UTC (rev 36) @@ -12,19 +12,20 @@ * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. * @licence GPL. */ -public class CellImpl < T /**extends Serializable*/ > implements Cell < T > { +public class CellImpl<T /**extends Serializable*/ + > implements Cell<T> { /** * cell. * hashMap with key as timestamp and value, as object of T class. */ - private Map < Long, T > cell; + private Map<Long, T> cell; /** * Default constructor. */ public CellImpl() { - this.cell = new HashMap < Long, T > (); + this.cell = new HashMap<Long, T>(); } /** @@ -32,7 +33,7 @@ * @param t The object to store. */ public CellImpl(T t) { - this.cell = new HashMap < Long, T > (); + this.cell = new HashMap<Long, T>(); this.put(t); } @@ -65,4 +66,11 @@ } return cell.get(max); } + + /** + * {@inheritDoc} + */ + public final String toString() { + return ((T) this.get()).toString(); + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-28 21:02:49 UTC (rev 36) @@ -6,7 +6,7 @@ * * @param <T> Class of the object stored in the columns. */ -public interface Column < T > { +public interface Column<T> { /** * Get the object which has key <b>key</key>. @@ -35,4 +35,20 @@ * @param key the key */ void delete(String key); + + /** + * toString(). + */ + String toString(); + + /** + * hashCode(). + * @return + */ + int hashCode(); + + /** + * equals(). + */ + boolean equals(Object o); } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-28 21:02:49 UTC (rev 36) @@ -10,22 +10,22 @@ * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. * @licence GPL. */ -public class ColumnImpl < T /**extends Serializable*/ > implements Column < T > { +public class ColumnImpl<T /**extends Serializable*/ + > implements Column<T> { /** * column. * hashMap with key the key of the line, and value a column. */ - private Map < String, CellImpl < T > > column; + private Map<String, CellImpl<T>> column; /** * Default constructor. */ public ColumnImpl() { - column = new HashMap < String, CellImpl < T > > (); + column = new HashMap<String, CellImpl<T>>(); } - /** * {@inheritDoc} */ @@ -50,7 +50,7 @@ try { this.column.get(key).put(content); } catch (NullPointerException e) { - this.column.put(key, new CellImpl < T > (content)); + this.column.put(key, new CellImpl<T>(content)); } } @@ -60,4 +60,39 @@ public final void delete(final String key) { this.column.remove(key); } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret = ""; + + for (String key : column.keySet()) { + ret += key + column.get(key); + } + + return ret; + } + + /** + * {@inheritDoc} + */ + public final int hashCode() { + return column.hashCode(); + } + + /** + * {@inheritDoc} + */ + public boolean equals(Object o) { + if (o instanceof Column) { + + ColumnImpl other = (ColumnImpl) o; + + return other.column.equals(this.column); + + } else { + return false; + } + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-01-28 21:02:49 UTC (rev 36) @@ -15,22 +15,22 @@ */ String toString(); - /** - * Get row structure. - * @return the row structure - */ - Structure getRowStructure(); + /** + * Get row structure. + * @return the row structure + */ + Structure getRowStructure(); - /** - * Get row content. - * @return the row content - */ - Map<String, Object> getRowContent(); + /** + * Get row content. + * @return the row content + */ + Map<String, Object> getRowContent(); - /** - * Get an element of the row. - * @param columnName the column name. - * @return the content of the "cell". - */ - Object getContent(String columnName); + /** + * Get an element of the row. + * @param columnName the column name. + * @return the content of the "cell". + */ + Object getContent(String columnName); } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-01-28 21:02:49 UTC (rev 36) @@ -17,7 +17,7 @@ /** * Content of the row. */ - private Map < String, Object > rowContent; + private Map<String, Object> rowContent; /** * Row constructor. @@ -25,9 +25,9 @@ * @param content the row content */ public RowImpl(final Structure struct, - final Map < String, Object > content) { + final Map<String, Object> content) { this.rowStructure = struct; - this.rowContent = new HashMap < String, Object > (); + this.rowContent = new HashMap<String, Object>(); for (String columnName : struct.getColumnsNames()) { rowContent.put(columnName, content.get(columnName)); } @@ -36,17 +36,17 @@ /** * {@inheritDoc} */ - public Structure getRowStructure() { - return rowStructure; - } + public Structure getRowStructure() { + return rowStructure; + } - /** + /** * {@inheritDoc} */ - public Map<String, Object> getRowContent() { - return rowContent; - } - + public Map<String, Object> getRowContent() { + return rowContent; + } + /** * {@inheritDoc} */ @@ -59,7 +59,7 @@ /** * {@inheritDoc} */ - public Object getContent(String columnName) { - return rowContent.get(columnName); - } + public Object getContent(String columnName) { + return rowContent.get(columnName); + } } 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:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-01-28 21:02:49 UTC (rev 36) @@ -15,34 +15,37 @@ * @param columnName the column name * @param columnClass the column class */ - void createColumn(String columnName, Class < ? > columnClass); + void createColumn(String columnName, Class<?> columnClass); + /** * Get the columns' names. * @return return a set containing the name of the columns. */ - Set < String > getColumnsNames(); + Set<String> getColumnsNames(); + /** * Get the class of object of the column <b>columnName</b>. * @param columnName the column name * @return return the column class */ - Class < ? > getColumnClass(String columnName); + Class<?> getColumnClass(String columnName); + /** * Remove a column of the structure by its name. * @param columnName the column name */ void deleteColumn(String columnName); - /** - * get the hashCode of the structure. - * @return return the hashCode of the structure. - */ - int hashCode(); + /** + * 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); + /** + * 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 o); } 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:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-01-28 21:02:49 UTC (rev 36) @@ -16,21 +16,24 @@ * structure. * hashMap with key the column name, and value the column class. */ - private Map < String, Class < ? /**extends Serializable*/ > > structure; + private Map<String, Class<? /**extends Serializable*/ + >> structure; /** * Default constructor. */ public StructureImpl() { this.structure = - new HashMap < String, Class < ? /**extends Serializable*/ > > (); + new HashMap<String, Class<? /**extends Serializable*/ + >>(); } /** * {@inheritDoc} */ public final void createColumn(final String columnName, - final Class < ? /**extends Serializable*/ > columnClass) { + final Class<? /**extends Serializable*/ + > columnClass) { this.structure.put(columnName, columnClass); } @@ -44,34 +47,37 @@ /** * {@inheritDoc} */ - public final Class < ? /**extends Serializable*/ > getColumnClass( - final String columnName) { + public final Class<? /**extends Serializable*/ + > getColumnClass( + final String columnName) { return this.structure.get(columnName); } /** * {@inheritDoc} */ - public final Set < String > getColumnsNames() { + 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; + /** + * {@inheritDoc} + */ + public final int hashCode() { + return this.structure.hashCode(); + } - return this.structure.equals(otherStructure.structure); - } else { - return false; - } - } + /** + * {@inheritDoc} + */ + public final boolean equals(Object o) { + if (o instanceof StructureImpl) { + StructureImpl another = (StructureImpl) o; + + return this.structure.equals(another.structure); + + } else { + return false; + } + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-28 21:02:49 UTC (rev 36) @@ -14,8 +14,8 @@ * @param columnClass the column class * @param <columnClass> generics to spécify the class of the stored objects. */ - < columnClass > void createColumn(final String columnName, - final Class < ? > columnClass); + <columnClass> void createColumn(final String columnName, + final Class<?> columnClass); /** * Delete a colum of the table. 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:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-28 21:02:49 UTC (rev 36) @@ -15,7 +15,7 @@ * Table. * hashMap with key as column name and value, a colum of the table. */ - private Map < String, Column < ? > > tableColumns; + private Map<String, Column<?>> tableColumns; /** * Structure of the table. */ @@ -25,16 +25,17 @@ * Default constructor. */ public TableImpl() { - this.tableColumns = new HashMap < String, Column < ? > > (); + this.tableColumns = new HashMap<String, Column<?>>(); this.tableStructure = new StructureImpl(); } /** * {@inheritDoc} */ - public final < columnClass /**extends Serializable*/ > void createColumn( - final String columnName, final Class < ? > columnClass) { - ColumnImpl < columnClass > column = new ColumnImpl < columnClass > (); + public final <columnClass /**extends Serializable*/ + > void createColumn( + final String columnName, final Class<?> columnClass) { + ColumnImpl<columnClass> column = new ColumnImpl<columnClass>(); this.tableColumns.put(columnName, column); this.tableStructure.createColumn(columnName, columnClass); } @@ -51,11 +52,11 @@ * {@inheritDoc} */ public final Row getRow(final String key) { - Map < String, Object > rowContent = - new HashMap < String, Object > (); + Map<String, Object> rowContent = + new HashMap<String, Object>(); for (String columnName : tableStructure.getColumnsNames()) { rowContent.put(columnName, - tableColumns.get(columnName).get(key)); + tableColumns.get(columnName).get(key)); } return new RowImpl(tableStructure, rowContent); } @@ -64,7 +65,7 @@ * {@inheritDoc} */ public void removeRow(final String key) { - for (Column column : tableColumns.values()) { + for (Column column : tableColumns.values()) { column.delete(key); } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java 2010-01-28 21:02:49 UTC (rev 36) @@ -3,4 +3,4 @@ * package BigHashMap. * permet la représentation sous forme de hashMap d'une base de données selon * la spécification bigTable. - */ \ No newline at end of file + */ Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java 2010-01-28 18:54:05 UTC (rev 35) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java 2010-01-28 21:02:49 UTC (rev 36) @@ -1,4 +1,3 @@ - package org.nuiton.mapstoragemanager.core; import java.net.MalformedURLException; @@ -54,7 +53,7 @@ // FIXME-FD20100128 NPE : // java.lang.NullPointerException at org.nuiton.mapstoragemanager.core.BigTableLoader.<init>(BigTableLoader.java:34) - + //Assert.assertNotNull(p.getBigTable()); } @@ -65,5 +64,4 @@ public void testGetBigTableSetLoader() { log.info("getBigTableSetLoader"); } - -} \ No newline at end of file +} 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:54:05 UTC (rev 35) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-28 21:02:49 UTC (rev 36) @@ -16,24 +16,23 @@ * */ public final class CellTest extends TestCase { - - private static final Log log = LogFactory.getLog(CellTest.class); - private Cell < Object > cellActual; - private Object objectExcepted; - private Object object2Excepted; - private Object object3Excepted; - + private static final Log log = LogFactory.getLog(CellTest.class); + private Cell<Object> cellActual; + private Object objectExcepted; + private Object object2Excepted; + private Object object3Excepted; + /** * On teste le comportement de get avec une cellule vide. */ public void testGetVoid() { - cellActual = new CellImpl < Object > (); + cellActual = new CellImpl<Object>(); try { assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + log.info("Exception levée correctement"); } } @@ -43,7 +42,7 @@ */ public void testPut() { - cellActual = new CellImpl < Object > (); + cellActual = new CellImpl<Object>(); objectExcepted = new Object(); @@ -51,7 +50,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + log.info("Exception levée correctement"); } cellActual.put(objectExcepted); @@ -66,7 +65,7 @@ */ public void testPutReput() { - cellActual = new CellImpl < Object > (); + cellActual = new CellImpl<Object>(); objectExcepted = new Object(); @@ -74,7 +73,7 @@ assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { - log.info("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:54:05 UTC (rev 35) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-28 21:02:49 UTC (rev 36) @@ -11,19 +11,19 @@ public final class ColumnTest extends TestCase { private static final Log log = LogFactory.getLog(ColumnTest.class); + private Column columnActual; + private Object objectExpected; - private Column columnActual; - private Object objectExpected; /** * On teste le comportement de get avec une cellule vide. */ public void testGetVoid() { - columnActual = new ColumnImpl < Object > (); + columnActual = new ColumnImpl<Object>(); try { columnActual.get("test"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("Exception levée correctement"); + log.info("Exception levée correctement"); } } @@ -32,7 +32,7 @@ * On tente de récupérer celui-ci. */ public void testPut() { - columnActual = new ColumnImpl < Object > (); + columnActual = new ColumnImpl<Object>(); objectExpected = new Object(); @@ -40,7 +40,7 @@ columnActual.get("object 1"); Assert.fail(); } catch (NoSuchElementException e) { - log.info("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:54:05 UTC (rev 35) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-01-28 21:02:49 UTC (rev 36) @@ -9,146 +9,145 @@ public class RowTest extends TestCase { private static final Log log = LogFactory.getLog(RowTest.class); + private Structure structureExpected; + private Map<String, Object> contentExpected; + private Row rowActual; - private Structure structureExpected; - private Map<String,Object> contentExpected; - private Row rowActual; + public void testToString() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); - public void testToString() { - { - structureExpected = new StructureImpl(); - contentExpected = new HashMap<String, Object>(); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } - assertEquals(rowActual.toString(), contentExpected.values().toString()); - } + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); - { - structureExpected = new StructureImpl(); - structureExpected.createColumn("Test", String.class); - contentExpected = new HashMap<String, Object>(); - contentExpected.put("Test", "StringDeTest"); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } - assertEquals(rowActual.toString(), contentExpected.values().toString()); - } + { + structureExpected = new StructureImpl(); + 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)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); - { - structureExpected = new StructureImpl(); - 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)); - contentExpected.put("Test3", new Double(0.07)); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.toString(), contentExpected.values().toString()); + } + } - assertEquals(rowActual.toString(), contentExpected.values().toString()); - } - } + public void testGetRowContent() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); - public void testGetRowContent() { - { - structureExpected = new StructureImpl(); - contentExpected = new HashMap<String, Object>(); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.getRowContent(), contentExpected); + } - assertEquals(rowActual.getRowContent(), contentExpected); - } + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); - { - structureExpected = new StructureImpl(); - structureExpected.createColumn("Test", String.class); - contentExpected = new HashMap<String, Object>(); - contentExpected.put("Test", "StringDeTest"); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.getRowContent(), contentExpected); + } - assertEquals(rowActual.getRowContent(), contentExpected); - } + { + structureExpected = new StructureImpl(); + 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)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); - { - structureExpected = new StructureImpl(); - 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)); - contentExpected.put("Test3", new Double(0.07)); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.getRowContent(), contentExpected); + } + } - assertEquals(rowActual.getRowContent(), contentExpected); - } - } + public void testGetRowStructure() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); - public void testGetRowStructure() { - { - structureExpected = new StructureImpl(); - contentExpected = new HashMap<String, Object>(); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.getRowStructure(), structureExpected); + } - assertEquals(rowActual.getRowStructure(), structureExpected); - } + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); - { - structureExpected = new StructureImpl(); - structureExpected.createColumn("Test", String.class); - contentExpected = new HashMap<String, Object>(); - contentExpected.put("Test", "StringDeTest"); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.getRowStructure(), structureExpected); + } - assertEquals(rowActual.getRowStructure(), structureExpected); - } + { + structureExpected = new StructureImpl(); + 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)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); - { - structureExpected = new StructureImpl(); - 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)); - contentExpected.put("Test3", new Double(0.07)); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.getRowStructure(), structureExpected); + } + } - assertEquals(rowActual.getRowStructure(), structureExpected); - } - } + public void testGetContent() { + { + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); - public void testGetContent() { - { - structureExpected = new StructureImpl(); - contentExpected = new HashMap<String, Object>(); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.getContent(""), null); + } - assertEquals(rowActual.getContent(""), null); - } + { + structureExpected = new StructureImpl(); + structureExpected.createColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); - { - structureExpected = new StructureImpl(); - structureExpected.createColumn("Test", String.class); - contentExpected = new HashMap<String, Object>(); - contentExpected.put("Test", "StringDeTest"); - rowActual = new RowImpl(structureExpected, contentExpected); + assertEquals(rowActual.getContent("Test"), "StringDeTest"); + } - assertEquals(rowActual.getContent("Test"), "StringDeTest"); - } + { + structureExpected = new StructureImpl(); + 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)); + contentExpected.put("Test3", new Double(0.07)); + rowActual = new RowImpl(structureExpected, contentExpected); - { - structureExpected = new StructureImpl(); - 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)); - contentExpected.put("Test3", new Double(0.07)); - rowActual = new RowImpl(structureExpected, contentExpected); - - assertEquals(rowActual.getContent("Test1"), "StringDeTest"); - assertEquals(rowActual.getContent("Test2"), new Integer(1)); - assertEquals(rowActual.getContent("Test3"), new Double(0.07)); - } - } + assertEquals(rowActual.getContent("Test1"), "StringDeTest"); + assertEquals(rowActual.getContent("Test2"), new Integer(1)); + assertEquals(rowActual.getContent("Test3"), new Double(0.07)); + } + } } 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:54:05 UTC (rev 35) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-01-28 21:02:49 UTC (rev 36) @@ -15,291 +15,288 @@ public class StructureTest extends TestCase { private static final Log log = LogFactory.getLog(StructureTest.class); + private Structure structureActual; + private Map<String, Class<?>> structureContentActual; + private Map<String, Class<?>> structureContentExpected; + private Class<?> columnsClassActual; + private Class<?> columnsClassExpected; + private Set<String> columnsNamesActual; + private Set<String> columnsNamesExpected; - private Structure structureActual; - private Map < String, Class < ? > > structureContentActual; - private Map < String, Class < ? > > structureContentExpected; - - private Class < ? > columnsClassActual; - private Class < ? > columnsClassExpected; - - private Set < String > columnsNamesActual; - private Set < String > columnsNamesExpected; - public void testGetColumnsNamesVoid() { structureActual = new StructureImpl(); - Set < String > columnNames = structureActual.getColumnsNames(); + Set<String> columnNames = structureActual.getColumnsNames(); assertEquals(0, columnNames.size()); } - /** - * we add a column with name and class. - * We use reflexivity to verify that the map of the structure is like we - * want. - */ - public void testAddColumn() { + /** + * we add a column with name and class. + * We use reflexivity to verify that the map of the structure is like we + * want. + */ + public void testAddColumn() { - structureContentExpected = new HashMap<String, Class<?>>(); + structureContentExpected = new HashMap<String, Class<?>>(); - try { - structureActual = new StructureImpl(); + try { + structureActual = new StructureImpl(); - Field fStructure = structureActual.getClass().getDeclaredField("structure"); - fStructure.setAccessible(true); - Map < String, Class < ? > > structureContentActual = - (Map < String, Class < ? > >) fStructure.get(structureActual); + Field fStructure = structureActual.getClass().getDeclaredField("structure"); + fStructure.setAccessible(true); + Map<String, Class<?>> structureContentActual = + (Map<String, Class<?>>) fStructure.get(structureActual); - structureActual.createColumn("Test1", String.class); - structureContentExpected.put("Test1", String.class); - assertEquals(structureContentExpected, structureContentActual); + structureActual.createColumn("Test1", String.class); + structureContentExpected.put("Test1", String.class); + assertEquals(structureContentExpected, structureContentActual); - structureActual.createColumn("Test2", Object.class); - structureContentExpected.put("Test2", Object.class); - assertEquals(structureContentExpected, structureContentActual); + structureActual.createColumn("Test2", Object.class); + structureContentExpected.put("Test2", Object.class); + assertEquals(structureContentExpected, structureContentActual); - structureActual.createColumn("Test3", Map.class); - structureContentExpected.put("Test3", Map.class); - assertEquals(structureContentExpected, structureContentActual); + structureActual.createColumn("Test3", Map.class); + structureContentExpected.put("Test3", Map.class); + assertEquals(structureContentExpected, structureContentActual); - } catch (IllegalArgumentException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); - } catch (IllegalAccessException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); - } catch (NoSuchFieldException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); - } catch (SecurityException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); - } - } + } catch (IllegalArgumentException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } + } - /** - * we add a column with name and class. - * We use reflexivity to verify that the map of the structure is like we - * want. - * We remove column, and we continue to verify that the map of the structure - * is always good. - */ - public void testRemoveColumn() { + /** + * we add a column with name and class. + * We use reflexivity to verify that the map of the structure is like we + * want. + * We remove column, and we continue to verify that the map of the structure + * is always good. + */ + public void testRemoveColumn() { - structureContentExpected = new HashMap<String, Class<?>>(); + structureContentExpected = new HashMap<String, Class<?>>(); - try { - structureActual = new StructureImpl(); + try { + structureActual = new StructureImpl(); - Field fStructure = structureActual.getClass().getDeclaredField("structure"); - fStructure.setAccessible(true); - Map < String, Class < ? > > structureContentActual = - (Map < String, Class < ? > >) fStructure.get(structureActual); + Field fStructure = structureActual.getClass().getDeclaredField("structure"); + fStructure.setAccessible(true); + Map<String, Class<?>> structureContentActual = + (Map<String, Class<?>>) fStructure.get(structureActual); - structureActual.createColumn("Test1", String.class); - structureContentExpected.put("Test1", String.class); - structureActual.createColumn("Test2", Object.class); - structureContentExpected.put("Test2", Object.class); - structureActual.createColumn("Test3", Map.class); - structureContentExpected.put("Test3", Map.class); - assertEquals(structureContentExpected, structureContentActual); + structureActual.createColumn("Test1", String.class); + structureContentExpected.put("Test1", String.class); + structureActual.createColumn("Test2", Object.class); + structureContentExpected.put("Test2", Object.class); + structureActual.createColumn("Test3", Map.class); + structureContentExpected.put("Test3", Map.class); + assertEquals(structureContentExpected, structureContentActual); - structureActual.deleteColumn("Test1"); - structureContentExpected.remove("Test1"); - assertEquals(structureContentExpected, structureContentActual); + structureActual.deleteColumn("Test1"); + structureContentExpected.remove("Test1"); + assertEquals(structureContentExpected, structureContentActual); - /** - * the key "Test1TOTO" is not in the structure. - */ - structureActual.deleteColumn("Test1TOTO"); - structureContentExpected.remove("Test1TOTO"); - assertEquals(structureContentExpected, structureContentActual); + /** + * the key "Test1TOTO" is not in the structure. + */ + structureActual.deleteColumn("Test1TOTO"); + structureContentExpected.remove("Test1TOTO"); + assertEquals(structureContentExpected, structureContentActual); - structureActual.deleteColumn("Test2"); - structureContentExpected.remove("Test2"); - assertEquals(structureContentExpected, structureContentActual); + structureActual.deleteColumn("Test2"); + structureContentExpected.remove("Test2"); + assertEquals(structureContentExpected, structureContentActual); - structureActual.deleteColumn("Test3"); - structureContentExpected.remove("Test3"); - assertEquals(structureContentExpected, structureContentActual); + structureActual.deleteColumn("Test3"); + structureContentExpected.remove("Test3"); + assertEquals(structureContentExpected, structureContentActual); - /** - * We try to remove an other key, but the map is empty. - */ - structureActual.deleteColumn("Test4"); - structureContentExpected.remove("Test4"); + /** + * We try to remove an other key, but the map is empty. + */ + structureActual.deleteColumn("Test4"); + structureContentExpected.remove("Test4"); - assertEquals(structureContentExpected, structureContentActual); + assertEquals(structureContentExpected, structureContentActual); - } catch (IllegalArgumentException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); - } catch (IllegalAccessException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); - } catch (NoSuchFieldException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); - } catch (SecurityException ex) { - Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); - } - } + } catch (IllegalArgumentException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } + } - /** - * we add a column with name and class. - * We use reflexivity to verify that the columsNames returned are goods. - * We remove column, and we continue to verify that the columsNames is - * always good. - */ - public void testGetColumnsNames() { + /** + * we add a column with name and class. + * We use reflexivity to verify that the columsNames returned are goods. + * We remove column, and we continue to verify that the columsNames is + * always good. + */ + public void testGetColumnsNames() { - structureActual = new StructureImpl(); - - columnsNamesExpected = new HashSet<String>(); - columnsNamesActual = structureActual.getColumnsNames(); + structureActual = new StructureImpl(); + columnsNamesExpected = new HashSet<String>(); + columnsNamesActual = structureActual.getColumnsNames(); - structureActual.createColumn("Test1", String.class); - columnsNamesExpected.add("Test1"); - assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.createColumn("Test2", Object.class); - columnsNamesExpected.add("Test2"); - assertEquals(columnsNamesExpected, columnsNamesActual); + structureActual.createColumn("Test1", String.class); + columnsNamesExpected.add("Test1"); + assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.createColumn("Test3", Map.class); - columnsNamesExpected.add("Test3"); - assertEquals(columnsNamesExpected, columnsNamesActual); + structureActual.createColumn("Test2", Object.class); + columnsNamesExpected.add("Test2"); + assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.deleteColumn("Test1"); - columnsNamesExpected.remove("Test1"); - assertEquals(columnsNamesExpected, columnsNamesActual); + structureActual.createColumn("Test3", Map.class); + columnsNamesExpected.add("Test3"); + assertEquals(columnsNamesExpected, columnsNamesActual); - /** - * the key "Test1TOTO" is not in the structure. - */ - structureActual.deleteColumn("Test1TOTO"); - columnsNamesExpected.remove("Test1TOTO"); - assertEquals(columnsNamesExpected, columnsNamesActual); + structureActual.deleteColumn("Test1"); + columnsNamesExpected.remove("Test1"); + assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.deleteColumn("Test2"); - columnsNamesExpected.remove("Test2"); - assertEquals(columnsNamesExpected, columnsNamesActual); + /** + * the key "Test1TOTO" is not in the structure. + */ + structureActual.deleteColumn("Test1TOTO"); + columnsNamesExpected.remove("Test1TOTO"); + assertEquals(columnsNamesExpected, columnsNamesActual); - structureActual.deleteColumn("Test3"); - columnsNamesExpected.remove("Test3"); - assertEquals(columnsNamesExpected, columnsNamesActual); + structureActual.deleteColumn("Test2"); + columnsNamesExpected.remove("Test2"); + assertEquals(columnsNamesExpected, columnsNamesActual); - /** - * We try to remove an other key, but the map is empty. - */ - structureActual.deleteColumn("Test4"); - columnsNamesExpected.remove("Test4"); + structureActual.deleteColumn("Test3"); + columnsNamesExpected.remove("Test3"); + assertEquals(columnsNamesExpected, columnsNamesActual); - assertEquals(columnsNamesExpected, columnsNamesActual); + /** + * We try to remove an other key, but the map is empty. + */ + structureActual.deleteColumn("Test4"); + columnsNamesExpected.remove("Test4"); - } + assertEquals(columnsNamesExpected, columnsNamesActual); - /** - * we add a column with name and class. - * We use reflexivity to verify that the columsNames returned are goods. - * We remove column, and we continue to verify that the columsNames is - * always good. - */ - public void testGetColumnClass() { + } - Structure s = new StructureImpl(); + /** + * we add a column with name and class. + * We use reflexivity to verify that the columsNames returned are goods. + * We remove column, and we continue to verify that the columsNames is + * always good. + */ + public void testGetColumnClass() { + Structure s = new StructureImpl(); + // columnsClassExpected; // columnsClassActual; - /** - * We put "Test1" - */ - s.createColumn("Test1", String.class); - columnsClassActual = s.getColumnClass("Test1"); - columnsClassExpected = String.class; - assertEquals(columnsClassExpected, columnsClassActual); + /** + * We put "Test1" + */ + s.createColumn("Test1", String.class); + columnsClassActual = s.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); - /** - * We put "Test2" - */ - s.createColumn("Test2", Object.class); - columnsClassActual = s.getColumnClass("Test1"); - columnsClassExpected = String.class; - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); - columnsClassExpected = Object.class; - assertEquals(columnsClassExpected, columnsClassActual); + /** + * We put "Test2" + */ + s.createColumn("Test2", Object.class); + columnsClassActual = s.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); - /** - * We put "Test3" - */ - s.createColumn("Test3", Map.class); - columnsClassActual = s.getColumnClass("Test1"); - columnsClassExpected = String.class; - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); - columnsClassExpected = Object.class; - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); - columnsClassExpected = Map.class; - assertEquals(columnsClassExpected, columnsClassActual); + /** + * We put "Test3" + */ + s.createColumn("Test3", Map.class); + columnsClassActual = s.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); - /** - * we remove "Test1" - */ - s.deleteColumn("Test1"); - columnsClassActual = s.getColumnClass("Test1"); - columnsClassExpected = null; - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); - columnsClassExpected = Object.class; - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); - columnsClassExpected = Map.class; - assertEquals(columnsClassExpected, columnsClassActual); + /** + * we remove "Test1" + */ + s.deleteColumn("Test1"); + columnsClassActual = s.getColumnClass("Test1"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); - /** - * the key "Test1TOTO" is not in the structure. - * We try to remove it. - */ - s.deleteColumn("Test1TOTO"); - columnsClassActual = s.getColumnClass("Test1TOTO"); - columnsClassExpected = null; - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); - columnsClassExpected = Object.class; - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); - columnsClassExpected = Map.class; - assertEquals(columnsClassExpected, columnsClassActual); + /** + * the key "Test1TOTO" is not in the structure. + * We try to remove it. + */ + s.deleteColumn("Test1TOTO"); + columnsClassActual = s.getColumnClass("Test1TOTO"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); - /** - * We remove "Test2" - */ - s.deleteColumn("Test2"); - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); - columnsClassExpected = null; - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); - columnsClassExpected = Map.class; - assertEquals(columnsClassExpected, columnsClassActual); + /** + * We remove "Test2" + */ + s.deleteColumn("Test2"); + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test2"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test3"); + columnsClassExpected = Map.class; + assertEquals(columnsClassExpected, columnsClassActual); - /** - * We remove "Test3" - */ - s.deleteColumn("Test3"); - assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); - columnsClassExpected = null; - assertEquals(columnsClassExpected, columnsClassActual); + /** + * We remove "Test3" + */ + s.deleteColumn("Test3"); + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test3"); + columnsClassExpected = null; + assertEquals(columnsClassExpected, columnsClassActual); - /** - * We try to remove an other key, but the map is empty. - */ - s.deleteColumn("Test4"); - columnsClassActual = s.getColumnClass("Test4"); - columnsClassExpected = null; + /** + * We try to remove an other key, but the map is empty. + */ + s.deleteColumn("Test4"); + columnsClassActual = s.getColumnClass("Test4"); + columnsClassExpected = null; - assertEquals(columnsClassExpected, columnsClassActual); + assertEquals(columnsClassExpected, columnsClassActual); - } + } } Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-01-28 21:02:49 UTC (rev 36) @@ -0,0 +1,185 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.TestCase; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; + +/** + * + * @author Dorian Langlais + */ +public class TableTest extends TestCase { + + private static final Log log = LogFactory.getLog(TableTest.class); + + private Table tableActual; + private Structure tableStructureActual; + private HashMap<String, Column<?>> tableColumnsActual; + private Structure tableStructureExpected; + private HashMap<String, Column<?>> tableColumnsExpected; + + /** + * We create a new table and we verify that the fields are correctly + * initialized. + */ + public void testNewTable() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } + + public void testCreateColumn() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + /** + * We add one column. + */ + tableActual.createColumn("Test1", String.class); + tableStructureExpected.createColumn("Test1", String.class); + tableColumnsExpected.put("Test1", new ColumnImpl<String>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We add another column. + */ + tableActual.createColumn("Test2", Map.class); + tableStructureExpected.createColumn("Test2", Map.class); + tableColumnsExpected.put("Test2", new ColumnImpl<Map>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * add an already existing column has no effect. + */ + tableActual.createColumn("Test1", String.class); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } + + public void testRemoveColumn() { + + tableActual = new TableImpl(); + + tableStructureExpected = new StructureImpl(); + tableColumnsExpected = new HashMap<String, Column<?>>(); + + try { + Field fTableStructure = + tableActual.getClass().getDeclaredField("tableStructure"); + Field fTablecolumns = + tableActual.getClass().getDeclaredField("tableColumns"); + fTableStructure.setAccessible(true); + fTablecolumns.setAccessible(true); + tableStructureActual = (Structure) fTableStructure.get(tableActual); + tableColumnsActual = (HashMap<String, Column<?>>) fTablecolumns.get(tableActual); + + /** + * We add two columns. + */ + tableActual.createColumn("Test1", String.class); + tableStructureExpected.createColumn("Test1", String.class); + tableColumnsExpected.put("Test1", new ColumnImpl<String>()); + tableActual.createColumn("Test2", Map.class); + tableStructureExpected.createColumn("Test2", Map.class); + tableColumnsExpected.put("Test2", new ColumnImpl<Map>()); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We try to remove a column. + */ + tableActual.deleteColumn("Test1"); + tableStructureExpected.deleteColumn("Test1"); + tableColumnsExpected.remove("Test1"); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + /** + * We try to remove another column. + */ + tableActual.deleteColumn("Test2"); + tableStructureExpected.deleteColumn("Test2"); + tableColumnsExpected.remove("Test2"); + + assertEquals(tableStructureActual, tableStructureExpected); + assertEquals(tableColumnsActual, tableColumnsExpected); + + + } catch (IllegalArgumentException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(TableTest.class.getName()).log(Level.SEVERE, null, ex); + } + + } +}