CWS changehid: resync to m90

1 files changed, 16 insertions, 8 deletions

diff --git a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
index 3bba8fa45001..ff89c755a90f 100644
--- a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
+++ b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
@@ -26,13 +26,21 @@
  ************************************************************************/
 package complex.dbaccess;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdb.XSingleSelectQueryComposer;
-import com.sun.star.uno.UnoRuntime;
 import connectivity.tools.CRMDatabase;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
 public abstract class CRMBasedTestCase extends TestCase
 {
     protected   CRMDatabase m_database;
@@ -42,30 +50,30 @@ public abstract class CRMBasedTestCase extends TestCase
     {
         try
         {
-            m_database = new CRMDatabase( getORB(), false );
+            m_database = new CRMDatabase( getMSF(), false );
         }
         catch ( Exception e )
         {
             e.printStackTrace( System.err );
-            assure( "caught an exception (" + e.getMessage() + ") while creating the test case", false );
+            fail( "caught an exception (" + e.getMessage() + ") while creating the test case");
         }
     }
 
     // --------------------------------------------------------------------------------------------------------
-    @Override
-    public void before()
+    @Before public void before()
     {
         createTestCase();
     }
 
     // --------------------------------------------------------------------------------------------------------
-    @Override
-    public void after()
+    @After public void after()
     {
         try
         {
             if ( m_database != null )
+            {
                 m_database.saveAndClose();
+            }
         }
         catch ( Exception ex )
         {