### Eclipse Workspace Patch 1.0
#P testuno
Index: source/testcase/uno/db/utils/TestCase.java
===================================================================
--- source/testcase/uno/db/utils/TestCase.java	(revision 0)
+++ source/testcase/uno/db/utils/TestCase.java	(revision 0)
@@ -0,0 +1,140 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+package testcase.uno.db.utils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.bridge.UnoUrlResolver;
+import com.sun.star.bridge.XUnoUrlResolver;
+import com.sun.star.comp.helper.Bootstrap;
+import com.sun.star.connection.NoConnectException;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XModel;
+import com.sun.star.lang.XMultiServiceFactory;
+// import com.sun.star.uno.Exception;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+// ---------- junit imports -----------------
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.openoffice.test.uno.UnoApp;
+
+import static org.junit.Assert.*;
+// ------------------------------------------
+
+
+public abstract class TestCase
+{
+    // --------------------------------------------------------------------------------------------------------
+    protected final XComponentContext getComponentContext()
+    {
+        XComponentContext context = null;
+        try
+        {
+            final XPropertySet orbProps = UnoRuntime.queryInterface( XPropertySet.class, getMSF() );
+            context = UnoRuntime.queryInterface( XComponentContext.class,
+                orbProps.getPropertyValue( "DefaultContext" ) );
+        }
+        catch ( Exception ex )
+        {
+            fail( "could not retrieve the ComponentContext" );
+        }
+        return context;
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    public void before() throws java.lang.Exception
+    {
+    }
+
+    public void after() throws java.lang.Exception
+    {
+    }
+
+    
+	@BeforeClass
+	public static void setUpConnection() throws Exception {
+		app.start();
+	}
+
+	@AfterClass
+	public static void tearDownConnection() throws Exception {
+		app.close();
+	}
+
+	private static final UnoApp app = new UnoApp();
+
+    // --------------------------------------------------------------------------------------------------------
+    /** returns the URL of a temporary file which can be used during the test.
+     * 
+     *  The file will be deleted when the process exits
+     *  @return the URL of a temporary file
+     */
+    protected final String createTempFileURL() throws IOException
+    {
+        final File documentFile = java.io.File.createTempFile( "dbaccess_test", ".odb" ).getAbsoluteFile();
+        if ( documentFile.exists() )
+        {
+            documentFile.delete();
+        }
+        return getOOoCompatibleFileURL( documentFile.toURI().toURL().toString() );
+    }
+
+    public String getOOoCompatibleFileURL( String _javaFileURL )
+    {
+        String returnURL = _javaFileURL;
+        if ( ( returnURL.indexOf( "file:/" ) == 0 ) && ( returnURL.indexOf( "file:///" ) == -1 ) )
+        {
+            // for some reason, the URLs here in Java start with "file:/" only, instead of "file:///"
+            // Some of the office code doesn't like this ...
+            returnURL = "file:///" + returnURL.substring( 6 );
+        }
+        return returnURL;
+    }
+
+
+    protected final XModel loadDocument( final String _docURL ) throws Exception
+    {
+        final XComponentLoader loader = UnoRuntime.queryInterface( XComponentLoader.class,
+            getMSF().createInstance( "com.sun.star.frame.Desktop" ) );
+        return UnoRuntime.queryInterface( XModel.class,
+            loader.loadComponentFromURL( _docURL, "_blank", 0, new PropertyValue[] {} ) );
+    }
+
+ 
+    protected XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, app.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+
+
+}
Index: source/testcase/uno/db/utils/Connection.java
===================================================================
--- source/testcase/uno/db/utils/Connection.java	(revision 0)
+++ source/testcase/uno/db/utils/Connection.java	(revision 0)
@@ -0,0 +1,114 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package testcase.uno.db.utils;
+
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.XSingleSelectQueryComposer;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.sdbc.XConnection;
+import com.sun.star.sdbc.XDatabaseMetaData;
+import com.sun.star.sdbc.XPreparedStatement;
+import com.sun.star.sdbc.XResultSet;
+import com.sun.star.sdbc.XStatement;
+import com.sun.star.sdbcx.XTablesSupplier;
+import com.sun.star.uno.Exception;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.XRefreshable;
+
+/**
+ * is a convenience wrapper around a SDB-level connection object
+ */
+public class Connection
+{
+    private final   XConnection m_connection;
+
+    public Connection( final XConnection _connection )
+    {
+        m_connection = _connection;
+    }
+
+    public XConnection  getXConnection()
+    {
+        return m_connection;
+    }
+
+    public boolean execute( final String _sql ) throws SQLException
+    {
+        XStatement statement = createStatement();
+        return statement.execute( _sql );
+    }
+
+    public XResultSet executeQuery( final String _sql ) throws SQLException
+    {
+        XStatement statement = createStatement();
+        return statement.executeQuery( _sql );
+    }
+
+    public int executeUpdate( final String _sql ) throws SQLException
+    {
+        XStatement statement = createStatement();
+        return statement.executeUpdate( _sql );
+    }
+
+    public void refreshTables()
+    {
+        final XTablesSupplier suppTables = UnoRuntime.queryInterface(XTablesSupplier.class, m_connection);
+        final XRefreshable refresh = UnoRuntime.queryInterface( XRefreshable.class, suppTables.getTables() );
+        refresh.refresh();
+    }
+
+    public XSingleSelectQueryComposer createSingleSelectQueryComposer() throws Exception
+    {
+        final XMultiServiceFactory connectionFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class, m_connection );
+        return UnoRuntime.queryInterface(
+            XSingleSelectQueryComposer.class, connectionFactory.createInstance( "com.sun.star.sdb.SingleSelectQueryComposer" ) );
+    }
+
+    public
+    XStatement createStatement() throws SQLException
+    {
+        return m_connection.createStatement();
+    }
+
+    public
+    XPreparedStatement prepareStatement( String _sql ) throws SQLException
+    {
+        return m_connection.prepareStatement( _sql );
+    }
+
+    public
+    XDatabaseMetaData getMetaData() throws SQLException
+    {
+        return m_connection.getMetaData();
+    }
+
+    public
+    void close() throws SQLException
+    {
+        m_connection.close();
+    }
+}
Index: source/testcase/uno/db/utils/HsqlDatabase.java
===================================================================
--- source/testcase/uno/db/utils/HsqlDatabase.java	(revision 0)
+++ source/testcase/uno/db/utils/HsqlDatabase.java	(revision 0)
@@ -0,0 +1,208 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+package testcase.uno.db.utils;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.PropertyState;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.container.ElementExistException;
+import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.XOfficeDatabaseDocument;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.sdbcx.XAppend;
+import com.sun.star.sdbcx.XTablesSupplier;
+import com.sun.star.uno.UnoRuntime;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.io.File;
+
+/**
+ *
+ * @author fs93730
+ */
+public class HsqlDatabase extends AbstractDatabase
+{
+
+    // --------------------------------------------------------------------------------------------------------
+    public HsqlDatabase(final XMultiServiceFactory orb) throws Exception
+    {
+        super(orb);
+        createDBDocument();
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    public HsqlDatabase(final XMultiServiceFactory orb, final String _existingDocumentURL) throws Exception
+    {
+        super(orb, _existingDocumentURL);
+    }
+
+    /** creates an empty database document in a temporary location
+     */
+    private void createDBDocument() throws Exception
+    {
+        final File documentFile = File.createTempFile("testdb", ".odb");
+        if ( documentFile.exists() )
+            documentFile.delete();
+        m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
+
+        m_databaseDocument = (XOfficeDatabaseDocument) UnoRuntime.queryInterface(
+                XOfficeDatabaseDocument.class, m_orb.createInstance("com.sun.star.sdb.OfficeDatabaseDocument"));
+        m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
+
+        final XPropertySet dsProperties = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
+        dsProperties.setPropertyValue("URL", "sdbc:embedded:hsqldb");
+
+        final XStorable storable = (XStorable) UnoRuntime.queryInterface(XStorable.class, m_databaseDocument);
+        storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[]
+			{	new PropertyValue( "PickListEntry", 0, false, PropertyState.DIRECT_VALUE )
+			} );
+    }
+
+    /** drops the table with a given name
+
+    @param _name
+    the name of the table to drop
+    @param _ifExists
+    TRUE if it should be dropped only when it exists.
+     */
+    public void dropTable(final String _name, final boolean _ifExists) throws SQLException
+    {
+        final StringBuffer dropStatement = new StringBuffer("DROP TABLE \"");
+        dropStatement.append(_name);
+        if (_ifExists)
+        {
+            dropStatement.append("\" IF EXISTS");
+        }
+        executeSQL(dropStatement.toString());
+    }
+
+    public void createTable(final HsqlTableDescriptor _tableDesc, final boolean _dropIfExists) throws SQLException
+    {
+        if (_dropIfExists)
+        {
+            dropTable(_tableDesc.getName(), true);
+        }
+        createTable(_tableDesc);
+    }
+
+    /** creates a table
+     */
+    public void createTable(final HsqlTableDescriptor _tableDesc) throws SQLException
+    {
+        StringBuffer createStatement = new StringBuffer("CREATE CACHED TABLE \"");
+        createStatement.append(_tableDesc.getName());
+        createStatement.append("\" ( ");
+
+        String primaryKeyList = "";
+
+        final HashMap foreignKeys = new HashMap();
+        final HashMap foreignKeyRefs = new HashMap();
+
+        final HsqlColumnDescriptor[] columns = _tableDesc.getColumns();
+        for (int i = 0; i < columns.length; ++i)
+        {
+            if (i > 0)
+            {
+                createStatement.append(", ");
+            }
+
+            createStatement.append("\"" + columns[i].getName());
+            createStatement.append("\" " + columns[i].getTypeName());
+
+            if (columns[i].isRequired())
+            {
+                createStatement.append(" NOT NULL");
+            }
+
+            if (columns[i].isPrimaryKey())
+            {
+                if (primaryKeyList.length() > 0)
+                {
+                    primaryKeyList += ", ";
+                }
+                primaryKeyList += "\"" + columns[i].getName() + "\"";
+            }
+
+            if (columns[i].isForeignKey())
+            {
+                final String foreignTable = columns[i].getForeignTable();
+
+                String foreignKeysForTable = foreignKeys.containsKey(foreignTable) ? (String) foreignKeys.get(foreignTable) : "";
+                if (foreignKeysForTable.length() > 0)
+                {
+                    foreignKeysForTable += ", ";
+                }
+                foreignKeysForTable += "\"" + columns[i].getName() + "\"";
+                foreignKeys.put(foreignTable, foreignKeysForTable);
+
+                final StringBuffer foreignKeyRefsForTable = new StringBuffer(foreignKeyRefs.containsKey(foreignTable) ? (String) foreignKeyRefs.get(foreignTable) : "");
+                if (foreignKeyRefsForTable.length() > 0)
+                {
+                    foreignKeyRefsForTable.append(", ");
+                }
+                foreignKeyRefsForTable.append("\"" + columns[i].getForeignColumn() + "\"");
+                foreignKeyRefs.put(foreignTable, foreignKeyRefsForTable.toString());
+            }
+        }
+
+        if (primaryKeyList.length() > 0)
+        {
+            createStatement.append(", PRIMARY KEY (");
+            createStatement.append(primaryKeyList);
+            createStatement.append(')');
+        }
+
+        final Set foreignKeyTables = foreignKeys.keySet();
+        for (final Iterator foreignKey = foreignKeyTables.iterator();
+                foreignKey.hasNext();)
+        {
+            final String foreignTable = (String) foreignKey.next();
+
+            createStatement.append(", FOREIGN KEY (");
+            createStatement.append((String) foreignKeys.get(foreignTable));
+            createStatement.append(") REFERENCES \"");
+            createStatement.append(foreignTable);
+            createStatement.append("\"(");
+            createStatement.append((String) foreignKeyRefs.get(foreignTable));
+            createStatement.append(')');
+        }
+
+        createStatement.append(')');
+
+        //System.err.println( createStatement );
+        executeSQL(createStatement.toString());
+    }
+
+    /** creates a table in the database. using the SDBCX-API
+     */
+    public void createTableInSDBCX(final HsqlTableDescriptor _tableDesc) throws SQLException, ElementExistException
+    {
+        final XPropertySet sdbcxDescriptor = _tableDesc.createSdbcxDescriptor(defaultConnection());
+        final XTablesSupplier suppTables = UnoRuntime.queryInterface( XTablesSupplier.class, defaultConnection().getXConnection() );
+        final XAppend appendTable = UnoRuntime.queryInterface( XAppend.class, suppTables.getTables() );
+        appendTable.appendByDescriptor(sdbcxDescriptor);
+    }
+}
Index: source/testcase/uno/db/utils/QueryDefinition.java
===================================================================
--- source/testcase/uno/db/utils/QueryDefinition.java	(revision 0)
+++ source/testcase/uno/db/utils/QueryDefinition.java	(revision 0)
@@ -0,0 +1,71 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+
+package testcase.uno.db.utils;
+
+
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.beans.UnknownPropertyException;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.lang.IllegalArgumentException;
+
+public class QueryDefinition
+{
+    XPropertySet    m_queryDef;
+
+    public QueryDefinition( XPropertySet _queryDef )
+    {
+        m_queryDef = _queryDef;
+    }
+
+    /** retrieves the command underlying the query definition
+     *
+     * This method is a mere wrapped around the <code>getPropertyValue( "Command" )</code> call
+     */
+    public final String getCommand() throws WrappedTargetException
+    {
+        String command = null;
+        try {
+            command = (String)m_queryDef.getPropertyValue( "Command" );
+        }
+        catch (UnknownPropertyException e) { }
+
+        return command;
+    }
+
+    /** retrieves the command underlying the query definition
+     *
+     * This method is a mere wrapped around the <code>getPropertyValue( "Command" )</code> call
+     */
+    public void setCommand( String _command ) throws WrappedTargetException
+    {
+        try
+        {
+            m_queryDef.setPropertyValue( "Command", _command );
+        }
+        catch (UnknownPropertyException e) { }
+        catch (PropertyVetoException e) { }
+        catch (IllegalArgumentException e) { }
+    }
+};
Index: source/testcase/uno/db/utils/AbstractDatabase.java
===================================================================
--- source/testcase/uno/db/utils/AbstractDatabase.java	(revision 0)
+++ source/testcase/uno/db/utils/AbstractDatabase.java	(revision 0)
@@ -0,0 +1,212 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+package testcase.uno.db.utils;
+
+import com.sun.star.container.XNameAccess;
+import com.sun.star.frame.XModel;
+import com.sun.star.frame.XStorable;
+import com.sun.star.io.IOException;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.XDocumentDataSource;
+import com.sun.star.sdb.XOfficeDatabaseDocument;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.sdbc.XCloseable;
+import com.sun.star.sdbc.XStatement;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.CloseVetoException;
+import java.io.File;
+
+
+public abstract class AbstractDatabase
+{
+    public AbstractDatabase(final XMultiServiceFactory orb) throws Exception
+    {
+        m_orb = orb;
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    public AbstractDatabase(final XMultiServiceFactory orb, final String _existingDocumentURL ) throws Exception
+    {
+        m_orb = orb;
+        createDBDocument( _existingDocumentURL );
+    }
+
+    /** returns a connection to the database
+     *
+     * Multiple calls to this method return the same connection. The DbaseDatabase object keeps
+     * the ownership of the connection, so you don't need to (and should not) dispose/close it.
+     */
+    public Connection defaultConnection() throws SQLException
+    {
+        if ( m_connection == null )
+            m_connection = new Connection( m_databaseDocument.getDataSource().getConnection("", "") );
+        
+        return m_connection;
+    }
+
+    /** executes the given SQL statement via the defaultConnection
+     */
+    public void executeSQL(final String statementString) throws SQLException
+    {
+        final XStatement statement = defaultConnection().createStatement();
+        statement.execute(statementString);
+    }
+
+    /** stores the database document
+     */
+    public void store() throws IOException
+    {
+        if (m_databaseDocument != null)
+        {
+            final XStorable storeDoc = UnoRuntime.queryInterface(XStorable.class, m_databaseDocument);
+            storeDoc.store();
+        }
+    }
+
+    /** closes the database document
+     *
+     *  Any CloseVetoExceptions fired by third parties are ignored, and any reference to the
+     *  database document is released.
+     */
+    public void close()
+    {
+        // close connection
+        final XCloseable closeConn = UnoRuntime.queryInterface( XCloseable.class,
+            m_connection != null ? m_connection.getXConnection() : null );
+        if (closeConn != null)
+        {
+            try
+            {
+                closeConn.close();
+            }
+            catch (SQLException e)
+            {
+            }
+        }
+        m_connection = null;
+
+        // close document
+        final com.sun.star.util.XCloseable closeDoc = UnoRuntime.queryInterface( com.sun.star.util.XCloseable.class, m_databaseDocument );
+        if (closeDoc != null)
+        {
+            try
+            {
+                closeDoc.close(true);
+            }
+            catch (CloseVetoException e)
+            {
+            }
+        }
+        m_databaseDocument = null;
+    }
+
+    /** closes the document, and deletes the underlying file
+     */
+    public void closeAndDelete()
+    {
+        close();
+
+        if (m_databaseDocumentFile != null)
+        {
+            try
+            {
+                final File file = new File(m_databaseDocumentFile);
+                file.delete();
+            }
+            catch (Exception e)
+            {
+            }
+        }
+    }
+
+    /** returns the underlying database document
+     */
+    public XOfficeDatabaseDocument getDatabaseDocument()
+    {
+        return m_databaseDocument;
+    }
+
+    /** returns the model interface of the underlying database document
+     */
+    public XModel getModel()
+    {
+        return UnoRuntime.queryInterface( XModel.class, m_databaseDocument );
+    }
+
+    public XMultiServiceFactory getORB()
+    {
+        return m_orb;
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    final protected void createDBDocument(final String _docURL) throws Exception
+    {
+        m_databaseDocumentFile = _docURL;
+
+        final XNameAccess dbContext = UnoRuntime.queryInterface( XNameAccess.class,
+            m_orb.createInstance( "com.sun.star.sdb.DatabaseContext" ) );
+        final XDocumentDataSource dataSource = UnoRuntime.queryInterface( XDocumentDataSource.class, dbContext.getByName( _docURL ) );
+
+        m_databaseDocument = dataSource.getDatabaseDocument();
+        m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
+    }
+
+    /** returns the URL of the ODB document represented by this instance
+     */
+    public String getDocumentURL()
+    {
+        return m_databaseDocumentFile;
+    }
+
+    /** returns the data source belonging to this database
+     */
+    public DataSource getDataSource()
+    {
+        return m_dataSource;
+    }
+
+    /** creates a row set operating the database, with a given command/type
+     */
+    public RowSet createRowSet(final int _commandType, final String _command)
+    {
+        return new RowSet(m_orb, getDocumentURL(), _commandType, _command);
+    }
+
+    @Override
+    protected void finalize() throws Throwable
+    {
+        closeAndDelete();
+        super.finalize();
+    }
+
+    // the service factory
+    protected final XMultiServiceFactory m_orb;
+    // the URL of the temporary file used for the database document
+    protected String m_databaseDocumentFile;
+    // the database document
+    protected XOfficeDatabaseDocument m_databaseDocument;
+    // the data source belonging to the database document
+    protected DataSource m_dataSource;
+    // the default connection
+    protected Connection    m_connection;
+}
Index: source/testcase/uno/db/utils/URLHelper.java
===================================================================
--- source/testcase/uno/db/utils/URLHelper.java	(revision 0)
+++ source/testcase/uno/db/utils/URLHelper.java	(revision 0)
@@ -0,0 +1,288 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+
+package testcase.uno.db.utils;
+
+// __________ Imports __________
+
+// exceptions
+import java.net.MalformedURLException;
+
+// interfaces
+import com.sun.star.util.XURLTransformer;
+
+// others
+import java.io.File;
+import java.util.Vector;
+import java.util.Enumeration;
+
+
+/**
+ * It collects some static helper functons to handle URLs.
+ * Sometimes it's neccessary to convert URL from/to system pathes.
+ * Or from string to strutural notations (e.g. com.sun.star.util.URL).
+ * And sometimes java had another notation then the office it has.
+ *
+ */
+public class URLHelper
+{
+    // ____________________
+
+    /**
+     * Because the office need URLs for loading/saving documents
+     * we must convert used system pathes.
+     * And java use another notation for file URLs ... correct it.
+     *
+     * @param aSystemPath
+     *          represent the file in system notation
+     *
+     * @return [String]
+     *          a file url which represent the given system path
+     */
+    public static String getFileURLFromSystemPath( File aSystemPath )
+    {
+        String sFileURL = null;
+        try
+        {
+            //sFileURL = aSystemPath.toURI().toURL().toString();
+            sFileURL = aSystemPath.toURL().toString();
+        }
+        catch( MalformedURLException exWrong )
+        {
+            sFileURL = null;
+        }
+
+        // problem of java: file URL's are coded with 1 slash instead of 2 or 3 ones!
+        // => correct this problem first, otherwise office can't use these URL's
+        if(
+            (sFileURL                       != null ) &&
+            (sFileURL.startsWith("file:/")  == true ) &&
+            (sFileURL.startsWith("file://") == false)
+          )
+        {
+            StringBuffer sWorkBuffer = new StringBuffer(sFileURL);
+            sWorkBuffer.insert(6,"//");
+            sFileURL = sWorkBuffer.toString();
+        }
+
+        return sFileURL;
+    }
+
+    // ____________________
+
+    /**
+     * The same as getFileURLFromSystemPath() before but uses string parameter instead
+     * of a File type. It exist to supress converting of neccessary parameters in the
+     * outside code. But of course getFileURLFromSystemPath(File) will be a little bit faster
+     * then this method ...
+     *
+     * @param sSystemPath
+     *          represent the file in system notation
+     *
+     * @return [String]
+     *          a file url which represent the given system path
+     */
+    public static String getFileURLFromSystemPath( String sSystemPath )
+    {
+        return getFileURLFromSystemPath(new File(sSystemPath));
+    }
+
+    // ____________________
+
+    /**
+     * Does the same as getFileURLFromSystemPath() before ... but uses
+     * the given protocol string (e.g."http://") insted of "file:///".
+     *
+     * @param aSystemPath
+     *          represent the file in system notation
+     *
+     * @param aBasePath
+     *          define the base path of the aSystemPath value,
+     *          which must be replaced with the value of "sServerPath".
+     *
+     * @param sServerURL
+     *          Will be used to replace sBasePath.
+     *
+     * @example
+     *          System Path = "d:\test\file.txt"
+     *          Base Path   = "d:\test"
+     *          Server Path = "http://alaska:8000"
+     *          => "http://alaska:8000/file.txt"
+     *
+     * @return [String]
+     *          an url which represent the given system path
+     *          and uses the given protocol
+     */
+    public static String getURLWithProtocolFromSystemPath( File aSystemPath, File aBasePath, String sServerURL )
+    {
+        String sFileURL = URLHelper.getFileURLFromSystemPath(aSystemPath);
+        String sBaseURL = URLHelper.getFileURLFromSystemPath(aBasePath  );
+
+        // cut last '/'!
+        if (sBaseURL.lastIndexOf('/')==(sBaseURL.length()-1))
+            sBaseURL = sBaseURL.substring(0,sBaseURL.length()-1);
+
+        // cut last '/'!
+        if (sServerURL.lastIndexOf('/')==(sServerURL.length()-1))
+            sServerURL = sServerURL.substring(0,sServerURL.length()-1);
+            
+        int index = sFileURL.indexOf(sBaseURL);
+        String sURL = sFileURL.substring(0,index) + sServerURL + 
+                                sFileURL.substring(index+sBaseURL.length());
+        //String sURL = sFileURL.replaceFirst(sBaseURL,sServerURL);
+        return sURL;
+    }
+
+    // ____________________
+
+    /**
+     * The same as getURLWithProtocolFromSystemPath() before but uses string parameter instead
+     * of a File types. It exist to supress converting of neccessary parameters in the
+     * outside code. But of course getURLWithProtocolFromSystemPath(File,File,String) will be
+     * a little bit faster then this method ...
+     *
+     * @param sSystemPath
+     *          represent the file in system notation
+     *
+     * @param sBasePath
+     *          define the base path of the aSystemPath value,
+     *          which must be replaced with the value of "sServerPath".
+     *
+     * @param sServerPath
+     *          Will be used to replace sBasePath.
+     *
+     * @example
+     *          System Path = "d:\test\file.txt"
+     *          Base Path   = "d:\test"
+     *          Server Path = "http://alaska:8000"
+     *          => "http://alaska:8000/file.txt"
+     *
+     * @return [String]
+     *          an url which represent the given system path
+     *          and uses the given protocol
+     */
+    public static String getURLWithProtocolFromSystemPath( String sSystemPath, String sBasePath, String sServerPath )
+    {
+        return getURLWithProtocolFromSystemPath(new File(sSystemPath), new File(sBasePath), sServerPath);
+    }
+
+    // ____________________
+
+    /**
+     * This convert an URL (formated as a string) to a struct com.sun.star.util.URL.
+     * It use a special service to do that: the URLTransformer.
+     * Because some API calls need it and it's not allowed to set "Complete"
+     * part of the util struct only. The URL must be parsed.
+     *
+     * @param sURL
+     *          URL for parsing in string notation
+     *
+     * @return [com.sun.star.util.URL]
+     *              URL in UNO struct notation
+     */
+    public static com.sun.star.util.URL parseURL(XURLTransformer xParser, String sURL)
+    {
+        com.sun.star.util.URL aURL = null;
+
+        if (sURL==null || sURL.equals(""))
+            return null;
+
+        try
+        {
+            // Create special service for parsing of given URL.
+/*            com.sun.star.util.XURLTransformer xParser = (com.sun.star.util.XURLTransformer)OfficeConnect.createRemoteInstance(
+                                                            com.sun.star.util.XURLTransformer.class,
+                                                            "com.sun.star.util.URLTransformer");
+*/
+            // Because it's an in/out parameter we must use an array of URL objects.
+            com.sun.star.util.URL[] aParseURL = new com.sun.star.util.URL[1];
+            aParseURL[0]          = new com.sun.star.util.URL();
+            aParseURL[0].Complete = sURL;
+
+            // Parse the URL
+            xParser.parseStrict(aParseURL);
+
+            aURL = aParseURL[0];
+        }
+        catch(com.sun.star.uno.RuntimeException exRuntime)
+        {
+            // Any UNO method of this scope can throw this exception.
+            // Reset the return value only.
+            aURL = null;
+        }
+
+        return aURL;
+    }
+
+    //_________________________________
+    /**
+     * Return a name list of all available files of a directory.
+     * We filter pure sub directories names. All other files
+     * are returned as full qualified URL strings. So they can be
+     * used for further purposes. One parameter define the start directory,
+     * another one describe the url protocol, which the return URL names should have.
+     *
+     * @param   sDir
+     *              the start directory, which should include all test files
+     *
+     * @return  [Vector]
+     *              a filtered list of java File objects of all available files of the start dir
+     *              and all accessable sub directories.
+     */
+    public static Vector getSystemFilesFromDir(String sStartDir)
+    {
+        File aRoot = new File(sStartDir);
+
+        if (! aRoot.exists())
+            return null;
+
+        if (! aRoot.isDirectory())
+            return null;
+
+        File[] lAllFiles = aRoot.listFiles();
+        if (lAllFiles == null )
+            return null;
+
+        Vector lFilteredFiles = new Vector(lAllFiles.length);
+
+        for (int i=0; i<lAllFiles.length; ++i)
+        {
+            if (lAllFiles[i].isFile())
+                lFilteredFiles.add(lAllFiles[i]);
+            else
+            if (lAllFiles[i].isDirectory())
+            {
+                // recursion!
+                Vector lSubFiles = URLHelper.getSystemFilesFromDir(lAllFiles[i].getPath());
+                if (lSubFiles != null)
+                {
+                    Enumeration aSnapshot = lSubFiles.elements();
+                    while (aSnapshot.hasMoreElements())
+                        lFilteredFiles.add(aSnapshot.nextElement());
+                }
+            }
+        }
+
+        return lFilteredFiles;
+    }
+}
Index: source/testcase/uno/db/utils/RowSet.java
===================================================================
--- source/testcase/uno/db/utils/RowSet.java	(revision 0)
+++ source/testcase/uno/db/utils/RowSet.java	(revision 0)
@@ -0,0 +1,294 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+package testcase.uno.db.utils;
+
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.container.XIndexAccess;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.io.XInputStream;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.sdbc.XArray;
+import com.sun.star.sdbc.XBlob;
+import com.sun.star.sdbc.XClob;
+import com.sun.star.sdbc.XRef;
+import com.sun.star.sdbc.XRow;
+import com.sun.star.sdbc.XRowSet;
+import com.sun.star.sdbc.XRowSetListener;
+import com.sun.star.sdbcx.XColumnsSupplier;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.Date;
+import com.sun.star.util.DateTime;
+import com.sun.star.util.Time;
+
+public class RowSet implements XRowSet, XRow
+{
+    private XRowSet                 m_rowSet;
+    private XRow                    m_row;
+    private XPropertySet            m_rowSetProps;
+
+    public RowSet( XMultiServiceFactory _orb, String _dataSource, int _commandType, String _command )
+    {
+        try
+        {
+            m_rowSetProps = UnoRuntime.queryInterface( XPropertySet.class, _orb.createInstance( "com.sun.star.sdb.RowSet" ) );
+            m_rowSetProps.setPropertyValue( "DataSourceName", _dataSource );
+            m_rowSetProps.setPropertyValue( "CommandType", new Integer( _commandType ) );
+            m_rowSetProps.setPropertyValue( "Command", _command );
+
+            m_rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps );
+            m_row = UnoRuntime.queryInterface( XRow.class, m_rowSetProps );
+        }
+        catch ( Exception e )
+        {
+            e.printStackTrace(System.err);
+            throw new java.lang.InstantiationError();
+        }
+    }
+
+    // misc
+    public int getColumnCount()
+    {
+        XColumnsSupplier suppCols = (XColumnsSupplier)UnoRuntime.queryInterface(
+            XColumnsSupplier.class, m_rowSet );
+        XIndexAccess columns = (XIndexAccess)UnoRuntime.queryInterface(
+            XIndexAccess.class, suppCols.getColumns() );
+        return columns.getCount();
+    }
+
+    // XRowSet
+    public void execute() throws SQLException
+    {
+        m_rowSet.execute();
+    }
+
+    public void addRowSetListener( XRowSetListener _listener )
+    {
+        m_rowSet.addRowSetListener( _listener );
+    }
+
+    public void removeRowSetListener( XRowSetListener _listener )
+    {
+        m_rowSet.removeRowSetListener( _listener );
+    }
+
+    public boolean next() throws SQLException
+    {
+        return m_rowSet.next();
+    }
+
+    public boolean isBeforeFirst() throws SQLException
+    {
+        return m_rowSet.isBeforeFirst();
+    }
+
+    public boolean isAfterLast() throws SQLException
+    {
+        return m_rowSet.isAfterLast();
+    }
+
+    public boolean isFirst() throws SQLException
+    {
+        return m_rowSet.isFirst();
+    }
+
+    public boolean isLast() throws SQLException
+    {
+        return m_rowSet.isLast();
+    }
+
+    public void beforeFirst() throws SQLException
+    {
+        m_rowSet.beforeFirst();
+    }
+
+    public void afterLast() throws SQLException
+    {
+        m_rowSet.afterLast();
+    }
+
+    public boolean first() throws SQLException
+    {
+        return m_rowSet.first();
+    }
+
+    public boolean last() throws SQLException
+    {
+        return m_rowSet.last();
+    }
+
+    public int getRow() throws SQLException
+    {
+        return m_rowSet.getRow();
+    }
+
+    public boolean absolute(int i) throws SQLException
+    {
+        return m_rowSet.absolute(i);
+    }
+
+    public boolean relative(int i) throws SQLException
+    {
+        return m_rowSet.relative(i);
+    }
+
+    public boolean previous() throws SQLException
+    {
+        return m_rowSet.previous();
+    }
+
+    public void refreshRow() throws SQLException
+    {
+        m_rowSet.refreshRow();
+    }
+
+    public boolean rowUpdated() throws SQLException
+    {
+        return m_rowSet.rowUpdated();
+    }
+
+    public boolean rowInserted() throws SQLException
+    {
+        return m_rowSet.rowInserted();
+    }
+
+    public boolean rowDeleted() throws SQLException
+    {
+        return m_rowSet.rowDeleted();
+    }
+
+    // XRow
+    public Object getStatement() throws SQLException
+    {
+        return m_rowSet.getStatement();
+    }
+
+    public boolean wasNull() throws SQLException
+    {
+        return m_row.wasNull();
+    }
+
+    public String getString(int i) throws SQLException
+    {
+        return m_row.getString(i);
+    }
+
+    public boolean getBoolean(int i) throws SQLException
+    {
+        return m_row.getBoolean(i);
+    }
+
+    public byte getByte(int i) throws SQLException
+    {
+        return m_row.getByte(i);
+    }
+
+    public short getShort(int i) throws SQLException
+    {
+        return m_row.getShort(i);
+    }
+
+    public int getInt(int i) throws SQLException
+    {
+        return m_row.getInt(i);
+    }
+
+    public long getLong(int i) throws SQLException
+    {
+        return m_row.getLong(i);
+    }
+
+    public float getFloat(int i) throws SQLException
+    {
+        return m_row.getFloat(i);
+    }
+
+    public double getDouble(int i) throws SQLException
+    {
+        return m_row.getDouble(i);
+    }
+
+    public byte[] getBytes(int i) throws SQLException
+    {
+        return m_row.getBytes(i);
+    }
+
+    public Date getDate(int i) throws SQLException
+    {
+        return m_row.getDate(i);
+    }
+
+    public Time getTime(int i) throws SQLException
+    {
+        return m_row.getTime(i);
+    }
+
+    public DateTime getTimestamp(int i) throws SQLException
+    {
+        return m_row.getTimestamp(i);
+    }
+
+    public XInputStream getBinaryStream(int i) throws SQLException
+    {
+        return m_row.getBinaryStream(i);
+    }
+
+    public XInputStream getCharacterStream(int i) throws SQLException
+    {
+        return m_row.getCharacterStream(i);
+    }
+
+    public Object getObject(int i, XNameAccess xNameAccess) throws SQLException
+    {
+        return m_row.getObject(i, xNameAccess);
+    }
+
+    public XRef getRef(int i) throws SQLException
+    {
+        return m_row.getRef(i);
+    }
+
+    public XBlob getBlob(int i) throws SQLException
+    {
+        return m_row.getBlob(i);
+    }
+
+    public XClob getClob(int i) throws SQLException
+    {
+        return m_row.getClob(i);
+    }
+
+    public XArray getArray(int i) throws SQLException
+    {
+        return m_row.getArray(i);
+    }
+
+    public void dispose()
+    {
+        if ( m_rowSet == null )
+            return;
+        XComponent rowSetComp = UnoRuntime.queryInterface( XComponent.class, m_rowSet );
+        rowSetComp.dispose();
+    }
+};
Index: source/testcase/uno/db/utils/DataSource.java
===================================================================
--- source/testcase/uno/db/utils/DataSource.java	(revision 0)
+++ source/testcase/uno/db/utils/DataSource.java	(revision 0)
@@ -0,0 +1,159 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+package testcase.uno.db.utils;
+
+import com.sun.star.container.ElementExistException;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.container.XNameContainer;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.lang.XSingleServiceFactory;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.sdb.XQueryDefinitionsSupplier;
+import com.sun.star.sdbc.XDataSource;
+import com.sun.star.uno.Exception;
+import com.sun.star.uno.UnoRuntime;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class DataSource
+{
+    // the service factory
+
+    private final XMultiServiceFactory m_orb;
+    private XDataSource m_dataSource;
+
+    public DataSource(final XMultiServiceFactory _orb, final String _registeredName) throws Exception
+    {
+        m_orb = _orb;
+
+        final XNameAccess dbContext = UnoRuntime.queryInterface(
+            XNameAccess.class, _orb.createInstance( "com.sun.star.sdb.DatabaseContext" ) );
+
+        m_dataSource = UnoRuntime.queryInterface( XDataSource.class, dbContext.getByName( _registeredName ) );
+    }
+
+    public DataSource(final XMultiServiceFactory _orb,final XDataSource _dataSource)
+    {
+        m_orb = _orb;
+        m_dataSource = _dataSource;
+    }
+
+    final public XDataSource getXDataSource()
+    {
+        return m_dataSource;
+    }
+
+    /**
+     * retrieves the data source's settings
+     */
+    public XPropertySet geSettings()
+    {
+        return UnoRuntime.queryInterface( XPropertySet.class, impl_getPropertyValue( "Settings" ) );
+    }
+
+    /** creates a query with a given name and SQL command
+     */
+    public void createQuery(final String _name, final String _sqlCommand) throws ElementExistException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException
+    {
+        createQuery(_name, _sqlCommand, true);
+    }
+
+    /** creates a query with a given name, SQL command, and EscapeProcessing flag
+     */
+    public void createQuery(final String _name, final String _sqlCommand, final boolean _escapeProcessing) throws ElementExistException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException
+    {
+        final XSingleServiceFactory queryDefsFac = UnoRuntime.queryInterface( XSingleServiceFactory.class, getQueryDefinitions() );
+        XPropertySet queryDef = null;
+        try
+        {
+            queryDef = UnoRuntime.queryInterface( XPropertySet.class, queryDefsFac.createInstance() );
+            queryDef.setPropertyValue("Command", _sqlCommand);
+            queryDef.setPropertyValue("EscapeProcessing", Boolean.valueOf(_escapeProcessing));
+        }
+        catch (com.sun.star.uno.Exception e)
+        {
+            e.printStackTrace(System.err);
+        }
+
+        final XNameContainer queryDefsContainer = UnoRuntime.queryInterface( XNameContainer.class, getQueryDefinitions() );
+        queryDefsContainer.insertByName(_name, queryDef);
+    }
+
+    /** provides the query definition with the given name
+     */
+    public QueryDefinition getQueryDefinition(final String _name) throws NoSuchElementException
+    {
+        final XNameAccess allDefs = getQueryDefinitions();
+        try
+        {
+            return new QueryDefinition( UnoRuntime.queryInterface( XPropertySet.class, allDefs.getByName( _name) ) );
+        }
+        catch (WrappedTargetException e)
+        {
+        }
+        throw new NoSuchElementException();
+    }
+
+    /** provides the container of query definitions of the data source
+     */
+    public XNameAccess getQueryDefinitions()
+    {
+        final XQueryDefinitionsSupplier suppQueries = UnoRuntime.queryInterface(
+                XQueryDefinitionsSupplier.class, m_dataSource);
+        return suppQueries.getQueryDefinitions();
+    }
+
+    /**
+     * retrieves a property value from the data source
+     * @param i_propertyName
+     *      the name of the property whose value is to be returned.
+     */
+    private Object impl_getPropertyValue( final String i_propertyName )
+    {
+        Object propertyValue = null;
+        try
+        {
+            final XPropertySet dataSourceProps = UnoRuntime.queryInterface( XPropertySet.class, m_dataSource );
+            propertyValue = dataSourceProps.getPropertyValue( i_propertyName );
+        }
+        catch (Exception ex)
+        {
+            Logger.getLogger(DataSource.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return propertyValue;
+    }
+
+    /** returns the name of the data source
+     * 
+     * If a data source is registered at the database context, the name is the registration
+     * name. Otherwise, its the URL which the respective database document is based on.
+     * 
+     * Note that the above definition is from the UNO API, not from this wrapper here.
+     */
+    public String getName()
+    {
+        return (String)impl_getPropertyValue( "Name" );
+    }
+};
Index: source/testcase/uno/db/utils/HsqlColumnDescriptor.java
===================================================================
--- source/testcase/uno/db/utils/HsqlColumnDescriptor.java	(revision 0)
+++ source/testcase/uno/db/utils/HsqlColumnDescriptor.java	(revision 0)
@@ -0,0 +1,80 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+
+package testcase.uno.db.utils;
+
+/** is a very simply and rudimentary descriptor of table columns, for creating HSQLDB tables
+ */
+public class HsqlColumnDescriptor
+{
+    private String Name;
+    private String TypeName;
+    private boolean Required;
+    private boolean PrimaryKey;
+    private String ForeignTable;
+    private String ForeignColumn;
+
+    public final String getName() { return Name; }
+    public final String getTypeName() { return TypeName; }
+    public final boolean isRequired() { return Required; }
+    public final boolean isPrimaryKey() { return PrimaryKey; }
+
+    public final boolean isForeignKey() { return ( ForeignTable.length() != 0 ) && ( ForeignColumn.length() != 0 ); }
+    public final String getForeignTable() { return ForeignTable; }
+    public final String getForeignColumn() { return ForeignColumn; }
+
+    /// determines that a column is required, i.e. not nullable
+    public final static int REQUIRED    = 1;
+    /// determines that a column is part of the primary key of its table
+    public final static int PRIMARY     = 2;
+
+    public HsqlColumnDescriptor( String _Name, String _TypeName )
+    {
+        Name = _Name;
+        TypeName = _TypeName;
+        Required = false;
+        PrimaryKey = false;
+        ForeignTable = "";
+        ForeignColumn = "";
+    }
+
+    public HsqlColumnDescriptor( String _Name, String _TypeName, int _Flags )
+    {
+        Name = _Name;
+        TypeName = _TypeName;
+        Required = ( _Flags & REQUIRED ) != 0;
+        PrimaryKey = ( _Flags & PRIMARY ) != 0;
+        ForeignTable = "";
+        ForeignColumn = "";
+    }
+
+    public HsqlColumnDescriptor( String _Name, String _TypeName, int _Flags, String _ForeignTable, String _ForeignColumn )
+    {
+        Name = _Name;
+        TypeName = _TypeName;
+        Required = ( _Flags & REQUIRED ) != 0;
+        PrimaryKey = ( _Flags & PRIMARY ) != 0;
+        ForeignTable = _ForeignTable;
+        ForeignColumn = _ForeignColumn;
+    }
+};
Index: source/testcase/uno/db/utils/HsqlTableDescriptor.java
===================================================================
--- source/testcase/uno/db/utils/HsqlTableDescriptor.java	(revision 0)
+++ source/testcase/uno/db/utils/HsqlTableDescriptor.java	(revision 0)
@@ -0,0 +1,97 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+
+package testcase.uno.db.utils;
+
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.sdbc.ColumnValue;
+import com.sun.star.sdbcx.XColumnsSupplier;
+import com.sun.star.sdbcx.XDataDescriptorFactory;
+import com.sun.star.sdbcx.XTablesSupplier;
+import com.sun.star.uno.UnoRuntime;
+
+/** is a very simply descriptor of a HSQL table, to be used with a HsqlDatabase.createTable method
+ */
+public class HsqlTableDescriptor
+{
+    private String                  m_name;
+    private HsqlColumnDescriptor[]  m_columns;
+
+    /** Creates a new instance of HsqlTableDescriptor */
+    public HsqlTableDescriptor( String _name, HsqlColumnDescriptor[] _columns )
+    {
+        m_name = _name;
+        m_columns = _columns;
+    }
+
+    /** returns the name of the table
+     */
+    public String getName()
+    {
+        return m_name;
+    }
+
+    /** returns the set of column descriptors for the table
+     */
+    public HsqlColumnDescriptor[] getColumns()
+    {
+        return m_columns;
+    }
+
+    public XPropertySet createSdbcxDescriptor( Connection _forConnection )
+    {
+        XTablesSupplier suppTables = UnoRuntime.queryInterface( XTablesSupplier.class, _forConnection.getXConnection() );
+        XDataDescriptorFactory tableDescFac = UnoRuntime.queryInterface( XDataDescriptorFactory.class, suppTables.getTables() );
+        XPropertySet tableDesc = tableDescFac.createDataDescriptor();
+
+        try
+        {
+            tableDesc.setPropertyValue( "Name", getName() );
+        }
+        catch ( Exception e ) { e.printStackTrace( System.err ); }
+        
+        XColumnsSupplier suppDescCols = UnoRuntime.queryInterface( XColumnsSupplier.class, tableDesc );
+
+        XNameAccess descColumns = suppDescCols.getColumns();
+        XDataDescriptorFactory columnDescFac = UnoRuntime.queryInterface( XDataDescriptorFactory.class, descColumns );
+
+        HsqlColumnDescriptor[] myColumns = getColumns();
+        for ( int i = 0; i < myColumns.length; ++i )
+        {
+            XPropertySet columnDesc = columnDescFac.createDataDescriptor();
+            try
+            {
+                columnDesc.setPropertyValue( "Name", myColumns[i].getName() );
+                columnDesc.setPropertyValue( "IsNullable", new Integer( myColumns[i].isRequired() ? ColumnValue.NO_NULLS : ColumnValue.NULLABLE) );
+                columnDesc.setPropertyValue( "TypeName", myColumns[i].getTypeName() );
+                if ( myColumns[i].isPrimaryKey() || myColumns[i].isForeignKey() )
+                    // not yet implemented
+                    throw new java.lang.UnsupportedOperationException("creating a primary or foreign key via SDBCX not yet implemented" );
+            }
+            catch( com.sun.star.uno.Exception e ) { e.printStackTrace( System.err ); }
+        }
+
+        return tableDesc;
+    }
+}
Index: source/testcase/uno/db/DBAccess.java
===================================================================
--- source/testcase/uno/db/DBAccess.java	(revision 0)
+++ source/testcase/uno/db/DBAccess.java	(revision 0)
@@ -0,0 +1,152 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+package testcase.uno.db;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.frame.FrameSearchFlag;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XModel;
+import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XComponent;
+import com.sun.star.sdb.XOfficeDatabaseDocument;
+import com.sun.star.sdb.application.XDatabaseDocumentUI;
+import com.sun.star.sdbcx.XTablesSupplier;
+import com.sun.star.uno.Exception;
+import com.sun.star.uno.UnoRuntime;
+
+import testcase.uno.db.utils.HsqlColumnDescriptor;
+import testcase.uno.db.utils.HsqlDatabase;
+import testcase.uno.db.utils.HsqlTableDescriptor;
+import testcase.uno.db.utils.TestCase;
+import java.io.IOException;
+
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+
+/**
+ * test case for Base's application UI
+ */
+public class DBAccess extends TestCase {
+
+	private HsqlDatabase m_database;
+	private XOfficeDatabaseDocument m_databaseDocument;
+	private XDatabaseDocumentUI m_documentUI;
+
+	public DBAccess() {
+		super();
+	}
+
+	private void closeDocument() {
+		if (m_database != null) {
+			m_database.close();
+			m_database = null;
+			m_databaseDocument = null;
+			m_documentUI = null;
+		}
+	}
+
+	private void switchToDocument(String _documentURL)
+			throws java.lang.Exception {
+		// close previous database document
+		closeDocument();
+
+		// create/load the new database document
+		m_database = (_documentURL == null) ? new HsqlDatabase(getMSF())
+				: new HsqlDatabase(getMSF(), _documentURL);
+		m_databaseDocument = m_database.getDatabaseDocument();
+
+		// load it into a frame
+		final Object object = getMSF().createInstance(
+				"com.sun.star.frame.Desktop");
+		final XComponentLoader xComponentLoader = UnoRuntime.queryInterface(
+				XComponentLoader.class, object);
+		final XComponent loadedComponent = xComponentLoader
+				.loadComponentFromURL(m_database.getDocumentURL(), "_blank",
+						FrameSearchFlag.ALL, new PropertyValue[0]);
+		Thread.sleep(10000);
+
+		// get the controller, which provides access to various UI operations
+		final XModel docModel = UnoRuntime.queryInterface(XModel.class,
+				loadedComponent);
+		m_documentUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class,
+				docModel.getCurrentController());
+	}
+
+
+	@Before
+	@Override
+	public void before() throws java.lang.Exception {
+		String a = null;
+		super.before();
+		switchToDocument(a);
+	}
+
+	@After
+	@Override
+	public void after() throws java.lang.Exception {
+		closeDocument();
+		super.after();
+	}
+
+	@Test
+	public void testSaveAs() throws Exception, IOException, java.lang.Exception {
+		final String newDocumentURL = createTempFileURL();
+
+		// store the doc in a new location
+		final XStorable storeDoc = UnoRuntime.queryInterface(XStorable.class,
+				m_databaseDocument);
+		storeDoc.storeAsURL(newDocumentURL, new PropertyValue[] {});
+		// load doc from new location
+		switchToDocument(newDocumentURL);
+		m_documentUI.connect();
+		assertTrue("could not connect to " + m_database.getDocumentURL(),
+				m_documentUI.isConnected());
+
+	}
+
+	@Test
+	public void testCreateTable() throws java.lang.Exception {
+		switchToDocument(null);
+		m_documentUI.connect();
+		// create a table in the database
+		m_database.createTable(new HsqlTableDescriptor("test",
+				new HsqlColumnDescriptor[] {
+						new HsqlColumnDescriptor("a", "VARCHAR(50)"),
+						new HsqlColumnDescriptor("b", "VARCHAR(50)"),
+						new HsqlColumnDescriptor("c", "VARCHAR(50)") }));
+		switchToDocument(m_database.getDocumentURL());
+		m_documentUI.connect();
+		XTablesSupplier suppTables = UnoRuntime.queryInterface(
+				XTablesSupplier.class, m_documentUI.getActiveConnection());
+		XNameAccess tables = suppTables.getTables();
+		assertTrue("the newly created table has not been written",
+				tables.hasByName("test"));
+	}
+
+}