svn commit: r427124 - in /struts/struts2/trunk/apps/mailreader/src/test: java/mailreader2/BaseSqlMapTest.java java/mailreader2/SqlMapTest.java resources/sql/mailreader-schema-drop.sql

[hu...@apache.org]

Author: husted
Date: Mon Jul 31 07:17:50 2006
New Revision: 427124

URL: http://svn.apache.org/viewvc?rev=427124&view=rev
Log:
WW-1399 Correct unit test lifecycle so that tables are dropped between cycles.

Added:
    struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-schema-drop.sql
Modified:
    struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java
    struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java

Modified: struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java?rev=427124&r1=427123&r2=427124&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java (original)
+++ struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java Mon Jul 31 07:17:50 2006
@@ -17,15 +17,15 @@
  */
 public class BaseSqlMapTest extends TestCase {
 
-    protected static SqlMapClient sqlMap;
+    protected SqlMapClient sqlMap;
 
-    protected static void initSqlMap(String configFile, Properties props) throws Exception {
+    protected  void initSqlMap(String configFile, Properties props) throws Exception {
         Reader reader = Resources.getResourceAsReader(configFile);
         sqlMap = SqlMapClientBuilder.buildSqlMapClient(reader, props);
         reader.close();
     }
 
-    protected static void initScript(String script) throws Exception {
+    protected void runScript(String script) throws Exception {
         DataSource ds = sqlMap.getDataSource();
 
         Connection conn = ds.getConnection();
@@ -44,14 +44,13 @@
 
 
     protected void setUp() throws Exception {
-        if (sqlMap==null) {
-            initSqlMap("sql-map-config.xml", null);
-            initScript("sql/mailreader-schema.sql");
-            initScript("sql/mailreader-sample.sql");
-        }
+        initSqlMap("sql-map-config.xml", null);
+        runScript("sql/mailreader-schema.sql");
+        runScript("sql/mailreader-sample.sql");
     }
 
     protected void tearDown() throws Exception {
+        runScript("sql/mailreader-schema-drop.sql");
     }
 
     public void testInit() throws Exception {

Modified: struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java?rev=427124&r1=427123&r2=427124&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java (original)
+++ struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java Mon Jul 31 07:17:50 2006
@@ -128,7 +128,7 @@
     }
 
     public void testSUBSCRIPTION_INSERT_ASSERT_fail() throws Exception {
-        input.setSubscription_key(subscription_key);
+        input.setRegistration_key(registration_key);
         input.setSubscription_host(subscription_host);
         Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT,input);
         Long count = (Long) output;
@@ -157,7 +157,6 @@
         Long count = (Long) output;
         assertTrue("Expected subscription to NOW exist",count.intValue()>0);
     }
-
 
    private void assertSubscription(AppData output) throws Exception {
        assertEquals(host_user, output.getHost_user());

Added: struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-schema-drop.sql
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-schema-drop.sql?rev=427124&view=auto
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-schema-drop.sql (added)
+++ struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-schema-drop.sql Mon Jul 31 07:17:50 2006
@@ -0,0 +1,4 @@
+DROP TABLE locale;
+DROP TABLE registration;
+DROP TABLE protocol;
+DROP TABLE subscription;