January 2010 - Mapstoragemanager-commits - mailman.cloud.codelutin.com

r39 - trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 29 Jan '10

29 Jan '10

Author: dlanglais Date: 2010-01-29 01:38:10 +0100 (Fri, 29 Jan 2010) New Revision: 39 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java Log: modification du calcul du hash d'une structure (somme des hash des cl?\195?\169s et des valeurs). 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-29 00:26:22 UTC (rev 38) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-01-29 00:38:10 UTC (rev 39) @@ -64,7 +64,16 @@ * {@inheritDoc} */ public final int hashCode() { - return this.structure.hashCode(); + if (structure.isEmpty()) { + return 0; + } else { + int hash = 0; + for (String key : structure.keySet() ) { + hash += key.hashCode(); + hash += structure.get(key).hashCode(); + } + return hash; + } } /**

1 0

r38 - in trunk/src: main/java/org/nuiton/mapstoragemanager/plugins/bighashmap test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 29 Jan '10

29 Jan '10

Author: dlanglais Date: 2010-01-29 01:26:22 +0100 (Fri, 29 Jan 2010) New Revision: 38 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java Log: r?\195?\169?\195?\169criture et test des fonctions hashCode() et equals() 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 23:51:06 UTC (rev 37) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-29 00:26:22 UTC (rev 38) @@ -64,26 +64,17 @@ /** * {@inheritDoc} */ - public final String toString() { - String ret = ""; - - for (String key : column.keySet()) { - ret += key + column.get(key); + public final int hashCode() { + int hash = 0; + for(Cell c : column.values()) { + hash += c.hashCode(); } - - return ret; + return hash; } /** * {@inheritDoc} */ - public final int hashCode() { - return column.hashCode(); - } - - /** - * {@inheritDoc} - */ public boolean equals(Object o) { if (o instanceof Column) { @@ -95,4 +86,17 @@ return false; } } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret = ""; + + for (String key : column.keySet()) { + ret += key + "\t" + column.get(key); + } + + return ret; + } } 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 23:51:06 UTC (rev 37) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-29 00:26:22 UTC (rev 38) @@ -1,5 +1,7 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; +import java.util.HashMap; +import java.util.Map; import java.util.NoSuchElementException; import org.apache.commons.logging.Log; @@ -12,10 +14,12 @@ private static final Log log = LogFactory.getLog(ColumnTest.class); private Column columnActual; - private Object objectExpected; + private Column column2Actual; + private Object expected; + private Object expected2; /** - * On teste le comportement de get avec une cellule vide. + * We test column when empty. */ public void testGetVoid() { columnActual = new ColumnImpl<Object>(); @@ -28,13 +32,12 @@ } /** - * On ajoute un objet avec une clé. - * On tente de récupérer celui-ci. + * We add one object and we try to get it. */ public void testPut() { columnActual = new ColumnImpl<Object>(); - objectExpected = new Object(); + expected = new Object(); try { columnActual.get("object 1"); @@ -43,9 +46,111 @@ log.info("Exception levée correctement"); } - columnActual.put("object 1", objectExpected); + columnActual.put("object 1", expected); - assertEquals(columnActual.get("object 1"), objectExpected); + assertEquals(columnActual.get("object 1"), expected); } + + /** + * testhashCode(). + */ + public void testHashCode() { + + int hashCodeSum = 0; + Object toStore; + + /** + * We create a new column and verify that hashCode is 0. + */ + columnActual = new ColumnImpl<Integer>(); + assertEquals(columnActual.hashCode(), 0); + + /** + * We put a Integer(10) and control that hashCode is already ok. + */ + toStore = new Integer(10); + columnActual.put("key1", toStore); + hashCodeSum += toStore.hashCode(); + assertEquals(columnActual.hashCode(), hashCodeSum); + + toStore = new String("peanuts"); + columnActual.put("key2", toStore); + hashCodeSum += toStore.hashCode(); + assertEquals(columnActual.hashCode(), hashCodeSum); + } + + /** + * testEquals(). + */ + public void testEquals() { + + /** + * We create two columns. + */ + columnActual = new ColumnImpl<Object>(); + column2Actual = new ColumnImpl<Object>(); + assertEquals(columnActual, column2Actual); + + /** + * We put one object in the first column, and not in the second. + */ + expected = new Integer(10); + columnActual.put("key1",expected); + assertNotSame(columnActual, column2Actual); + + /** + * We put the same object in the second column at the same key. + */ + column2Actual.put("key1",expected); + assertEquals(columnActual, column2Actual); + + /** + * We put the same object in the two column but at a different key. + */ + expected2 = new String("Tomatoes"); + columnActual.put("key2",expected2); + column2Actual.put("key3",expected2); + assertNotSame(columnActual, column2Actual); + } + + public void testToString() { + + Object toStore, toStore2; + Map<String,Object> columnContent; + /** + * We create one columns. + */ + columnActual = new ColumnImpl<Object>(); + columnContent = new HashMap<String, Object>(); + expected = new String(); + for (String key : columnContent.keySet()) { + expected += key + "\t" + columnContent.get(key); + } + assertEquals(columnActual.toString(), expected); + + /** + * We put one object in the column. + */ + toStore = new Integer(10); + columnActual.put("key1", toStore); + columnContent.put("key1", toStore); + expected = new String(); + for (String key : columnContent.keySet()) { + expected += key + "\t" + columnContent.get(key); + } + assertEquals(columnActual.toString(), expected); + + /** + * We put another object in the column. + */ + toStore2 = new String("yahoo !"); + columnActual.put("key2", toStore2); + columnContent.put("key2", toStore2); + expected = new String(); + for (String key : columnContent.keySet()) { + expected += key + "\t" + columnContent.get(key); + } + assertEquals(columnActual.toString(), expected); + } }

