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

r49 - trunk/src/main/java/org/nuiton/mapstoragemanager/ui
by fgilet＠users.nuiton.org 31 Jan '10

31 Jan '10

Author: fgilet Date: 2010-01-31 23:12:16 +0100 (Sun, 31 Jan 2010) New Revision: 49 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Log: test avec netbeans qui marche et test sur jaxx (relations avec css) Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-01-31 18:29:35 UTC (rev 48) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-01-31 22:12:16 UTC (rev 49) @@ -1,8 +1,38 @@ +/** + * *##% observe-swing + * Copyright (C) 2008 - 2009 IRD + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* +*/ + Application { lookAndFeel: system; locationRelativeTo: {null}; + resizable: true; } +#mainFrame { + title:"Map Storage Manager"; +} + JLabel.boldUnderline { font-weight: bold; +} + +JSplitPane { + oneTouchExpandable:true; + continuousLayout:true; + dividerSize:6; } \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-31 18:29:35 UTC (rev 48) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-31 22:12:16 UTC (rev 49) @@ -1,18 +1,12 @@ -<Application title='Hello' - height="{constants.DEFAULT_HEIGHT}" - width="{constants.DEFAULT_WIDTH}" - minimumSize="{new Dimension(constants.MINIMUM_SIZE_WIDTH,constants.MINIMUM_SIZE_HEIGHT)}" - maximumSize="{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIMUM_SIZE_HEIGHT)}" - resizable='true'> +<Application id='mainFrame' width='800' height='600' + onWindowClosing='engine.close()'>  <script> <![CDATA[ - import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; ApplicationEngine engine = new ApplicationEngine(); - ApplicationConstants constants = new ApplicationConstants(); ]]> </script> @@ -35,19 +29,19 @@ <JMenuItem text="About Us" onActionPerformed='engine.showGreeting()'/> </JMenu> </JMenuBar> - <java.awt.BorderLayout id='BorderLayout'/> - <JPanel layout='{BorderLayout}'> + + <JPanel layout='{new BorderLayout()}' id='demoPanel'> <JToolBar constraints='BorderLayout.NORTH' opaque='true'> - <JLabel text='name base :' styleClass='boldUnderline' /> - <JAXXComboBox> + <JLabel text='name base : ' styleClass='boldUnderline' /> + <JAXXComboBox id='nameBase'> <item value='{null}' label='Select a base name' /> <item value='HBase'/> <item value='Cassandra'/> <item value='Other'/> </JAXXComboBox> - <JLabel text='login :' styleClass='boldUnderline' /> + <JLabel text='login : ' styleClass='boldUnderline'/> <JTextField/> - <JLabel text='password :' styleClass='boldUnderline' /> + <JLabel text='password : ' styleClass='boldUnderline'/> <JPasswordField/> <JButton text='OK'/> </JToolBar>

1 0

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

31 Jan '10

