[Libreoffice-commits] core.git: 2 commits - dbaccess/source qadevOOo/tests

[Michael Stahl]

 dbaccess/source/core/dataaccess/ModelImpl.cxx  |    4 ++++
 qadevOOo/tests/java/mod/_dbaccess/ORowSet.java |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 97346bdddf4c7f5bd156e60b83223bc547d5d6f5
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 12 20:48:47 2013 +0100

    Revert "There's no reason for these defaults in one constructor but not the other"
    
    The reason is that dbaccess_unoapi dbaccess.ORowSet fails with:
    
    lib.StatusException: couldn't set up test environment
        at mod._dbaccess.ORowSet.createTestEnvironment(ORowSet.java:479)
    
    This reverts commit 36caac0e029a3caf50cb27af339efd69008d414e.

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 62c5713..2d77fc1 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -427,7 +427,11 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XMultiServiceFactory >&
             ,m_pSharedConnectionManager(NULL)
             ,m_nControllerLockCount(0)
 {
+    // some kind of default
     DBG_CTOR(ODatabaseModelImpl,NULL);
+    m_sConnectURL = "jdbc:";
+    m_aTableFilter.realloc(1);
+    m_aTableFilter[0] = "%";
     impl_construct_nothrow();
 }
 
commit 811462723bcf72591b5dbbf38cb760612bd6030f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 12 20:48:28 2013 +0100

    qadevOOo: fix typo
    
    Change-Id: I00e90954f535d023b48a80d319563c43bd935d93

diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index 10f88b6..5d84b90 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -466,7 +466,7 @@ public class ORowSet extends TestCase {
         }
         catch(com.sun.star.uno.Exception e)
         {
-            log.println( "couldn't set up tes tenvironment:" );
+            log.println( "couldn't set up test environment:" );
             e.printStackTrace(log);
             try
             {
@@ -476,7 +476,7 @@ public class ORowSet extends TestCase {
             catch(Exception ex)
             {
             }
-            throw new StatusException( "couldn't set up tes tenvironment", e );
+            throw new StatusException( "couldn't set up test environment", e );
         }
         finally
         {