1 files changed, 42 insertions, 30 deletions

diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java
index f74d5af8d8f0..ce1e6db28e99 100644
--- a/dbaccess/qa/complex/dbaccess/DataSource.java
+++ b/dbaccess/qa/complex/dbaccess/DataSource.java
@@ -30,32 +30,43 @@ import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XNamingService;
-import complexlib.ComplexTestCase;
+// import complexlib.ComplexTestCase;
 import connectivity.tools.CRMDatabase;
 import connectivity.tools.HsqlDatabase;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
 
-public class DataSource extends ComplexTestCase
+// ---------- 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 class DataSource extends TestCase
 {
 
     HsqlDatabase m_database;
     connectivity.tools.DataSource m_dataSource;
 
     // --------------------------------------------------------------------------------------------------------
-    public String[] getTestMethodNames()
-    {
-        return new String[]
-                {
-                    "testRegistrationName"
-                };
-    }
-
-    // --------------------------------------------------------------------------------------------------------
-    public String getTestObjectName()
-    {
-        return "DataSource";
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//                {
+//                    "testRegistrationName"
+//                };
+//    }
+//
+//    // --------------------------------------------------------------------------------------------------------
+//    public String getTestObjectName()
+//    {
+//        return "DataSource";
+//    }
 
     // --------------------------------------------------------------------------------------------------------
     private void createTestCase()
@@ -64,47 +75,48 @@ public class DataSource extends ComplexTestCase
         {
             if (m_database == null)
             {
-                final CRMDatabase database = new CRMDatabase( getFactory(), false );
+                final CRMDatabase database = new CRMDatabase( getMSF(), false );
                 m_database = database.getDatabase();
                 m_dataSource = m_database.getDataSource();
             }
         }
         catch (Exception e)
         {
-            failed("could not create the test case, error message:\n" + e.getMessage());
+            fail("could not create the test case, error message:\n" + e.getMessage());
         }
         catch (java.lang.Exception e)
         {
-            failed("could not create the test case, error message:\n" + e.getMessage());
+            fail("could not create the test case, error message:\n" + e.getMessage());
         }
     }
 
     // --------------------------------------------------------------------------------------------------------
-    private XMultiServiceFactory getFactory()
-    {
-        return (XMultiServiceFactory) param.getMSF();
-    }
+//    private XMultiServiceFactory getFactory()
+//    {
+//        return (XMultiServiceFactory) param.getMSF();
+//    }
 
     // --------------------------------------------------------------------------------------------------------
-    public void testRegistrationName()
+    @Test public void testRegistrationName()
     {
         try
         {
             createTestCase();
             // 1. check the existing "Bibliography" data source whether it has the proper name
             String dataSourceName = "Bibliography";
-            final connectivity.tools.DataSource bibliography = new connectivity.tools.DataSource(getFactory(), dataSourceName);
-            assureEquals("pre-registered database has a wrong name!", dataSourceName, bibliography.getName());
+            final connectivity.tools.DataSource bibliography = new connectivity.tools.DataSource(getMSF(), dataSourceName);
+            assertEquals("pre-registered database has a wrong name!", dataSourceName, bibliography.getName());
             // 2. register a newly created data source, and verify it has the proper name
             dataSourceName = "someDataSource";
             final XNamingService dataSourceRegistrations = (XNamingService) UnoRuntime.queryInterface(
-                    XNamingService.class, getFactory().createInstance("com.sun.star.sdb.DatabaseContext"));
+                    XNamingService.class, getMSF().createInstance("com.sun.star.sdb.DatabaseContext"));
             dataSourceRegistrations.registerObject("someDataSource", m_dataSource.getXDataSource());
-            assureEquals("registration name of a newly registered data source is wrong", dataSourceName, m_dataSource.getName());
+            assertEquals("registration name of a newly registered data source is wrong", dataSourceName, m_dataSource.getName());
         }
         catch (Exception ex)
         {
-            Logger.getLogger(DataSource.class.getName()).log(Level.SEVERE, null, ex);
+            // Logger.getLogger(DataSource.class.getName()).log(Level.SEVERE, null, ex);
+            fail();
         }
     }
 }