Author: dlanglais Date: 2010-01-31 19:29:35 +0100 (Sun, 31 Jan 2010) New Revision: 48 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java Log: Ajout de tests de suppressions d'?\195?\169l?\195?\169ments et de r?\195?\169cup?\195?\169ration de "keySet" sur les tables et colonnes. Avancement de la classe BigHashMap (finalis?\195?\169e mais ?\195?\160 tester -> c'est un proxy/fa?\195?\167ade qui ne fait que d?\195?\169l?\195?\169guer...) Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-01-31 16:04:11 UTC (rev 47) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-01-31 18:29:35 UTC (rev 48) @@ -101,15 +101,23 @@ */ public String get(String table, String column, String key, int version) { return this.tables.get(table).get(column, key, version).toString(); - //TODO } /** * {@inheritDoc} */ public Map<String, String> getRow(String table, String key) { - throw new UnsupportedOperationException("Not supported yet."); - //TODO return this.tables.get(table).getRow(key); + + Row row = this.tables.get(table).getRow(key); + + Map<String,Object> 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; } /** 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-31 16:04:11 UTC (rev 47) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-31 18:29:35 UTC (rev 48) @@ -1,8 +1,13 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; +import java.lang.reflect.Field; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.NoSuchElementException; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,9 +37,9 @@ } /** - * We add one object and we try to get it. + * We put one object and we try to get it. */ - public void testPut() { + public void testPutAndGet() { columnActual = new ColumnImpl<Object>(); expected = new Object(); @@ -53,6 +58,46 @@ } /** + * We put two object, we verify that they are in the column. + * Then, we try to remove them. + */ + public void testDelete() { + columnActual = new ColumnImpl<Integer>(); + + expected = new Integer(1); + expected2 = new Integer(2); + + columnActual.put("integer 1", expected); + columnActual.put("integer 2", expected2); + + assertEquals(columnActual.get("integer 1"), expected); + assertEquals(columnActual.get("integer 2"), expected2); + + /** + * Now we try to remove integer 1. + */ + columnActual.delete("integer 1"); + try{ + columnActual.get("integer 1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(columnActual.get("integer 2"), expected2); + + /** + * Finally, we try to remove integer 2. + */ + columnActual.delete("integer 2"); + try{ + columnActual.get("integer 2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + } + + /** * testhashCode(). */ public void testHashCode() { @@ -114,6 +159,9 @@ assertNotSame(columnActual, column2Actual); } + /** + * We test the method toString() on Column. + */ public void testToString() { Object toStore, toStore2; @@ -154,4 +202,68 @@ } assertEquals(columnActual.toString(), toStringExpected); } + + /** + * We put objects in the columns and we get the keys. + * We compare with the key set attempt. + */ + public void testGetKeys(){ + + columnActual = new ColumnImpl<Object>(); + + Set<String> expectedSet = new HashSet<String>(); + + /** + * We put object, we and verify that the keySet returned is good. + */ + columnActual.put("obj1", new Object()); + expectedSet.add("obj1"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj2", new Object()); + expectedSet.add("obj2"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj3", new Object()); + expectedSet.add("obj3"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj4", new Object()); + expectedSet.add("obj4"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.put("obj5", new Object()); + expectedSet.add("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * We try to add already exist key. + */ + columnActual.put("obj5", new Object()); + expectedSet.add("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * Now, we will remove object by their keys, and we verify the keySet. + */ + columnActual.delete("obj1"); + expectedSet.remove("obj1"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.delete("obj3"); + expectedSet.remove("obj3"); + assertEquals(expectedSet, columnActual.getKeys()); + + columnActual.delete("obj5"); + expectedSet.remove("obj5"); + assertEquals(expectedSet, columnActual.getKeys()); + + /** + * We try to remove no exist keys : + */ + columnActual.delete("obj6"); + expectedSet.remove("obj6"); + assertEquals(expectedSet, columnActual.getKeys()); + + } } Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-01-31 16:04:11 UTC (rev 47) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-01-31 18:29:35 UTC (rev 48) @@ -6,9 +6,13 @@ import java.lang.reflect.Field; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import junit.framework.Assert; import junit.framework.TestCase; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.Log; @@ -248,7 +252,7 @@ /** * We create a new Table, with two columns. - * We put objects in this columns and we try to get it. + * We put objects in this columns and we try to get them. */ public void testGet() { @@ -369,7 +373,126 @@ assertEquals(expectedInteger1v2, tableActual.get("Integer", "integer1",1)); assertEquals(expectedInteger2v2, tableActual.get("Integer", "integer2",1)); + } + /** + * We pu object in the table and we verify that the ketset return is good. + */ + public void testGetKeys() { + Set<String> keySet = new HashSet<String>(); + + /** + * 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); + + /** + * We put objects in the table and their keys in the keySet. + */ + tableActual.put("String", "string1", expectedString1); + keySet.add("string1"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("String", "string2", expectedString2); + keySet.add("string2"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("Integer", "integer1", expectedInteger1); + keySet.add("integer1"); + assertEquals(keySet, tableActual.getKeys()); + + tableActual.put("Integer", "integer2", expectedInteger2); + keySet.add("integer2"); + assertEquals(keySet, tableActual.getKeys()); } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to remove them. + */ + public void testDelete() { + + /** + * We create object to put (and get) + */ + 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); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + /** + * Now, we will try to delete them. + */ + tableActual.deleteRow("string1"); + try{ + tableActual.get("String", "string1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("string2"); + try{ + tableActual.get("String", "string2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("integer1"); + try{ + tableActual.get("Integer", "integer1"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + tableActual.deleteRow("integer2"); + try{ + tableActual.get("Integer", "integer2"); + Assert.fail(); + } catch (NoSuchElementException e) { + log.info("Exception levée correctement."); + } + } }

1 0

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

31 Jan '10

Author: dlanglais Date: 2010-01-31 17:04:11 +0100 (Sun, 31 Jan 2010) New Revision: 47 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.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/Table.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java Log: Avancement BigHashMap (quelques m?\195?\169thodes compl?\195?\169t?\195?\169es). Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-01-31 15:22:15 UTC (rev 46) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-01-31 16:04:11 UTC (rev 47) @@ -86,23 +86,21 @@ * {@inheritDoc} */ public void put(String table, String column, String key, String content) { - throw new UnsupportedOperationException("Not supported yet."); - //TODO + this.tables.get(table).put(column, key, content); } /** * {@inheritDoc} */ public String get(String table, String column, String key) { - throw new UnsupportedOperationException("Not supported yet."); - //TODO + return this.tables.get(table).get(column, key).toString(); } /** * {@inheritDoc} */ public String get(String table, String column, String key, int version) { - throw new UnsupportedOperationException("Not supported yet."); + return this.tables.get(table).get(column, key, version).toString(); //TODO } @@ -111,15 +109,14 @@ */ public Map<String, String> getRow(String table, String key) { throw new UnsupportedOperationException("Not supported yet."); - //TODO + //TODO return this.tables.get(table).getRow(key); } /** * {@inheritDoc} */ public Set<String> getKeys(String table) { - throw new UnsupportedOperationException("Not supported yet."); - //TODO + return this.tables.get(table).getKeys(); } } 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-31 15:22:15 UTC (rev 46) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-31 16:04:11 UTC (rev 47) @@ -1,5 +1,7 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; +import java.util.Set; + /** * Interface to present the method to implement for en Column. * @author Dorian Langlais @@ -51,4 +53,10 @@ * toString(). */ String toString(); + + /** + * Get the keys of the column. + * @return return a Set containing all the keys of the column. + */ + Set<String> getKeys(); } 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-31 15:22:15 UTC (rev 46) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-31 16:04:11 UTC (rev 47) @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; import java.util.NoSuchElementException; +import java.util.Set; /** * Classe Column. @@ -99,4 +100,11 @@ return ret; } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys() { + return this.column.keySet(); + } } 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-31 15:22:15 UTC (rev 46) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-31 16:04:11 UTC (rev 47) @@ -73,4 +73,10 @@ * @return return the object stored */ Object get(final String columnName, final String key, final long version); + + /** + * Get the keys of the table. + * @return return a set which contains all the keys of the table. + */ + Set<String> getKeys(); } 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-31 15:22:15 UTC (rev 46) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-31 16:04:11 UTC (rev 47) @@ -1,6 +1,7 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -98,4 +99,15 @@ public Set<String> getColumnsNames() { return this.tableColumns.keySet(); } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys() { + Set<String> keys = new HashSet<String>(); + for(Column col : this.tableColumns.values()){ + keys.addAll(col.getKeys()); + } + return keys; + } }

1 0

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

31 Jan '10

Author: dlanglais Date: 2010-01-31 16:22:15 +0100 (Sun, 31 Jan 2010) New Revision: 46 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.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/nvBigTable.java Log: Ajout de corps aux fonctions de BigHashMap (la suite plus tard). Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-01-31 14:58:33 UTC (rev 45) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-01-31 15:22:15 UTC (rev 46) @@ -1,5 +1,8 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import org.nuiton.mapstoragemanager.plugins.nvBigTable; /** @@ -7,6 +10,116 @@ * @author Dorian Langlais * */ -public interface BigHashMap extends nvBigTable { +public class BigHashMap implements nvBigTable { + private Map<String, Table> tables; + private Table currentTable; + + /** + * Default constructor. + */ + public BigHashMap() { + this.tables = new HashMap<String, Table>(); + currentTable = null; + } + + /** + * {@inheritDoc} + * Create a new HashMap database. + */ + public boolean connect(String host, int port, String base, String username, String passwd) { + //throw new UnsupportedOperationException("Not supported yet."); + new BigHashMap(); + return true; + } + + /** + * {@inheritDoc} + */ + public void selectTable(String table) { + this.currentTable = tables.get(table); + } + + /** + * {@inheritDoc} + */ + public void createTable(String table) { + this.tables.put(table, new TableImpl()); + } + + /** + * {@inheritDoc} + */ + public void deleteTable(String table) { + this.tables.remove(table); + } + + /** + * {@inheritDoc} + */ + public Set<String> getTablesNames() { + return this.tables.keySet(); + } + + /** + * {@inheritDoc} + */ + public void createColumn(String table, String column) { + this.tables.get(table).createColumn(column, null); + } + + /** + * {@inheritDoc} + */ + public void deleteColumn(String table, String column) { + this.tables.get(table).deleteColumn(column); + } + + /** + * {@inheritDoc} + */ + public Set<String> getColumnsNames(String table) { + return this.tables.get(table).getColumnsNames(); + } + + /** + * {@inheritDoc} + */ + public void put(String table, String column, String key, String content) { + throw new UnsupportedOperationException("Not supported yet."); + //TODO + } + + /** + * {@inheritDoc} + */ + public String get(String table, String column, String key) { + throw new UnsupportedOperationException("Not supported yet."); + //TODO + } + + /** + * {@inheritDoc} + */ + public String get(String table, String column, String key, int version) { + throw new UnsupportedOperationException("Not supported yet."); + //TODO + } + + /** + * {@inheritDoc} + */ + public Map<String, String> getRow(String table, String key) { + throw new UnsupportedOperationException("Not supported yet."); + //TODO + } + + /** + * {@inheritDoc} + */ + public Set<String> getKeys(String table) { + throw new UnsupportedOperationException("Not supported yet."); + //TODO + } + } 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-31 14:58:33 UTC (rev 45) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-31 15:22:15 UTC (rev 46) @@ -1,5 +1,7 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; +import java.util.Set; + /** * Interface to present the method on a table. * A table is like a table in SGBD, but in BigTable, the data are stored in @@ -24,6 +26,12 @@ void deleteColumn(final String columnName); /** + * Get the columns' name of the table. + * @return Return a set containing the columns' name of the table + */ + Set<String> getColumnsNames(); + + /** * 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 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-31 14:58:33 UTC (rev 45) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-31 15:22:15 UTC (rev 46) @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Set; /** * Class Table. @@ -90,4 +91,11 @@ public Object get(String columnName, String key, long version) { return this.tableColumns.get(columnName).get(key, version); } + + /** + * {@inheritDoc} + */ + public Set<String> getColumnsNames() { + return this.tableColumns.keySet(); + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-01-31 14:58:33 UTC (rev 45) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-01-31 15:22:15 UTC (rev 46) @@ -71,10 +71,12 @@ void deleteColumn(String table, String column); /** - * Get the columns' name. - * @return Return a set containing the columns' name. + * Get the columns' name of one table. + * @param table the table name + * @return Return a set containing the columns' name of the table + * table */ - Set<String> getColumnsNames(); + Set<String> getColumnsNames(String table); /*************** * Cell *

1 0

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

31 Jan '10

Author: dlanglais Date: 2010-01-31 15:58:33 +0100 (Sun, 31 Jan 2010) New Revision: 45 Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java Log: S?\195?\169paration du test PutAndGet en deux sous-tests (testPut et testGet). Afin de retrouver plus facilement l'origine d'un ?\195?\169ventuel probl?\195?\168me. Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-01-31 14:45:20 UTC (rev 44) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-01-31 14:58:33 UTC (rev 45) @@ -196,9 +196,61 @@ /** * We create a new Table, with two columns. + * We put objects in this columns and we use reflexivity to verify that + * objects are really stored in the table. + */ + public void testPut() { + + /** + * 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); + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + try { + /** + * We use reflexivity to verify that objects are really stored. + */ + Field fTableColumns = tableActual.getClass().getDeclaredField("tableColumns"); + fTableColumns.setAccessible(true); + Map<String, Column<?>> tableColumns = (Map<String, Column<?>>) fTableColumns.get(tableActual); + + assertEquals(expectedString1, tableColumns.get("String").get("string1")); + assertEquals(expectedString2, tableColumns.get("String").get("string2")); + assertEquals(expectedInteger1, tableColumns.get("Integer").get("integer1")); + assertEquals(expectedInteger2, tableColumns.get("Integer").get("integer2")); + + } 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); + } 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); + } + } + + /** + * We create a new Table, with two columns. * We put objects in this columns and we try to get it. */ - public void testPutAndGet() { + public void testGet() { /** * We create object to put (and get)

1 0

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

31 Jan '10

Author: dlanglais Date: 2010-01-31 15:45:20 +0100 (Sun, 31 Jan 2010) New Revision: 44 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java Removed: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.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/Table.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java Log: Suppression de la class Database du plugin bighashmap qui sera remplac?\195?\169 par "BigHashMap". Ajout et test des fonctionnalit?\195?\169s d'ajout/r?\195?\169cup?\195?\169ration d'object dans une table. Diverses corrections mineures sur les Columns/Cells. Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-01-31 14:45:20 UTC (rev 44) @@ -0,0 +1,12 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import org.nuiton.mapstoragemanager.plugins.nvBigTable; + +/** + * Interface listant les méthodes nécéssaires sur une base de données. + * @author Dorian Langlais + * + */ +public interface BigHashMap extends nvBigTable { + +} 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-29 01:47:20 UTC (rev 43) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-01-31 14:45:20 UTC (rev 44) @@ -22,6 +22,8 @@ /** * Get an object from its "version". + * The version number start at 0, and increase one by one at each new + * version. * @param t the version wanted (it can be timestamp, number..). * @return The object corresponding to the "version". */ 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-29 01:47:20 UTC (rev 43) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-31 14:45:20 UTC (rev 44) @@ -28,7 +28,7 @@ * @param key the key * @param t object to store */ - void put(String key, T t); + void put(String key, Object t); /** * Delete an object by its key. 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-29 01:47:20 UTC (rev 43) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-31 14:45:20 UTC (rev 44) @@ -46,11 +46,11 @@ /** * {@inheritDoc} */ - public final void put(final String key, final T content) { + public final void put(final String key, final Object content) { try { - this.column.get(key).put(content); + this.column.get(key).put((T)content); } catch (NullPointerException e) { - this.column.put(key, new CellImpl<T>(content)); + this.column.put(key, new CellImpl<T>((T)content)); } } Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java 2010-01-29 01:47:20 UTC (rev 43) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java 2010-01-31 14:45:20 UTC (rev 44) @@ -1,10 +0,0 @@ -package org.nuiton.mapstoragemanager.plugins.bighashmap; - -/** - * Interface listant les méthodes nécéssaires sur une base de données. - * @author Dorian Langlais - * - */ -public interface DataBase { - -} 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-29 01:47:20 UTC (rev 43) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-31 14:45:20 UTC (rev 44) @@ -35,4 +35,34 @@ * @param key the key */ void deleteRow(final String key); + + /** + * Put an object in the table. + * Put the objct o in the column columnName at the key + * key. + * @param columnName the columnName + * @param key the key + * @param o the object + */ + void put(final String columnName, final String key, final Object o); + + /** + * Get an object from the table. + * Get an object from the column columnName with the key key. + * @param columnName the columnName + * @param key the key + * @return return the object stored + */ + Object get(final String columnName, final String key); + + /** + * Get an object from the table. + * Get an object from the column columnName with the key key + * and the versiion number version. + * @param columnName the columnName + * @param key the key + * @param version the version wanted + * @return return the object stored + */ + Object get(final String columnName, final String key, final long version); } 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-29 01:47:20 UTC (rev 43) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-31 14:45:20 UTC (rev 44) @@ -69,4 +69,25 @@ column.delete(key); } } + + /** + * {@inheritDoc} + */ + public void put(String columnName, String key, Object o) { + this.tableColumns.get(columnName).put(key, o); + } + + /** + * {@inheritDoc} + */ + public Object get(String columnName, String key) { + return this.tableColumns.get(columnName).get(key); + } + + /** + * {@inheritDoc} + */ + public Object get(String columnName, String key, long version) { + return this.tableColumns.get(columnName).get(key, version); + } } Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-01-29 01:47:20 UTC (rev 43) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-01-31 14:45:20 UTC (rev 44) @@ -63,6 +63,10 @@ } + /** + * We create columns and we verify that they are actually in the table and + * in the structure of the table. + */ public void testCreateColumn() { tableActual = new TableImpl(); @@ -119,7 +123,14 @@ } } - + + /** + * We create some columns and remove them. + * After add them, we verify that the are actually in the table and in the + * structure. + * The we remove them one by one, and we verify that they are really removed + * of the table and of the structure. + */ public void testRemoveColumn() { tableActual = new TableImpl(); @@ -182,4 +193,131 @@ } } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to get it. + */ + public void testPutAndGet() { + + /** + * We create object to put (and get) + */ + 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); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + } + + /** + * We create a new Table, with two columns. + * We put objects in this columns and we try to get it. + */ + public void testPutAndGetWithVersion() { + + /** + * We create object to put (and get). + */ + 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); + + /** + * We put objects in the table. + */ + tableActual.put("String", "string1", expectedString1); + tableActual.put("String", "string2", expectedString2); + tableActual.put("Integer", "integer1", expectedInteger1); + tableActual.put("Integer", "integer2", expectedInteger2); + + /** + * We try to get them. + */ + assertEquals(expectedString1, tableActual.get("String", "string1")); + assertEquals(expectedString2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); + + /** + * We try to get them with their version number. + */ + assertEquals(expectedString1, tableActual.get("String", "string1",0)); + assertEquals(expectedString2, tableActual.get("String", "string2",0)); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1",0)); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2",0)); + + /** + * We create new object to store in the table. + */ + String expectedString1v2 = new String("string1v2"); + String expectedString2v2 = new String("string2v2"); + Integer expectedInteger1v2 = new Integer(12); + Integer expectedInteger2v2 = new Integer(22); + + /** + * We put them in the table. + */ + tableActual.put("String", "string1", expectedString1v2); + tableActual.put("String", "string2", expectedString2v2); + tableActual.put("Integer", "integer1", expectedInteger1v2); + tableActual.put("Integer", "integer2", expectedInteger2v2); + + /** + * We try to get them by get() : normally we get the last version. + */ + assertEquals(expectedString1v2, tableActual.get("String", "string1")); + assertEquals(expectedString2v2, tableActual.get("String", "string2")); + assertEquals(expectedInteger1v2, tableActual.get("Integer", "integer1")); + assertEquals(expectedInteger2v2, tableActual.get("Integer", "integer2")); + + /** + * We try get the the first version. + */ + assertEquals(expectedString1, tableActual.get("String", "string1",0)); + assertEquals(expectedString2, tableActual.get("String", "string2",0)); + assertEquals(expectedInteger1, tableActual.get("Integer", "integer1",0)); + assertEquals(expectedInteger2, tableActual.get("Integer", "integer2",0)); + + /** + * We try to get the actual version by its version number. + */ + assertEquals(expectedString1v2, tableActual.get("String", "string1",1)); + assertEquals(expectedString2v2, tableActual.get("String", "string2",1)); + assertEquals(expectedInteger1v2, tableActual.get("Integer", "integer1",1)); + assertEquals(expectedInteger2v2, tableActual.get("Integer", "integer2",1)); + + + + } }