1 0

r37 - in trunk/src: main/java/org/nuiton/mapstoragemanager/plugins/bighashmap test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: dlanglais Date: 2010-01-29 00:51:06 +0100 (Fri, 29 Jan 2010) New Revision: 37 Modified: 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/Table.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java Log: Ajout et test des fonctions toString(), hashCode() et equals(). 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 21:02:49 UTC (rev 36) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-01-28 23:51:06 UTC (rev 37) @@ -28,6 +28,17 @@ T get(Long t); /** + * hashCode(). + * @return + */ + int hashCode(); + + /** + * equals(). + */ + boolean equals(Object o); + + /** * 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 21:02:49 UTC (rev 36) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-28 23:51:06 UTC (rev 37) @@ -70,7 +70,44 @@ /** * {@inheritDoc} */ - public final String toString() { - return ((T) this.get()).toString(); + public int hashCode() { + if (this.cell.size() != 0) { + return this.get().hashCode(); + } else { + return 0; + } } + + /** + * {@inheritDoc} + * //TODO : we consider only the last item... but it will be better to + * //TODO verify all the "versions" of the cell. + */ + public boolean equals(Object o) { + if (o instanceof CellImpl) { + CellImpl another = (CellImpl) o; + if(this.cell.size() == another.cell.size()) { + if(this.cell.size() == 0) { + return true; + } else { + return this.get().equals(another.get()); + } + } else { + return false; + } + } else { + return false; + } + } + /** + * {@inheritDoc} + */ + public String toString() { + + if (this.cell.size() != 0) { + return ((T) this.get()).toString(); + } else { + return ""; + } + } } 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 21:02:49 UTC (rev 36) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-28 23:51:06 UTC (rev 37) @@ -37,11 +37,6 @@ void delete(String key); /** - * toString(). - */ - String toString(); - - /** * hashCode(). * @return */ @@ -51,4 +46,9 @@ * equals(). */ boolean equals(Object o); + + /** + * toString(). + */ + String toString(); } 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 21:02:49 UTC (rev 36) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-28 23:51:06 UTC (rev 37) @@ -34,5 +34,5 @@ * Remove a row by its key. * @param key the key */ - void removeRow(final String key); + void deleteRow(final String key); } 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 21:02:49 UTC (rev 36) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-28 23:51:06 UTC (rev 37) @@ -64,7 +64,7 @@ /** * {@inheritDoc} */ - public void removeRow(final String key) { + public void deleteRow(final String key) { 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 21:02:49 UTC (rev 36) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-28 23:51:06 UTC (rev 37) @@ -19,6 +19,7 @@ private static final Log log = LogFactory.getLog(CellTest.class); private Cell<Object> cellActual; + private Cell<Object> cell2Actual; private Object objectExcepted; private Object object2Excepted; private Object object3Excepted; @@ -91,4 +92,83 @@ assertEquals(cellActual.get(), object3Excepted); } + + /** + * We make two cells with the same objects, and we verify that they are + * equals. + */ + public void testEquals() { + + /** + * We create two cells. + */ + cellActual = new CellImpl<Object>(); + cell2Actual = new CellImpl<Object>(); + assertEquals(cellActual, cell2Actual); + + objectExcepted = new Integer(10); + + /** + * We put one item in the first Cell, and not in the second. + */ + cellActual.put(objectExcepted); + assertNotSame(cellActual, cell2Actual); + + /** + * We put the same object in the second cell. + */ + cell2Actual.put(objectExcepted); + assertEquals(cellActual, cell2Actual); + } + + /** + * We make two cells with the same objects, and we verify that thay have + * the same hashCode. + */ + public void testHashCode() { + + /** + * We create two cells. + */ + cellActual = new CellImpl<Object>(); + cell2Actual = new CellImpl<Object>(); + assertEquals(cellActual.hashCode(), cell2Actual.hashCode()); + + objectExcepted = new Integer(10); + + /** + * We put one item in the first Cell, and not in the second. + */ + cellActual.put(objectExcepted); + assertNotSame(cellActual.hashCode(), cell2Actual.hashCode()); + + /** + * We put the same object in the second cell. + */ + cell2Actual.put(objectExcepted); + assertEquals(cellActual.hashCode(), cell2Actual.hashCode()); + } + + /** + * we test that toString do what we want. + */ + public void testToString() { + + /** + * We create one cell and werify that toString equals "". + */ + cellActual = new CellImpl<Object>(); + assertEquals(cellActual.toString(), ""); + + objectExcepted = new Integer(1337); + + cellActual.put(objectExcepted); + assertEquals(cellActual.toString(), objectExcepted.toString()); + assertEquals(cellActual.toString(), "1337"); + + objectExcepted = new String("String for testing"); + cellActual.put(objectExcepted); + assertEquals(cellActual.toString(), objectExcepted.toString()); + assertEquals(cellActual.toString(), "String for testing"); + } }

