[Schmitzm-commits] r1162 - in trunk: src/skrueger/geotools/io src_junit/skrueger/geotools/io

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-10-24 18:55:46 +0200 (Sun, 24 Oct 2010)
New Revision: 1162

Modified:
   trunk/src/skrueger/geotools/io/DbServerSettings.java
   trunk/src_junit/skrueger/geotools/io/DbServerListTest.java
   trunk/src_junit/skrueger/geotools/io/DbServerSettingsTest.java
Log:


Modified: trunk/src/skrueger/geotools/io/DbServerSettings.java
===================================================================
--- trunk/src/skrueger/geotools/io/DbServerSettings.java	2010-10-24 16:44:18 UTC (rev 1161)
+++ trunk/src/skrueger/geotools/io/DbServerSettings.java	2010-10-24 16:55:46 UTC (rev 1162)
@@ -202,19 +202,19 @@
 		serialized.append(getDbType().toString());
 		serialized.append(DELIMITER);
 
-		serialized.append(getHost().toString());
+		serialized.append(getHost());
 		serialized.append(DELIMITER);
 
 		serialized.append(getPort().toString());
 		serialized.append(DELIMITER);
 
-		serialized.append(getUsername().toString());
+		serialized.append(getUsername());
 		serialized.append(DELIMITER);
 
-		serialized.append(getPassword().toString());
+		serialized.append(getPassword());
 		serialized.append(DELIMITER);
 
-		serialized.append(getDatabase().toString());
+		serialized.append(getDatabase());
 		serialized.append(DELIMITER);
 
 		serialized.append(getExposePrimaryKey().toString());

Modified: trunk/src_junit/skrueger/geotools/io/DbServerListTest.java
===================================================================
--- trunk/src_junit/skrueger/geotools/io/DbServerListTest.java	2010-10-24 16:44:18 UTC (rev 1161)
+++ trunk/src_junit/skrueger/geotools/io/DbServerListTest.java	2010-10-24 16:55:46 UTC (rev 1162)
@@ -22,7 +22,7 @@
 
 		assertEquals(list1.size(), list2.size());
 		assertEquals(list1.get(0).getDbType(), list2.get(0).getDbType());
-		assertEquals(list1.get(1), list2.get(1));
+		assertEquals(list1.get(1).toPropertiesString(), list2.get(1).toPropertiesString());
 	}
 
 	@Test

Modified: trunk/src_junit/skrueger/geotools/io/DbServerSettingsTest.java
===================================================================
--- trunk/src_junit/skrueger/geotools/io/DbServerSettingsTest.java	2010-10-24 16:44:18 UTC (rev 1161)
+++ trunk/src_junit/skrueger/geotools/io/DbServerSettingsTest.java	2010-10-24 16:55:46 UTC (rev 1162)
@@ -1,7 +1,6 @@
 package skrueger.geotools.io;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.net.MalformedURLException;
@@ -20,8 +19,6 @@
 		dbStore1.setDatabase("testDb");
 		dbStore1.setSchema("myschema");
 
-		assertFalse(dbStore1.isWellDefined());
-		dbStore1.setHost("localhost");
 		assertTrue(dbStore1.isWellDefined());
 
 		dbStore1.toPropertiesString();