1 0

r43 - 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 02:47:20 +0100 (Fri, 29 Jan 2010) New Revision: 43 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java Log: Correction de la classe CellImpl. En effet, l'utilisation du timestamp de la machine n'est pas forc?\195?\169ment tr?\195?\168s judicieux -> deux objects ins?\195?\169r?\195?\169s "durant la m?\195?\170me milliseconde" ont le m?\195?\170me timestamp, et donc sont ?\195?\169crasement de version... Maintenant, r?\195?\169f?\195?\169renc?\195?\169 par le num?\195?\169ro de version. 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-29 01:06:36 UTC (rev 42) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-29 01:47:20 UTC (rev 43) @@ -41,7 +41,8 @@ * {@inheritDoc} */ public final void put(final T t) { - cell.put(System.currentTimeMillis(), t); + cell.put((long)cell.size(), t); + //cell.put(System.currentTimeMillis(), t); } /** @@ -58,9 +59,9 @@ if (cell.size() == 0) { throw new NoSuchElementException(); } - Long max = cell.keySet().iterator().next(); + Long max = 0L; for (Long current : cell.keySet()) { - if (max > current) { + if (max < current) { max = current; } } 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-29 01:06:36 UTC (rev 42) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-29 01:47:20 UTC (rev 43) @@ -155,17 +155,25 @@ public void testToString() { /** - * We create one cell and werify that toString equals "". + * We create one cell and werify that toString equals "" when the cell + * is empty. */ cellActual = new CellImpl<Object>(); assertEquals(cellActual.toString(), ""); + /** + * We create and put one object Integer(1337) and control that + * toString() equals "1337" + */ objectExcepted = new Integer(1337); - cellActual.put(objectExcepted); assertEquals(cellActual.toString(), objectExcepted.toString()); assertEquals(cellActual.toString(), "1337"); + /** + * We create and put another object String("String for testing") and + * control that toString() equals "String for testing". + */ objectExcepted = new String("String for testing"); cellActual.put(objectExcepted); assertEquals(cellActual.toString(), objectExcepted.toString());

1 0

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

29 Jan '10

Author: dlanglais Date: 2010-01-29 02:06:36 +0100 (Fri, 29 Jan 2010) New Revision: 42 Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java Log: Tentative de r?\195?\169paration de l'erreur de build (que je n'ai toujours pas chez moi ... ). 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-29 00:59:32 UTC (rev 41) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-29 01:06:36 UTC (rev 42) @@ -118,16 +118,17 @@ Object toStore, toStore2; Map<String,Object> columnContent; + String toStringExpected; /** * We create one columns. */ columnActual = new ColumnImpl<Object>(); columnContent = new HashMap<String, Object>(); - expected = new String(); + toStringExpected = new String(); for (String key : columnContent.keySet()) { - expected += key + "\t" + columnContent.get(key).toString(); + toStringExpected += key + "\t" + columnContent.get(key).toString(); } - assertEquals(columnActual.toString(), expected); + assertEquals(columnActual.toString(), toStringExpected); /** * We put one object in the column. @@ -135,11 +136,11 @@ toStore = new Integer(10); columnActual.put("key1", toStore); columnContent.put("key1", toStore); - expected = new String(); + toStringExpected = new String(); for (String key : columnContent.keySet()) { - expected += key + "\t" + columnContent.get(key).toString(); + toStringExpected += key + "\t" + columnContent.get(key).toString(); } - assertEquals(columnActual.toString(), expected); + assertEquals(columnActual.toString(), toStringExpected); /** * We put another object in the column. @@ -147,10 +148,10 @@ toStore2 = new String("yahoo !"); columnActual.put("key2", toStore2); columnContent.put("key2", toStore2); - expected = new String(); + toStringExpected = new String(); for (String key : columnContent.keySet()) { - expected += key + "\t" + columnContent.get(key).toString(); + toStringExpected += key + "\t" + columnContent.get(key).toString(); } - assertEquals(columnActual.toString(), expected); + assertEquals(columnActual.toString(), toStringExpected); } }

1 0

r41 - trunk/src/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:59:32 +0100 (Fri, 29 Jan 2010) New Revision: 41 Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java Log: test de la fonction hashCode de StructureImpl. 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-29 00:46:27 UTC (rev 40) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-01-29 00:59:32 UTC (rev 41) @@ -200,7 +200,7 @@ */ public void testGetColumnClass() { - Structure s = new StructureImpl(); + structureActual = new StructureImpl(); // columnsClassExpected; // columnsClassActual; @@ -209,47 +209,47 @@ /** * We put "Test1" */ - s.createColumn("Test1", String.class); - columnsClassActual = s.getColumnClass("Test1"); + structureActual.createColumn("Test1", String.class); + columnsClassActual = structureActual.getColumnClass("Test1"); columnsClassExpected = String.class; assertEquals(columnsClassExpected, columnsClassActual); /** * We put "Test2" */ - s.createColumn("Test2", Object.class); - columnsClassActual = s.getColumnClass("Test1"); + structureActual.createColumn("Test2", Object.class); + columnsClassActual = structureActual.getColumnClass("Test1"); columnsClassExpected = String.class; assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); + columnsClassActual = structureActual.getColumnClass("Test2"); columnsClassExpected = Object.class; assertEquals(columnsClassExpected, columnsClassActual); /** * We put "Test3" */ - s.createColumn("Test3", Map.class); - columnsClassActual = s.getColumnClass("Test1"); + structureActual.createColumn("Test3", Map.class); + columnsClassActual = structureActual.getColumnClass("Test1"); columnsClassExpected = String.class; assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); + columnsClassActual = structureActual.getColumnClass("Test2"); columnsClassExpected = Object.class; assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); + columnsClassActual = structureActual.getColumnClass("Test3"); columnsClassExpected = Map.class; assertEquals(columnsClassExpected, columnsClassActual); /** * we remove "Test1" */ - s.deleteColumn("Test1"); - columnsClassActual = s.getColumnClass("Test1"); + structureActual.deleteColumn("Test1"); + columnsClassActual = structureActual.getColumnClass("Test1"); columnsClassExpected = null; assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); + columnsClassActual = structureActual.getColumnClass("Test2"); columnsClassExpected = Object.class; assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); + columnsClassActual = structureActual.getColumnClass("Test3"); columnsClassExpected = Map.class; assertEquals(columnsClassExpected, columnsClassActual); @@ -257,46 +257,79 @@ * the key "Test1TOTO" is not in the structure. * We try to remove it. */ - s.deleteColumn("Test1TOTO"); - columnsClassActual = s.getColumnClass("Test1TOTO"); + structureActual.deleteColumn("Test1TOTO"); + columnsClassActual = structureActual.getColumnClass("Test1TOTO"); columnsClassExpected = null; assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); + columnsClassActual = structureActual.getColumnClass("Test2"); columnsClassExpected = Object.class; assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); + columnsClassActual = structureActual.getColumnClass("Test3"); columnsClassExpected = Map.class; assertEquals(columnsClassExpected, columnsClassActual); /** * We remove "Test2" */ - s.deleteColumn("Test2"); + structureActual.deleteColumn("Test2"); assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test2"); + columnsClassActual = structureActual.getColumnClass("Test2"); columnsClassExpected = null; assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); + columnsClassActual = structureActual.getColumnClass("Test3"); columnsClassExpected = Map.class; assertEquals(columnsClassExpected, columnsClassActual); /** * We remove "Test3" */ - s.deleteColumn("Test3"); + structureActual.deleteColumn("Test3"); assertEquals(columnsClassExpected, columnsClassActual); - columnsClassActual = s.getColumnClass("Test3"); + columnsClassActual = structureActual.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"); + structureActual.deleteColumn("Test4"); + columnsClassActual = structureActual.getColumnClass("Test4"); columnsClassExpected = null; assertEquals(columnsClassExpected, columnsClassActual); } + + /** + * we create and delete columns. + * we calculate hashcode and compare to hashCode(). + */ + public void testHashCode() { + + structureActual = new StructureImpl(); + int hashCodeExpected = 0; + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We create column "Test1" + */ + structureActual.createColumn("Test1", String.class); + hashCodeExpected += "Test1".hashCode() + String.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We create column "Test2" + */ + structureActual.createColumn("Test2", Integer.class); + hashCodeExpected += "Test2".hashCode() + Integer.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + /** + * We delete column "Test1" + */ + structureActual.deleteColumn("Test1"); + hashCodeExpected -= "Test1".hashCode() + String.class.hashCode(); + assertEquals(structureActual.hashCode(), hashCodeExpected); + + } }

1 0

r40 - trunk/src/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:46:27 +0100 (Fri, 29 Jan 2010) New Revision: 40 Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java Log: patch pour le build 22 de hudson (required : String ; found : Object), pourtant RAS sur ma machine... ? 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-29 00:38:10 UTC (rev 39) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-29 00:46:27 UTC (rev 40) @@ -125,7 +125,7 @@ columnContent = new HashMap<String, Object>(); expected = new String(); for (String key : columnContent.keySet()) { - expected += key + "\t" + columnContent.get(key); + expected += key + "\t" + columnContent.get(key).toString(); } assertEquals(columnActual.toString(), expected); @@ -137,7 +137,7 @@ columnContent.put("key1", toStore); expected = new String(); for (String key : columnContent.keySet()) { - expected += key + "\t" + columnContent.get(key); + expected += key + "\t" + columnContent.get(key).toString(); } assertEquals(columnActual.toString(), expected); @@ -149,7 +149,7 @@ columnContent.put("key2", toStore2); expected = new String(); for (String key : columnContent.keySet()) { - expected += key + "\t" + columnContent.get(key); + expected += key + "\t" + columnContent.get(key).toString(); } assertEquals(columnActual.toString(), expected); }

1 0