1 0

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
by dlanglais＠users.nuiton.org 28 Jan '10

28 Jan '10

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 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 columnName. * @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 another - */ - 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 another + */ + 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); + } + + } +}

1 0

r35 - in trunk/src: main/java/org/nuiton/mapstoragemanager/plugins/bighashmap test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 28 Jan '10

28 Jan '10

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 another + */ + 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;

1 0

r34 - trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: dlanglais Date: 2010-01-28 19:01:26 +0100 (Thu, 28 Jan 2010) New Revision: 34 Modified: 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: refactoring dans les classes de Test ... (*Expected / *Actual) 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 17:31:48 UTC (rev 33) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-28 18:01:26 UTC (rev 34) @@ -14,13 +14,18 @@ */ public final class CellTest extends TestCase { + Cell < Object > cellActual; + Object objectExcepted; + Object object2Excepted; + Object object3Excepted; + /** * On teste le comportement de get avec une cellule vide. */ public void testGetVoid() { - Cell < Object > cell = new CellImpl < Object > (); + cellActual = new CellImpl < Object > (); try { - assertNull(cell.get()); + assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { System.out.println("Exception levée correctement"); @@ -33,19 +38,19 @@ */ public void testPut() { - Cell < Object > cell = new CellImpl < Object > (); + cellActual = new CellImpl < Object > (); - Object obj1 = new Object(); + objectExcepted = new Object(); try { - assertNull(cell.get()); + assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { System.out.println("Exception levée correctement"); } - cell.put(obj1); + cellActual.put(objectExcepted); - assertEquals(cell.get(), obj1); + assertEquals(cellActual.get(), objectExcepted); } /** @@ -56,30 +61,30 @@ */ public void testPutReput() { - Cell < Object > cell = new CellImpl < Object > (); + cellActual = new CellImpl < Object > (); - Object obj1 = new Object(); + objectExcepted = new Object(); try { - assertNull(cell.get()); + assertNull(cellActual.get()); Assert.fail(); } catch (NoSuchElementException e) { System.out.println("Exception levée correctement"); } - cell.put(obj1); + cellActual.put(objectExcepted); - assertEquals(cell.get(), obj1); + assertEquals(cellActual.get(), objectExcepted); - Object obj2 = new Object(); + object2Excepted = new Object(); - cell.put(obj2); + cellActual.put(object2Excepted); - assertEquals(cell.get(), obj2); + assertEquals(cellActual.get(), object2Excepted); - Object obj3 = new Object(); + object3Excepted = new Object(); - cell.put(obj3); + cellActual.put(object3Excepted); - assertEquals(cell.get(), obj3); + assertEquals(cellActual.get(), object3Excepted); } } 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 17:31:48 UTC (rev 33) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-28 18:01:26 UTC (rev 34) @@ -7,13 +7,15 @@ public final class ColumnTest extends TestCase { + Column columnActual; + Object objectExpected; /** * On teste le comportement de get avec une cellule vide. */ public void testGetVoid() { - Column < Object > col = new ColumnImpl < Object > (); + columnActual = new ColumnImpl < Object > (); try { - col.get("test"); + columnActual.get("test"); Assert.fail(); } catch (NoSuchElementException e) { System.out.println("Exception levée correctement"); @@ -25,20 +27,20 @@ * On tente de récupérer celui-ci. */ public void testPut() { - Column < Object > col = new ColumnImpl < Object > (); + columnActual = new ColumnImpl < Object > (); - Object obj1 = new Object(); + objectExpected = new Object(); try { - col.get("object 1"); + columnActual.get("object 1"); Assert.fail(); } catch (NoSuchElementException e) { System.out.println("Exception levée correctement"); } - col.put("object 1", obj1); + columnActual.put("object 1", objectExpected); - assertEquals(col.get("object 1"), obj1); + assertEquals(columnActual.get("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 17:31:48 UTC (rev 33) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-01-28 18:01:26 UTC (rev 34) @@ -6,145 +6,145 @@ public class RowTest extends TestCase { - Structure structure; - Map<String,Object> content; - Row r; + Structure structureExpected; + Map<String,Object> contentExpected; + Row rowActual; public void testToString() { { - structure = new StructureImpl(); - content = new HashMap<String, Object>(); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); - assertEquals(r.toString(), content.values().toString()); + assertEquals(rowActual.toString(), contentExpected.values().toString()); } { - structure = new StructureImpl(); - structure.addColumn("Test", String.class); - content = new HashMap<String, Object>(); - content.put("Test", "StringDeTest"); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + structureExpected.addColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); - assertEquals(r.toString(), content.values().toString()); + assertEquals(rowActual.toString(), contentExpected.values().toString()); } { - structure = new StructureImpl(); - structure.addColumn("Test1", String.class); - structure.addColumn("Test2", Integer.class); - structure.addColumn("Test3", Double.class); - content = new HashMap<String, Object>(); - content.put("Test1", "StringDeTest"); - content.put("Test2", new Integer(1)); - content.put("Test3", new Double(0.07)); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + structureExpected.addColumn("Test1", String.class); + structureExpected.addColumn("Test2", Integer.class); + structureExpected.addColumn("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(r.toString(), content.values().toString()); + assertEquals(rowActual.toString(), contentExpected.values().toString()); } } public void testGetRowContent() { { - structure = new StructureImpl(); - content = new HashMap<String, Object>(); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); - assertEquals(r.getRowContent(), content); + assertEquals(rowActual.getRowContent(), contentExpected); } { - structure = new StructureImpl(); - structure.addColumn("Test", String.class); - content = new HashMap<String, Object>(); - content.put("Test", "StringDeTest"); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + structureExpected.addColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); - assertEquals(r.getRowContent(), content); + assertEquals(rowActual.getRowContent(), contentExpected); } { - structure = new StructureImpl(); - structure.addColumn("Test1", String.class); - structure.addColumn("Test2", Integer.class); - structure.addColumn("Test3", Double.class); - content = new HashMap<String, Object>(); - content.put("Test1", "StringDeTest"); - content.put("Test2", new Integer(1)); - content.put("Test3", new Double(0.07)); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + structureExpected.addColumn("Test1", String.class); + structureExpected.addColumn("Test2", Integer.class); + structureExpected.addColumn("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(r.getRowContent(), content); + assertEquals(rowActual.getRowContent(), contentExpected); } } public void testGetRowStructure() { { - structure = new StructureImpl(); - content = new HashMap<String, Object>(); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); - assertEquals(r.getRowStructure(), structure); + assertEquals(rowActual.getRowStructure(), structureExpected); } { - structure = new StructureImpl(); - structure.addColumn("Test", String.class); - content = new HashMap<String, Object>(); - content.put("Test", "StringDeTest"); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + structureExpected.addColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); - assertEquals(r.getRowStructure(), structure); + assertEquals(rowActual.getRowStructure(), structureExpected); } { - structure = new StructureImpl(); - structure.addColumn("Test1", String.class); - structure.addColumn("Test2", Integer.class); - structure.addColumn("Test3", Double.class); - content = new HashMap<String, Object>(); - content.put("Test1", "StringDeTest"); - content.put("Test2", new Integer(1)); - content.put("Test3", new Double(0.07)); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + structureExpected.addColumn("Test1", String.class); + structureExpected.addColumn("Test2", Integer.class); + structureExpected.addColumn("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(r.getRowStructure(), structure); + assertEquals(rowActual.getRowStructure(), structureExpected); } } public void testGetContent() { { - structure = new StructureImpl(); - content = new HashMap<String, Object>(); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + contentExpected = new HashMap<String, Object>(); + rowActual = new RowImpl(structureExpected, contentExpected); - assertEquals(r.getContent(""), null); + assertEquals(rowActual.getContent(""), null); } { - structure = new StructureImpl(); - structure.addColumn("Test", String.class); - content = new HashMap<String, Object>(); - content.put("Test", "StringDeTest"); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + structureExpected.addColumn("Test", String.class); + contentExpected = new HashMap<String, Object>(); + contentExpected.put("Test", "StringDeTest"); + rowActual = new RowImpl(structureExpected, contentExpected); - assertEquals(r.getContent("Test"), "StringDeTest"); + assertEquals(rowActual.getContent("Test"), "StringDeTest"); } { - structure = new StructureImpl(); - structure.addColumn("Test1", String.class); - structure.addColumn("Test2", Integer.class); - structure.addColumn("Test3", Double.class); - content = new HashMap<String, Object>(); - content.put("Test1", "StringDeTest"); - content.put("Test2", new Integer(1)); - content.put("Test3", new Double(0.07)); - r = new RowImpl(structure, content); + structureExpected = new StructureImpl(); + structureExpected.addColumn("Test1", String.class); + structureExpected.addColumn("Test2", Integer.class); + structureExpected.addColumn("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(r.getContent("Test1"), "StringDeTest"); - assertEquals(r.getContent("Test2"), new Integer(1)); - assertEquals(r.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 17:31:48 UTC (rev 33) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-01-28 18:01:26 UTC (rev 34) @@ -12,9 +12,19 @@ public class StructureTest extends TestCase { + Structure structureActual; + Map < String, Class < ? > > structureContentActual; + Map < String, Class < ? > > structureContentExpected; + + Class < ? > columnsClassActual; + Class < ? > columnsClassExpected; + + Set < String > columnsNamesActual; + Set < String > columnsNamesExpected; + public void testGetColumnsNamesVoid() { - Structure s = new StructureImpl(); - Set < String > columnNames = s.getColumnsNames(); + structureActual = new StructureImpl(); + Set < String > columnNames = structureActual.getColumnsNames(); assertEquals(0, columnNames.size()); } @@ -25,29 +35,28 @@ */ public void testAddColumn() { - Map < String, Class < ? > > structureExpected = - new HashMap<String, Class<?>>(); + structureContentExpected = new HashMap<String, Class<?>>(); try { - Structure s = new StructureImpl(); + structureActual = new StructureImpl(); - Field fStructure = s.getClass().getDeclaredField("structure"); + Field fStructure = structureActual.getClass().getDeclaredField("structure"); fStructure.setAccessible(true); - Map < String, Class < ? > > structureActual = - (Map < String, Class < ? > >) fStructure.get(s); + Map < String, Class < ? > > structureContentActual = + (Map < String, Class < ? > >) fStructure.get(structureActual); - s.addColumn("Test1", String.class); - structureExpected.put("Test1", String.class); - assertEquals(structureExpected, structureActual); + structureActual.addColumn("Test1", String.class); + structureContentExpected.put("Test1", String.class); + assertEquals(structureContentExpected, structureContentActual); - s.addColumn("Test2", Object.class); - structureExpected.put("Test2", Object.class); - assertEquals(structureExpected, structureActual); + structureActual.addColumn("Test2", Object.class); + structureContentExpected.put("Test2", Object.class); + assertEquals(structureContentExpected, structureContentActual); - s.addColumn("Test3", Map.class); - structureExpected.put("Test3", Map.class); - assertEquals(structureExpected, structureActual); + structureActual.addColumn("Test3", Map.class); + structureContentExpected.put("Test3", Map.class); + assertEquals(structureContentExpected, structureContentActual); } catch (IllegalArgumentException ex) { Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); @@ -69,52 +78,51 @@ */ public void testRemoveColumn() { - Map < String, Class < ? > > structureExpected = - new HashMap<String, Class<?>>(); + structureContentExpected = new HashMap<String, Class<?>>(); try { - Structure s = new StructureImpl(); + structureActual = new StructureImpl(); - Field fStructure = s.getClass().getDeclaredField("structure"); + Field fStructure = structureActual.getClass().getDeclaredField("structure"); fStructure.setAccessible(true); - Map < String, Class < ? > > structureActual = - (Map < String, Class < ? > >) fStructure.get(s); + Map < String, Class < ? > > structureContentActual = + (Map < String, Class < ? > >) fStructure.get(structureActual); - s.addColumn("Test1", String.class); - structureExpected.put("Test1", String.class); - s.addColumn("Test2", Object.class); - structureExpected.put("Test2", Object.class); - s.addColumn("Test3", Map.class); - structureExpected.put("Test3", Map.class); - assertEquals(structureExpected, structureActual); + structureActual.addColumn("Test1", String.class); + structureContentExpected.put("Test1", String.class); + structureActual.addColumn("Test2", Object.class); + structureContentExpected.put("Test2", Object.class); + structureActual.addColumn("Test3", Map.class); + structureContentExpected.put("Test3", Map.class); + assertEquals(structureContentExpected, structureContentActual); - s.removeColumn("Test1"); - structureExpected.remove("Test1"); - assertEquals(structureExpected, structureActual); + structureActual.removeColumn("Test1"); + structureContentExpected.remove("Test1"); + assertEquals(structureContentExpected, structureContentActual); /** * the key "Test1TOTO" is not in the structure. */ - s.removeColumn("Test1TOTO"); - structureExpected.remove("Test1TOTO"); - assertEquals(structureExpected, structureActual); + structureActual.removeColumn("Test1TOTO"); + structureContentExpected.remove("Test1TOTO"); + assertEquals(structureContentExpected, structureContentActual); - s.removeColumn("Test2"); - structureExpected.remove("Test2"); - assertEquals(structureExpected, structureActual); + structureActual.removeColumn("Test2"); + structureContentExpected.remove("Test2"); + assertEquals(structureContentExpected, structureContentActual); - s.removeColumn("Test3"); - structureExpected.remove("Test3"); - assertEquals(structureExpected, structureActual); + structureActual.removeColumn("Test3"); + structureContentExpected.remove("Test3"); + assertEquals(structureContentExpected, structureContentActual); /** * We try to remove an other key, but the map is empty. */ - s.removeColumn("Test4"); - structureExpected.remove("Test4"); + structureActual.removeColumn("Test4"); + structureContentExpected.remove("Test4"); - assertEquals(structureExpected, structureActual); + assertEquals(structureContentExpected, structureContentActual); } catch (IllegalArgumentException ex) { @@ -136,50 +144,50 @@ */ public void testGetColumnsNames() { - Structure s = new StructureImpl(); + structureActual = new StructureImpl(); - Set<String> columsNamesExpected = new HashSet<String>(); - Set<String> columnsNamesActual = s.getColumnsNames(); + columnsNamesExpected = new HashSet<String>(); + columnsNamesActual = structureActual.getColumnsNames(); - s.addColumn("Test1", String.class); - columsNamesExpected.add("Test1"); - assertEquals(columsNamesExpected, columnsNamesActual); + structureActual.addColumn("Test1", String.class); + columnsNamesExpected.add("Test1"); + assertEquals(columnsNamesExpected, columnsNamesActual); - s.addColumn("Test2", Object.class); - columsNamesExpected.add("Test2"); - assertEquals(columsNamesExpected, columnsNamesActual); + structureActual.addColumn("Test2", Object.class); + columnsNamesExpected.add("Test2"); + assertEquals(columnsNamesExpected, columnsNamesActual); - s.addColumn("Test3", Map.class); - columsNamesExpected.add("Test3"); - assertEquals(columsNamesExpected, columnsNamesActual); + structureActual.addColumn("Test3", Map.class); + columnsNamesExpected.add("Test3"); + assertEquals(columnsNamesExpected, columnsNamesActual); - s.removeColumn("Test1"); - columsNamesExpected.remove("Test1"); - assertEquals(columsNamesExpected, columnsNamesActual); + structureActual.removeColumn("Test1"); + columnsNamesExpected.remove("Test1"); + assertEquals(columnsNamesExpected, columnsNamesActual); /** * the key "Test1TOTO" is not in the structure. */ - s.removeColumn("Test1TOTO"); - columsNamesExpected.remove("Test1TOTO"); - assertEquals(columsNamesExpected, columnsNamesActual); + structureActual.removeColumn("Test1TOTO"); + columnsNamesExpected.remove("Test1TOTO"); + assertEquals(columnsNamesExpected, columnsNamesActual); - s.removeColumn("Test2"); - columsNamesExpected.remove("Test2"); - assertEquals(columsNamesExpected, columnsNamesActual); + structureActual.removeColumn("Test2"); + columnsNamesExpected.remove("Test2"); + assertEquals(columnsNamesExpected, columnsNamesActual); - s.removeColumn("Test3"); - columsNamesExpected.remove("Test3"); - assertEquals(columsNamesExpected, columnsNamesActual); + structureActual.removeColumn("Test3"); + columnsNamesExpected.remove("Test3"); + assertEquals(columnsNamesExpected, columnsNamesActual); /** * We try to remove an other key, but the map is empty. */ - s.removeColumn("Test4"); - columsNamesExpected.remove("Test4"); + structureActual.removeColumn("Test4"); + columnsNamesExpected.remove("Test4"); - assertEquals(columsNamesExpected, columnsNamesActual); + assertEquals(columnsNamesExpected, columnsNamesActual); } @@ -193,83 +201,101 @@ Structure s = new StructureImpl(); - Class<?> columsClassExpected; - Class<?> columsClassActual; +// columnsClassExpected; +// columnsClassActual; + /** + * We put "Test1" + */ s.addColumn("Test1", String.class); - columsClassActual = s.getColumnClass("Test1"); - columsClassExpected = String.class; - assertEquals(columsClassExpected, columsClassActual); + columnsClassActual = s.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + /** + * We put "Test2" + */ s.addColumn("Test2", Object.class); - columsClassActual = s.getColumnClass("Test1"); - columsClassExpected = String.class; - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test2"); - columsClassExpected = Object.class; - assertEquals(columsClassExpected, columsClassActual); + columnsClassActual = s.getColumnClass("Test1"); + columnsClassExpected = String.class; + assertEquals(columnsClassExpected, columnsClassActual); + columnsClassActual = s.getColumnClass("Test2"); + columnsClassExpected = Object.class; + assertEquals(columnsClassExpected, columnsClassActual); + /** + * We put "Test3" + */ s.addColumn("Test3", Map.class); - columsClassActual = s.getColumnClass("Test1"); - columsClassExpected = String.class; - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test2"); - columsClassExpected = Object.class; - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test3"); - columsClassExpected = Map.class; - assertEquals(columsClassExpected, columsClassActual); + 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.removeColumn("Test1"); - columsClassActual = s.getColumnClass("Test1"); - columsClassExpected = null; - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test2"); - columsClassExpected = Object.class; - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test3"); - columsClassExpected = Map.class; - assertEquals(columsClassExpected, columsClassActual); + 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.removeColumn("Test1TOTO"); - columsClassActual = s.getColumnClass("Test1TOTO"); - columsClassExpected = null; - assertEquals(columsClassExpected, columsClassActual); - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test2"); - columsClassExpected = Object.class; - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test3"); - columsClassExpected = Map.class; - assertEquals(columsClassExpected, columsClassActual); + 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.removeColumn("Test2"); - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test2"); - columsClassExpected = null; - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test3"); - columsClassExpected = Map.class; - assertEquals(columsClassExpected, columsClassActual); + 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.removeColumn("Test3"); - assertEquals(columsClassExpected, columsClassActual); - columsClassActual = s.getColumnClass("Test3"); - columsClassExpected = null; - assertEquals(columsClassExpected, columsClassActual); + 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.removeColumn("Test4"); - columsClassActual = s.getColumnClass("Test4"); - columsClassExpected = null; + columnsClassActual = s.getColumnClass("Test4"); + columnsClassExpected = null; - assertEquals(columsClassExpected, columsClassActual); + assertEquals(columnsClassExpected, columnsClassActual); } }

1 0

r33 - in trunk/src: main/java/org/nuiton/mapstoragemanager/plugins/bighashmap test/java/org/nuiton/mapstoragemanager/core
by dlanglais＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: dlanglais Date: 2010-01-28 18:31:48 +0100 (Thu, 28 Jan 2010) New Revision: 33 Removed: trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java Log: Suppression de la classe de test 'useless' ServiceLoaderTest.java, La classe BigTableLoaderTest servira ?\195?\160 cela... (je n'avais pu faire passer grand chose sur les tests de BigTable fait par gilles...) 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 17:16:44 UTC (rev 32) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-28 17:31:48 UTC (rev 33) @@ -4,8 +4,8 @@ import java.util.Map; /** - * Classe Table. - * Représente une table bigtable. + * Class Table. + * Implements the interface Table. * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. * @licence GPL. */ Deleted: trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java 2010-01-28 17:16:44 UTC (rev 32) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java 2010-01-28 17:31:48 UTC (rev 33) @@ -1,15 +0,0 @@ -package org.nuiton.mapstoragemanager.core; - -import junit.framework.TestCase; - -/** - * Classe to test the Core class. - * @author Dorian Langlais - * - */ -public class ServiceLoaderTest extends TestCase { - - public void testCore(){ - - } -}

1 0

r32 - in trunk/src/main/java/org/nuiton/mapstoragemanager: plugins/bighashmap ui/gui
by dlanglais＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: dlanglais Date: 2010-01-28 18:16:44 +0100 (Thu, 28 Jan 2010) New Revision: 32 Modified: 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/ui/gui/ApplicationEngine.java Log: Passage ?\195?\160 l'anglais de la javadoc, renommage des fonctions : add* sous-entend que l'on ajoute quelque chose qui existe d?\195?\169j?\195?\160 ?\195?\160 autre chose, create est plus appropri?\195?\169. de m?\195?\170me remove* sous-entend qu'on le retire ?\195?\160 quelque chose, alors qu'on le d?\195?\169truit... delete est plus appropri?\195?\169. 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 11:27:48 UTC (rev 31) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-28 17:16:44 UTC (rev 32) @@ -1,37 +1,38 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; /** - * Interface listant les opérations nécéssaires sur une table. + * Interface to present the method on a table. + * A table is like a table in SGBD, but in BigTable, the data are stored in + * columns not in rows. * @author Dorian Langlais */ public interface Table { /** - * Méthode permettant l'ajout d'une colonne à la table. - * @param columnName nom de la colonne à ajouter. - * @param columnClass type des objets contenu dans la colonne. - * @param <columnClass> méthode générique paramétrer par le type - * columnClass. + * Create a column in the table. + * @param columnName the column name + * @param columnClass the column class + * @param <columnClass> generics to spécify the class of the stored objects. */ - < columnClass > void addColumn(final String columnName, + < columnClass > void createColumn(final String columnName, final Class < ? > columnClass); /** - * Méthode de suppression de colonne. - * @param columnName nom de la colonne à suprimer. + * Delete a colum of the table. + * @param columnName the column name. */ - void removeColumn(final String columnName); + void deleteColumn(final String columnName); /** - * Méthode permettant de récupérer le contenu d'une ligne par sa clé. - * @param key clé de la ligne à récupérer. - * @return retourne la ligne ayant pour clé key. + * Get a "virtual" rom from the table. + * @param key the key of the row to get + * @return return the row which has key as key */ Row getRow(final String key); /** - * Méthode permettant la suppression d'une ligne par sa clé. - * @param key clé de la ligne à supprimer. + * Remove a row by its key. + * @param key the key */ void removeRow(final String key); } 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 11:27:48 UTC (rev 31) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-28 17:16:44 UTC (rev 32) @@ -13,16 +13,16 @@ /** * Table. - * hashMap ayant pour clé le nom des colonnes et pour valeur une colonne. + * hashMap with key as column name and value, a colum of the table. */ private Map < String, Column < ? > > tableContent; /** - * Structure de la Table. + * Structure of the table. */ private StructureImpl tableStructure; /** - * Constructeur par défaut. + * Default constructor. */ public TableImpl() { this.tableContent = new HashMap < String, Column < ? > > (); @@ -32,7 +32,7 @@ /** * {@inheritDoc} */ - public final < columnClass /**extends Serializable*/ > void addColumn( + public final < columnClass /**extends Serializable*/ > void createColumn( final String columnName, final Class < ? > columnClass) { ColumnImpl < columnClass > column = new ColumnImpl < columnClass > (); this.tableContent.put(columnName, column); @@ -42,7 +42,7 @@ /** * {@inheritDoc} */ - public final void removeColumn(final String columnName) { + public final void deleteColumn(final String columnName) { this.tableContent.remove(columnName); this.tableStructure.removeColumn(columnName); } @@ -64,6 +64,8 @@ * {@inheritDoc} */ public void removeRow(final String key) { - // TODO Auto-generated method stub + for (Column column : tableContent.values()) { + column.delete(key); + } } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-28 11:27:48 UTC (rev 31) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-28 17:16:44 UTC (rev 32) @@ -11,7 +11,7 @@ /** * Show the developers. - * // TO MODIFY + * // TODO */ public final void showGreeting() { JOptionPane.showMessageDialog(null, this, @@ -19,8 +19,8 @@ + "===========\n" + "Crieloue Gilles\n" + "Fages Amaury\n" - + "Langlais Dorian" - + "\nForent\n" + + "Langlais Dorian\n" + + "Gilet Forent\n" + "===========\n" + "Master ALMA", 0); }

1 0

r31 - trunk
by fdesbois＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: fdesbois Date: 2010-01-28 12:27:48 +0100 (Thu, 28 Jan 2010) New Revision: 31 Modified: trunk/pom.xml Log: Add tchemit and fdesbois in developers Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-28 11:18:25 UTC (rev 30) +++ trunk/pom.xml 2010-01-28 11:27:48 UTC (rev 31) @@ -67,6 +67,29 @@ <description>TODO</description> <inceptionYear>2010</inceptionYear> + + <developers> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers>

1 0

r30 - in trunk: . src/main/java/org/nuiton/mapstoragemanager/core src/test/java/org/nuiton/mapstoragemanager/core src/test/resources
by fdesbois＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: fdesbois Date: 2010-01-28 12:18:25 +0100 (Thu, 28 Jan 2010) New Revision: 30 Added: trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java trunk/src/test/resources/log4j.properties Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Log: - Use of commons-logging - Refactor test TestServiceLoader in main class to JUnit test BigTableLoaderTest --> problem, the test doesn't work Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-28 00:35:08 UTC (rev 29) +++ trunk/pom.xml 2010-01-28 11:18:25 UTC (rev 30) @@ -32,6 +32,11 @@ <artifactId>nuiton-utils</artifactId> <version>${lutinutil.version}</version> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency>  <dependency> Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-01-28 00:35:08 UTC (rev 29) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-01-28 11:18:25 UTC (rev 30) @@ -2,6 +2,11 @@ import java.net.MalformedURLException; +/** + * @author fdesbois + * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderText instead + */ +@Deprecated public class TestServiceLoader { public TestServiceLoader() { Added: trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java 2010-01-28 11:18:25 UTC (rev 30) @@ -0,0 +1,69 @@ + +package org.nuiton.mapstoragemanager.core; + +import java.net.MalformedURLException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Created: 28 janv. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class BigTableLoaderTest { + + private static final Log log = LogFactory.getLog(BigTableLoaderTest.class); + + public BigTableLoaderTest() { + } + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test of getBigTable method, of class BigTableLoader. + * @throws MalformedURLException + */ + @Test + public void testGetBigTable() throws MalformedURLException { + log.info("getBigTable"); + //BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); + + // FIXME-FD20100128 NPE : + // java.lang.NullPointerException at org.nuiton.mapstoragemanager.core.BigTableLoader.<init>(BigTableLoader.java:34) + + //Assert.assertNotNull(p.getBigTable()); + } + + /** + * Test of getBigTableSetLoader method, of class BigTableLoader. + */ + //@Test + public void testGetBigTableSetLoader() { + log.info("getBigTableSetLoader"); + } + +} \ No newline at end of file Property changes on: trunk/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/src/test/resources/log4j.properties =================================================================== --- trunk/src/test/resources/log4j.properties (rev 0) +++ trunk/src/test/resources/log4j.properties 2010-01-28 11:18:25 UTC (rev 30) @@ -0,0 +1,14 @@ +# Global logging configuration +#log4j.rootLogger=ERROR, stdout, file +log4j.rootLogger=INFO, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.file=mapstoragemanager.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.org.nuiton=INFO +log4j.logger.org.nuiton.mapstoragemanager=DEBUG

2 1