Author: dlanglais Date: 2010-03-02 16:04:24 +0100 (Tue, 02 Mar 2010) New Revision: 163 Added: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java Removed: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java Log: Nouveaux tests sur les tables dans BigHashMap et BigHashMapV2 : getColumnsNames() et getRow(). Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-03-02 13:31:59 UTC (rev 162) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-03-02 15:04:24 UTC (rev 163) @@ -3,7 +3,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.NoSuchElementException; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Class Table. @@ -13,6 +16,11 @@ public class TableImpl implements Table { /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(TableImpl.class); + + /** * Table. * hashMap with key as column name and value, a colum of the table. */ @@ -54,7 +62,20 @@ public final Row getRow(final String key) { Map<String, Object> rowContent = new HashMap<String, Object>(); for (String columnName : tableStructure.getColumnsNames()) { - rowContent.put(columnName, tableColumns.get(columnName).get(key)); + try { + + Object content = tableColumns.get(columnName).get(key); + +// LOG.info(columnName + ' ' + key + ' ' + content); + + if (content != null) { + rowContent.put(columnName, content); + } else { + rowContent.put(columnName, null); + } + } catch (NoSuchElementException e) { + LOG.trace(e); + } } return new RowImpl(tableStructure, rowContent); } Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-03-02 13:31:59 UTC (rev 162) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-03-02 15:04:24 UTC (rev 163) @@ -496,4 +496,124 @@ LOG.trace("Exception levée correctement."); } } + + /** + * We create a new Table, with two columns. + * We put objects in this columns. + * We get the rows and verify that the content is good. + */ + public void testGetRow() { + + /** + * We create object to put + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + Integer expectedInteger1 = new Integer(1); + Integer expectedInteger2 = new Integer(2); + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String", String.class); + tableActual.createColumn("Integer", Integer.class); + + Map<String,Object> rowString1Content; + Map<String,Object> rowString2Content; + Map<String,Object> rowInteger1Content; + Map<String,Object> rowInteger2Content; + Row rowString1; + Row rowString2; + Row rowInteger1; + Row rowInteger2; + /** + * We put objects in the table. + */ + { + rowString1Content = new HashMap<String, Object>(); + rowString2Content = new HashMap<String, Object>(); + rowInteger1Content = new HashMap<String, Object>(); + rowInteger2Content = new HashMap<String, Object>(); + + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + } + /** + * We get rows. + */ + { + rowString1Content.put("String", expectedString1); + rowString1Content.put("Integer", null); + rowString2Content.put("String", expectedString2); + rowString2Content.put("Integer", null); + rowInteger1Content.put("Integer", expectedInteger1); + rowInteger1Content.put("String", null); + rowInteger2Content.put("Integer", expectedInteger2); + rowInteger2Content.put("String", null); + + rowString1 = tableActual.getRow("string1"); + rowString2 = tableActual.getRow("string2"); + rowInteger1 = tableActual.getRow("integer1"); + rowInteger2 = tableActual.getRow("integer2"); + + LOG.trace(rowString1.toString() + '\n' + + rowString2.toString() + '\n' + + rowInteger1.toString() + '\n' + + rowInteger2.toString()); + LOG.trace(rowString1Content.toString() + '\n' + + rowString2Content.toString() + '\n' + + rowInteger1Content.toString() + '\n' + + rowInteger2Content.toString()); + } + + /** + * We verify row content. + */ + { + assertEquals(rowString1Content, rowString1.getRowContent()); + assertEquals(rowString2Content, rowString2.getRowContent()); + assertEquals(rowInteger1Content, rowInteger1.getRowContent()); + assertEquals(rowInteger2Content, rowInteger2.getRowContent()); + } + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns. + * We get the rows and verify that the content is good. + */ + public void testGestColumnsNames() { + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + Set<String> columnsNamesExpected = new HashSet<String>(); + /** + * Table with zero column. + */ + { + assertEquals(columnsNamesExpected, tableActual.getColumnsNames()); + } + + /** + * Table with one column. + */ + { + tableActual.createColumn("String", String.class); + columnsNamesExpected.add("String"); + assertEquals(columnsNamesExpected, tableActual.getColumnsNames()); + } + + /** + * Table with two columns. + */ + { + tableActual.createColumn("Integer", Integer.class); + columnsNamesExpected.add("Integer"); + assertEquals(columnsNamesExpected, tableActual.getColumnsNames()); + } + } } Deleted: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java 2010-03-02 13:31:59 UTC (rev 162) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java 2010-03-02 15:04:24 UTC (rev 163) @@ -1,160 +0,0 @@ -package org.nuiton.mapstoragemanager.plugins.bighashmapv2; - -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import org.nuiton.mapstoragemanager.plugins.BigTable; - -/** - * Implementation of bigTable with hashMap. - * @author Dorian Langlais - * - */ -public class BigHashMap implements BigTable { - - /** - * tables. - * hashMap with value is table, and key its name. - */ - private Map<String, Table> tables; - - /** - * Default constructor. - */ - public BigHashMap() { - this.tables = new HashMap<String, Table>(); - // Not used - //currentTable = null; - } - - /** - * {@inheritDoc} - * Create a new HashMap database. - */ - @Override - public final boolean connect(final Properties properties) { - //throw new UnsupportedOperationException("Not supported yet."); - new BigHashMap(); - return true; - } - - /** - * {@inheritDoc} - */ - @Override - public final void selectTable(final String table) { - // Not used - //this.currentTable = tables.get(table); - } - - /** - * {@inheritDoc} - */ - @Override - public final void createTable(final String table) { - this.tables.put(table, new TableImpl()); - } - - /** - * {@inheritDoc} - */ - @Override - public final void deleteTable(final String table) { - this.tables.remove(table); - } - - /** - * {@inheritDoc} - */ - @Override - public final Set<String> getTablesNames() { - return this.tables.keySet(); - } - - /** - * {@inheritDoc} - */ - @Override - public final void createColumn(final String table, final String column) { - this.tables.get(table).createColumn(column); - } - - /** - * {@inheritDoc} - */ - @Override - public final void deleteColumn(final String table, final String column) { - this.tables.get(table).deleteColumn(column); - } - - /** - * {@inheritDoc} - */ - @Override - public final Set<String> getColumnsNames(final String table) { - return this.tables.get(table).getColumnsNames(); - } - - /** - * {@inheritDoc} - */ - @Override - public final void put(final String table, final String column, - final String key, final String content) { - this.tables.get(table).put(column, key, content); - } - - /** - * {@inheritDoc} - */ - @Override - public final String get(final String table, final String column, - final String key) { - return this.tables.get(table).get(column, key).toString(); - } - - /** - * {@inheritDoc} - */ - @Override - public final String get(final String table, final String column, - final String key, final int version) { - return this.tables.get(table).get(column, key, version).toString(); - } - - /** - * {@inheritDoc} - */ - @Override - public final Map<String, String> getRow(final String table, - final String key) { - - Row row = this.tables.get(table).getRow(key); - - Map<String, String> rowContent = row.getRowContent(); - Map<String, String> rowMap = new HashMap<String, String>(); - - for (String rowKey : rowContent.keySet()) { - String rowValue = rowContent.get(rowKey).toString(); - rowMap.put(rowKey, rowValue); - } - return rowMap; - } - - /** - * {@inheritDoc} - */ - @Override - public final Set<String> getKeys(final String table) { - return this.tables.get(table).getKeys(); - } - - /** - * {@inheritDoc} - */ - @Override - public final String getPluginName() { - return this.getClass().getSimpleName(); - } -} Copied: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java (from rev 162, trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java) =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java (rev 0) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-02 15:04:24 UTC (rev 163) @@ -0,0 +1,160 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmapv2; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import org.nuiton.mapstoragemanager.plugins.BigTable; + +/** + * Implementation of bigTable with hashMap. + * @author Dorian Langlais + * + */ +public class BigHashMapV2 implements BigTable { + + /** + * tables. + * hashMap with value is table, and key its name. + */ + private Map<String, Table> tables; + + /** + * Default constructor. + */ + public BigHashMapV2() { + this.tables = new HashMap<String, Table>(); + // Not used + //currentTable = null; + } + + /** + * {@inheritDoc} + * Create a new HashMap database. + */ + @Override + public final boolean connect(final Properties properties) { + //throw new UnsupportedOperationException("Not supported yet."); + new BigHashMapV2(); + return true; + } + + /** + * {@inheritDoc} + */ + @Override + public final void selectTable(final String table) { + // Not used + //this.currentTable = tables.get(table); + } + + /** + * {@inheritDoc} + */ + @Override + public final void createTable(final String table) { + this.tables.put(table, new TableImpl()); + } + + /** + * {@inheritDoc} + */ + @Override + public final void deleteTable(final String table) { + this.tables.remove(table); + } + + /** + * {@inheritDoc} + */ + @Override + public final Set<String> getTablesNames() { + return this.tables.keySet(); + } + + /** + * {@inheritDoc} + */ + @Override + public final void createColumn(final String table, final String column) { + this.tables.get(table).createColumn(column); + } + + /** + * {@inheritDoc} + */ + @Override + public final void deleteColumn(final String table, final String column) { + this.tables.get(table).deleteColumn(column); + } + + /** + * {@inheritDoc} + */ + @Override + public final Set<String> getColumnsNames(final String table) { + return this.tables.get(table).getColumnsNames(); + } + + /** + * {@inheritDoc} + */ + @Override + public final void put(final String table, final String column, + final String key, final String content) { + this.tables.get(table).put(column, key, content); + } + + /** + * {@inheritDoc} + */ + @Override + public final String get(final String table, final String column, + final String key) { + return this.tables.get(table).get(column, key).toString(); + } + + /** + * {@inheritDoc} + */ + @Override + public final String get(final String table, final String column, + final String key, final int version) { + return this.tables.get(table).get(column, key, version).toString(); + } + + /** + * {@inheritDoc} + */ + @Override + public final Map<String, String> getRow(final String table, + final String key) { + + Row row = this.tables.get(table).getRow(key); + + Map<String, String> rowContent = row.getRowContent(); + Map<String, String> rowMap = new HashMap<String, String>(); + + for (String rowKey : rowContent.keySet()) { + String rowValue = rowContent.get(rowKey).toString(); + rowMap.put(rowKey, rowValue); + } + return rowMap; + } + + /** + * {@inheritDoc} + */ + @Override + public final Set<String> getKeys(final String table) { + return this.tables.get(table).getKeys(); + } + + /** + * {@inheritDoc} + */ + @Override + public final String getPluginName() { + return this.getClass().getSimpleName(); + } +} Property changes on: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-02 13:31:59 UTC (rev 162) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-02 15:04:24 UTC (rev 163) @@ -3,7 +3,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.NoSuchElementException; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Class Table. @@ -13,6 +16,11 @@ public class TableImpl implements Table { /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(TableImpl.class); + + /** * Table. * hashMap with key as column name and value, a colum of the table. */ @@ -53,7 +61,20 @@ public final Row getRow(final String key) { Map<String, String> rowContent = new HashMap<String, String>(); for (String columnName : tableStructure.getColumnsNames()) { - rowContent.put(columnName, tableColumns.get(columnName).get(key)); + try { + + String content = tableColumns.get(columnName).get(key); + +// LOG.info(columnName + ' ' + key + ' ' + content); + + if (content != null) { + rowContent.put(columnName, content); + } else { + rowContent.put(columnName, null); + } + } catch (NoSuchElementException e) { + LOG.trace(e); + } } return new RowImpl(tableStructure, rowContent); } Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java =================================================================== --- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-02 13:31:59 UTC (rev 162) +++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-02 15:04:24 UTC (rev 163) @@ -506,4 +506,124 @@ LOG.trace("Exception levée correctement."); } } + + /** + * We create a new Table, with two columns. + * We put objects in this columns. + * We get the rows and verify that the content is good. + */ + public void testGetRow() { + + /** + * We create object to put + */ + String expectedString1 = new String("string1"); + String expectedString2 = new String("string2"); + String expectedInteger1 = new String("1"); + String expectedInteger2 = new String("2"); + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + tableActual.createColumn("String"); + tableActual.createColumn("Integer"); + + Map<String,Object> rowString1Content; + Map<String,Object> rowString2Content; + Map<String,Object> rowInteger1Content; + Map<String,Object> rowInteger2Content; + Row rowString1; + Row rowString2; + Row rowInteger1; + Row rowInteger2; + /** + * We put objects in the table. + */ + { + rowString1Content = new HashMap<String, Object>(); + rowString2Content = new HashMap<String, Object>(); + rowInteger1Content = new HashMap<String, Object>(); + rowInteger2Content = new HashMap<String, Object>(); + + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + } + /** + * We get rows. + */ + { + rowString1Content.put("String", expectedString1); + rowString1Content.put("Integer", null); + rowString2Content.put("String", expectedString2); + rowString2Content.put("Integer", null); + rowInteger1Content.put("Integer", expectedInteger1); + rowInteger1Content.put("String", null); + rowInteger2Content.put("Integer", expectedInteger2); + rowInteger2Content.put("String", null); + + rowString1 = tableActual.getRow("string1"); + rowString2 = tableActual.getRow("string2"); + rowInteger1 = tableActual.getRow("integer1"); + rowInteger2 = tableActual.getRow("integer2"); + + LOG.trace(rowString1.toString() + '\n' + + rowString2.toString() + '\n' + + rowInteger1.toString() + '\n' + + rowInteger2.toString()); + LOG.trace(rowString1Content.toString() + '\n' + + rowString2Content.toString() + '\n' + + rowInteger1Content.toString() + '\n' + + rowInteger2Content.toString()); + } + + /** + * We verify row content. + */ + { + assertEquals(rowString1Content, rowString1.getRowContent()); + assertEquals(rowString2Content, rowString2.getRowContent()); + assertEquals(rowInteger1Content, rowInteger1.getRowContent()); + assertEquals(rowInteger2Content, rowInteger2.getRowContent()); + } + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns. + * We get the rows and verify that the content is good. + */ + public void testGestColumnsNames() { + + /** + * We create the table and columns. + */ + tableActual = new TableImpl(); + Set<String> columnsNamesExpected = new HashSet<String>(); + /** + * Table with zero column. + */ + { + assertEquals(columnsNamesExpected, tableActual.getColumnsNames()); + } + + /** + * Table with one column. + */ + { + tableActual.createColumn("String"); + columnsNamesExpected.add("String"); + assertEquals(columnsNamesExpected, tableActual.getColumnsNames()); + } + + /** + * Table with two columns. + */ + { + tableActual.createColumn("Integer"); + columnsNamesExpected.add("Integer"); + assertEquals(columnsNamesExpected, tableActual.getColumnsNames()); + } + } } Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java =================================================================== --- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java 2010-03-02 13:31:59 UTC (rev 162) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java 2010-03-02 15:04:24 UTC (rev 163) @@ -19,7 +19,8 @@ import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.AssertJdomElement; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMap; +import org.nuiton.mapstoragemanager.plugins.Plugin; +import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.plugins.getFile; /** @@ -62,7 +63,7 @@ /******************************** * Creation of the database. * ********************************/ - BigTable nbt = new BigHashMap(); + BigTable nbt = new BigHashMapV2(); Element database = new Element("database"); expected.addContent(database); @@ -252,7 +253,7 @@ * @param args args. */ public static void main(String[] args) { - BigTable bt = new BigHashMap(); + BigTable bt = new BigHashMapV2(); bt.createTable("table1"); bt.createTable("table2"); @@ -281,4 +282,13 @@ exporter.exportTo(bt,exportTest); exportTest.delete(); } + + public void testGetPluginName() { + Plugin toXML = new ToXML(); + String expectedPluginName = toXML.getClass().getSimpleName(); + String actualPluginName = toXML.getClass().getSimpleName(); + LOG.info("pluginName : {expected,'" + expectedPluginName + + "'} - {actual,'" + actualPluginName + "'}"); + assertEquals(expectedPluginName, actualPluginName); + } } Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java =================================================================== --- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-02 13:31:59 UTC (rev 162) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-02 15:04:24 UTC (rev 163) @@ -16,7 +16,8 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.plugins.Importer; import org.nuiton.mapstoragemanager.plugins.BigTable; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMap; +import org.nuiton.mapstoragemanager.plugins.Plugin; +import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.plugins.getFile; /** @@ -45,7 +46,7 @@ // import fiveTables. Importer importer = new FromXML(); - BigTable bigTable = new BigHashMap(); + BigTable bigTable = new BigHashMapV2(); importer.importFrom(bigTable, fiveTables); @@ -86,7 +87,7 @@ // import fiveTables. Importer importer = new FromXML(); - BigTable bigTable = new BigHashMap(); + BigTable bigTable = new BigHashMapV2(); importer.importFrom(bigTable, twoTablesFiveColumns); @@ -143,7 +144,7 @@ // import fiveTables. Importer importer = new FromXML(); - BigTable bigTable = new BigHashMap(); + BigTable bigTable = new BigHashMapV2(); importer.importFrom(bigTable, twoTablesFiveColumns); @@ -263,4 +264,13 @@ } } } + + public void testGetPluginName() { + Plugin fromXML = new FromXML(); + String expectedPluginName = fromXML.getClass().getSimpleName(); + String actualPluginName = fromXML.getClass().getSimpleName(); + LOG.info("pluginName : {expected,'" + expectedPluginName + + "'} - {actual,'" + actualPluginName + "'}"); + assertEquals(expectedPluginName, actualPluginName); + } }