[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5960] trunk/sql12/fw/src/test/java/net/ sourceforge/squirrel_sql

[<man...@us...>]

Revision: 5960
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5960&view=rev
Author:   manningr
Date:     2010-11-11 00:02:06 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
After testing serializability, be sure to cleanup the file that was created during the test (/tmp/classUnderTest.ser).

Modified Paths:
--------------
    trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/AbstractSerializableTest.java
    trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/BaseSQuirreLJUnit4TestCase.java

Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/AbstractSerializableTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/AbstractSerializableTest.java	2010-11-09 22:45:33 UTC (rev 5959)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/AbstractSerializableTest.java	2010-11-11 00:02:06 UTC (rev 5960)
@@ -24,35 +24,51 @@
 import java.io.Serializable;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Test;
 
-
 /**
- * Tests for classes that are Serializable should extend this class then implement a @Before method that 
+ * Tests for classes that are Serializable should extend this class then implement a @Before method that
  * initializes the protected serializableToTest to an instance of the classUnderTest.
- * 
  */
 public abstract class AbstractSerializableTest extends BaseSQuirreLJUnit4TestCase
 {
 
 	protected Serializable serializableToTest = null;
-	
+
 	public AbstractSerializableTest()
 	{
 		super();
 	}
 
 	@Test
-	public void serializationTest() throws Exception
+	public void serializationTest()
 	{
 		String tmpDir = System.getProperty("java.io.tmpdir", "/tmp");
-		String filename = tmpDir + File.separator  + "classUnderTest.ser";
+		String filename = tmpDir + File.separator + "classUnderTest.ser";
+		File f = new File(filename);
 		FileOutputStream fos = null;
 		ObjectOutputStream out = null;
-		fos = new FileOutputStream(filename);
-		out = new ObjectOutputStream(fos);
-		out.writeObject(serializableToTest);
-		out.close();
+
+		try
+		{
+			fos = new FileOutputStream(f);
+			out = new ObjectOutputStream(fos);
+			out.writeObject(serializableToTest);
+		}
+		catch (Exception e)
+		{
+			Assert.fail("serializableToTest class: " + serializableToTest.getClass().getName()
+				+ " cannot be serialized: " + e.getMessage());
+			e.printStackTrace();
+		} finally {
+			ioutil.closeOutputStream(fos);
+			ioutil.closeOutputStream(out);
+			if (f.exists() && f.canWrite()) {
+				f.delete();
+			}
+		}
+
 	}
 
 	@After
@@ -60,5 +76,5 @@
 	{
 		serializableToTest = null;
 	}
-	
+
 }
\ No newline at end of file

Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/BaseSQuirreLJUnit4TestCase.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/BaseSQuirreLJUnit4TestCase.java	2010-11-09 22:45:33 UTC (rev 5959)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/BaseSQuirreLJUnit4TestCase.java	2010-11-11 00:02:06 UTC (rev 5960)
@@ -6,6 +6,8 @@
 
 import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
 import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -26,6 +28,8 @@
 	
 	protected EasyMockHelper mockHelper = new EasyMockHelper();
 	
+	protected IOUtilities ioutil = new IOUtilitiesImpl(); 
+	
 	public BaseSQuirreLJUnit4TestCase()
 	{
 		StringManager.setTestMode(true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.