[Libreoffice-commits] core.git: dbaccess/qa filter/qa forms/qa framework/qa reportdesign/qa toolkit/qa vcl/qa
Noel Grandin
noel at peralex.com
Fri Jun 5 06:18:14 PDT 2015
dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java | 31 -
dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 21
dbaccess/qa/complex/dbaccess/DataSource.java | 59 --
dbaccess/qa/complex/dbaccess/Parser.java | 15
dbaccess/qa/complex/dbaccess/PropertyBag.java | 19
dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java | 257 ++++------
filter/qa/complex/filter/misc/FinalizedMandatoryTest.java | 195 ++-----
filter/qa/complex/filter/misc/TypeDetection6FileFormat.java | 22
forms/qa/complex/forms/CheckOGroupBoxModel.java | 47 -
framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 174 ++----
framework/qa/complex/dispatches/checkdispatchapi.java | 165 ++----
framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java | 17
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java | 142 +----
framework/qa/complex/path_settings/PathSettingsTest.java | 6
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java | 158 ++----
toolkit/qa/complex/toolkit/UnitConversion.java | 126 +---
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 14
vcl/qa/complex/persistent_window_states/PersistentWindowTest.java | 30 -
18 files changed, 533 insertions(+), 965 deletions(-)
New commits:
commit 275f0c7b250d448a8e2658ee2f26d4010628237b
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 5 10:24:36 2015 +0200
Let JUnit take care of exceptions
Inspired by commit
4dd0ac62855c5b9382cac004c7eebb9bed983a2b
Change-Id: I6ca29aecde357a3cb5852acfc9b5443761052960
Reviewed-on: https://gerrit.libreoffice.org/16094
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
index 81ffdbe..a61ffdf 100644
--- a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
+++ b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
@@ -19,37 +19,25 @@ package complex.dbaccess;
import com.sun.star.sdb.XSingleSelectQueryComposer;
import connectivity.tools.CRMDatabase;
-import java.util.logging.Level;
-import java.util.logging.Logger;
// ---------- junit imports -----------------
import org.junit.After;
import org.junit.Before;
-import static org.junit.Assert.*;
public abstract class CRMBasedTestCase extends TestCase
{
protected CRMDatabase m_database;
-
- protected void createTestCase()
+ protected void createTestCase() throws Exception
{
- try
- {
- m_database = new CRMDatabase( getMSF(), false );
- }
- catch ( Exception e )
- {
- e.printStackTrace( System.err );
- fail( "caught an exception (" + e.getMessage() + ") while creating the test case");
- }
+ m_database = new CRMDatabase( getMSF(), false );
}
@Before
@Override
- public void before()
+ public void before() throws Exception
{
createTestCase();
}
@@ -57,18 +45,11 @@ public abstract class CRMBasedTestCase extends TestCase
@After
@Override
- public void after()
+ public void after() throws Exception
{
- try
- {
- if ( m_database != null )
- {
- m_database.saveAndClose();
- }
- }
- catch ( Exception ex )
+ if ( m_database != null )
{
- Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, null, ex );
+ m_database.saveAndClose();
}
}
diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
index 97c63d2..20454d24 100644
--- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
+++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
@@ -30,7 +30,6 @@ import com.sun.star.sdb.DataAccessDescriptorFactory;
import com.sun.star.sdbc.XConnection;
import com.sun.star.sdbcx.XTablesSupplier;
import com.sun.star.task.XInteractionHandler;
-import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import connectivity.tools.DbaseDatabase;
@@ -41,7 +40,6 @@ import util.UITools;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
/** complex test case for Base's application UI
@@ -55,7 +53,7 @@ public class CopyTableWizard extends CRMBasedTestCase
@After
@Override
- public void after()
+ public void after() throws Exception
{
dest.store();
if ( destinationDB != null )
@@ -66,19 +64,12 @@ public class CopyTableWizard extends CRMBasedTestCase
@Before
@Override
- public void before()
+ public void before() throws Exception
{
- try
- {
- createTestCase();
- source = new DatabaseApplication(m_database.getDatabase());
- destinationDB = new DbaseDatabase( getMSF() );
- dest = new DatabaseApplication( destinationDB );
- }
- catch (java.lang.Exception ex)
- {
- fail("");
- }
+ createTestCase();
+ source = new DatabaseApplication(m_database.getDatabase());
+ destinationDB = new DbaseDatabase( getMSF() );
+ dest = new DatabaseApplication( destinationDB );
}
diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java
index 3b18cd2..0413a6e 100644
--- a/dbaccess/qa/complex/dbaccess/DataSource.java
+++ b/dbaccess/qa/complex/dbaccess/DataSource.java
@@ -18,7 +18,6 @@
package complex.dbaccess;
import com.sun.star.container.XNameAccess;
-import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XNamingService;
import connectivity.tools.CRMDatabase;
@@ -37,51 +36,33 @@ public class DataSource extends TestCase
connectivity.tools.DataSource m_dataSource;
- private void createTestCase()
+ private void createTestCase() throws Exception
{
- try
+ if (m_database == null)
{
- if (m_database == null)
- {
- final CRMDatabase database = new CRMDatabase( getMSF(), false );
- m_database = database.getDatabase();
- m_dataSource = m_database.getDataSource();
- }
- }
- catch (Exception e)
- {
- fail("could not create the test case, error message:\n" + e.getMessage());
- }
- catch (java.lang.Exception e)
- {
- fail("could not create the test case, error message:\n" + e.getMessage());
+ final CRMDatabase database = new CRMDatabase( getMSF(), false );
+ m_database = database.getDatabase();
+ m_dataSource = m_database.getDataSource();
}
}
@Test
- public void testRegistrationName()
+ public void testRegistrationName() throws Exception
{
- 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(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 = UnoRuntime.queryInterface(
- XNamingService.class, getMSF().createInstance( "com.sun.star.sdb.DatabaseContext" ) );
- final XNameAccess existenceCheck = UnoRuntime.queryInterface( XNameAccess.class, dataSourceRegistrations );
- if ( existenceCheck.hasByName( "someDataSource" ) )
- dataSourceRegistrations.revokeObject( "someDataSource" );
- dataSourceRegistrations.registerObject("someDataSource", m_dataSource.getXDataSource());
- assertEquals("registration name of a newly registered data source is wrong", dataSourceName, m_dataSource.getName());
- }
- catch (Exception ex)
- {
- fail();
- }
+ 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(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 = UnoRuntime.queryInterface(
+ XNamingService.class, getMSF().createInstance( "com.sun.star.sdb.DatabaseContext" ) );
+ final XNameAccess existenceCheck = UnoRuntime.queryInterface( XNameAccess.class, dataSourceRegistrations );
+ if ( existenceCheck.hasByName( "someDataSource" ) )
+ dataSourceRegistrations.revokeObject( "someDataSource" );
+ dataSourceRegistrations.registerObject("someDataSource", m_dataSource.getXDataSource());
+ assertEquals("registration name of a newly registered data source is wrong", dataSourceName, m_dataSource.getName());
}
}
diff --git a/dbaccess/qa/complex/dbaccess/Parser.java b/dbaccess/qa/complex/dbaccess/Parser.java
index 2c72173..8025e1d 100644
--- a/dbaccess/qa/complex/dbaccess/Parser.java
+++ b/dbaccess/qa/complex/dbaccess/Parser.java
@@ -23,7 +23,6 @@ import com.sun.star.sdb.XParametersSupplier;
import com.sun.star.sdb.XSingleSelectQueryComposer;
import com.sun.star.sdbc.DataType;
import com.sun.star.sdbc.SQLException;
-import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
@@ -36,18 +35,10 @@ public class Parser extends CRMBasedTestCase
{
@Override
- protected void createTestCase()
+ protected void createTestCase() throws Exception
{
- try
- {
- super.createTestCase();
- m_database.getDatabase().getDataSource().createQuery( "query products", "SELECT * FROM \"products\"" );
- }
- catch ( Exception e )
- {
- e.printStackTrace( System.err );
- fail( "caught an exception (" + e.getMessage() + ") while creating the test case");
- }
+ super.createTestCase();
+ m_database.getDatabase().getDataSource().createQuery( "query products", "SELECT * FROM \"products\"" );
}
diff --git a/dbaccess/qa/complex/dbaccess/PropertyBag.java b/dbaccess/qa/complex/dbaccess/PropertyBag.java
index 2c313df..6807569 100644
--- a/dbaccess/qa/complex/dbaccess/PropertyBag.java
+++ b/dbaccess/qa/complex/dbaccess/PropertyBag.java
@@ -55,7 +55,7 @@ public class PropertyBag extends TestCase
}
@Test
- public void checkBasics()
+ public void checkBasics() throws Exception
{
createEmptyBag();
System.out.println("testing the basics");
@@ -115,19 +115,12 @@ public class PropertyBag extends TestCase
}
// try writing and reading a value for the one property we have so far
- try
- {
- final String testValue = "someArbitraryValue";
- m_set.setPropertyValue( VALUE , testValue);
- final String currentValue = (String)m_set.getPropertyValue( VALUE);
- if ( !currentValue.equals( testValue ) )
- {
- fail("set property is not remembered");
- }
- }
- catch(com.sun.star.uno.Exception e)
+ final String testValue = "someArbitraryValue";
+ m_set.setPropertyValue( VALUE , testValue);
+ final String currentValue = (String)m_set.getPropertyValue( VALUE);
+ if ( !currentValue.equals( testValue ) )
{
- fail( "setting or getting a property value failed" );
+ fail("set property is not remembered");
}
// try setting an illegal value for the property
diff --git a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
index 08eea00..581677c 100644
--- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
+++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
@@ -32,13 +32,16 @@ import com.sun.star.container.XIndexAccess;
import com.sun.star.sdb.CommandType;
import com.sun.star.sdb.XSingleSelectQueryComposer;
import com.sun.star.uno.UnoRuntime;
-
import com.sun.star.sdbc.DataType;
+import com.sun.star.sdbc.SQLException;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
// ---------- junit imports -----------------
import org.junit.Test;
+
import static org.junit.Assert.*;
@@ -62,21 +65,13 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
@Override
- protected void createTestCase()
+ protected void createTestCase() throws Exception
{
- try
- {
- super.createTestCase();
-
- createQueries();
+ super.createTestCase();
- m_composer = createQueryComposer();
+ createQueries();
- }
- catch (Exception e)
- {
- fail("caught an exception (" + e.getMessage() + ") while creating the test case");
- }
+ m_composer = createQueryComposer();
}
@@ -120,92 +115,78 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
/** tests setCommand of the composer
*/
@Test
- public void testSetCommand()
+ public void testSetCommand() throws Exception
{
System.out.println("testing SingleSelectQueryComposer's setCommand");
- try
- {
- final String table = "SELECT * FROM \"customers\"";
- m_composer.setCommand("customers", CommandType.TABLE);
- assertTrue("setCommand/getQuery TABLE inconsistent", m_composer.getQuery().equals(table));
+ final String table = "SELECT * FROM \"customers\"";
+ m_composer.setCommand("customers", CommandType.TABLE);
+ assertTrue("setCommand/getQuery TABLE inconsistent", m_composer.getQuery().equals(table));
- m_database.getDatabase().getDataSource().createQuery("set command test", "SELECT * FROM \"orders for customer\" \"a\", \"customers\" \"b\" WHERE \"a\".\"Product Name\" = \"b\".\"Name\"");
- m_composer.setCommand("set command test", CommandType.QUERY);
- assertTrue("setCommand/getQuery QUERY inconsistent", m_composer.getQuery().equals(m_database.getDatabase().getDataSource().getQueryDefinition("set command test").getCommand()));
+ m_database.getDatabase().getDataSource().createQuery("set command test", "SELECT * FROM \"orders for customer\" \"a\", \"customers\" \"b\" WHERE \"a\".\"Product Name\" = \"b\".\"Name\"");
+ m_composer.setCommand("set command test", CommandType.QUERY);
+ assertTrue("setCommand/getQuery QUERY inconsistent", m_composer.getQuery().equals(m_database.getDatabase().getDataSource().getQueryDefinition("set command test").getCommand()));
- final String sql = "SELECT * FROM \"orders for customer\" WHERE \"Product Name\" = 'test'";
- m_composer.setCommand(sql, CommandType.COMMAND);
- assertTrue("setCommand/getQuery COMMAND inconsistent", m_composer.getQuery().equals(sql));
- }
- catch (Exception e)
- {
- fail("Exception caught: " + e);
- }
+ final String sql = "SELECT * FROM \"orders for customer\" WHERE \"Product Name\" = 'test'";
+ m_composer.setCommand(sql, CommandType.COMMAND);
+ assertTrue("setCommand/getQuery COMMAND inconsistent", m_composer.getQuery().equals(sql));
}
/** tests accessing attributes of the composer (order, filter, group by, having)
*/
@Test
- public void testAttributes()
+ public void testAttributes() throws Exception
{
System.out.println("testing SingleSelectQueryComposer's attributes (order, filter, group by, having)");
- try
- {
- System.out.println("check setElementaryQuery");
-
- final String simpleQuery2 = "SELECT * FROM \"customers\" WHERE \"Name\" = 'oranges'";
- m_composer.setElementaryQuery(simpleQuery2);
- assertTrue("setElementaryQuery/getQuery inconsistent", m_composer.getQuery().equals(simpleQuery2));
-
- System.out.println("check setQuery");
- final String simpleQuery = "SELECT * FROM \"customers\"";
- m_composer.setQuery(simpleQuery);
- assertTrue("set/getQuery inconsistent", m_composer.getQuery().equals(simpleQuery));
-
- checkAttributeAccess("Filter", "\"Name\" = 'oranges'");
- checkAttributeAccess("Group", "\"City\"");
- checkAttributeAccess("Order", "\"Address\"");
- checkAttributeAccess("HavingClause", "\"ID\" <> 4");
-
- final XIndexAccess orderColumns = m_composer.getOrderColumns();
- assertTrue("Order columns doesn't exist: \"Address\"",
- orderColumns != null && orderColumns.getCount() == 1 && orderColumns.getByIndex(0) != null);
-
- final XIndexAccess groupColumns = m_composer.getGroupColumns();
- assertTrue("Group columns doesn't exist: \"City\"",
- groupColumns != null && groupColumns.getCount() == 1 && groupColumns.getByIndex(0) != null);
-
- // XColumnsSupplier
- final XColumnsSupplier xSelectColumns = UnoRuntime.queryInterface(XColumnsSupplier.class, m_composer);
- assertTrue("no select columns, or wrong number of select columns",
- xSelectColumns != null && xSelectColumns.getColumns() != null && xSelectColumns.getColumns().getElementNames().length == 6);
-
- // structured filter
- m_composer.setQuery("SELECT \"ID\", \"Postal\", \"Address\" FROM \"customers\"");
- m_composer.setFilter(COMPLEXFILTER);
- final PropertyValue[][] aStructuredFilter = m_composer.getStructuredFilter();
- m_composer.setFilter("");
- m_composer.setStructuredFilter(aStructuredFilter);
- if (!m_composer.getFilter().equals(COMPLEXFILTER))
- {
- System.out.println(COMPLEXFILTER);
- System.out.println(m_composer.getFilter());
- }
- assertTrue("Structured Filter not identical", m_composer.getFilter().equals(COMPLEXFILTER));
-
- // structured having clause
- m_composer.setHavingClause(COMPLEXFILTER);
- final PropertyValue[][] aStructuredHaving = m_composer.getStructuredHavingClause();
- m_composer.setHavingClause("");
- m_composer.setStructuredHavingClause(aStructuredHaving);
- assertTrue("Structured Having Clause not identical", m_composer.getHavingClause().equals(COMPLEXFILTER));
- }
- catch (Exception e)
+ System.out.println("check setElementaryQuery");
+
+ final String simpleQuery2 = "SELECT * FROM \"customers\" WHERE \"Name\" = 'oranges'";
+ m_composer.setElementaryQuery(simpleQuery2);
+ assertTrue("setElementaryQuery/getQuery inconsistent", m_composer.getQuery().equals(simpleQuery2));
+
+ System.out.println("check setQuery");
+ final String simpleQuery = "SELECT * FROM \"customers\"";
+ m_composer.setQuery(simpleQuery);
+ assertTrue("set/getQuery inconsistent", m_composer.getQuery().equals(simpleQuery));
+
+ checkAttributeAccess("Filter", "\"Name\" = 'oranges'");
+ checkAttributeAccess("Group", "\"City\"");
+ checkAttributeAccess("Order", "\"Address\"");
+ checkAttributeAccess("HavingClause", "\"ID\" <> 4");
+
+ final XIndexAccess orderColumns = m_composer.getOrderColumns();
+ assertTrue("Order columns doesn't exist: \"Address\"",
+ orderColumns != null && orderColumns.getCount() == 1 && orderColumns.getByIndex(0) != null);
+
+ final XIndexAccess groupColumns = m_composer.getGroupColumns();
+ assertTrue("Group columns doesn't exist: \"City\"",
+ groupColumns != null && groupColumns.getCount() == 1 && groupColumns.getByIndex(0) != null);
+
+ // XColumnsSupplier
+ final XColumnsSupplier xSelectColumns = UnoRuntime.queryInterface(XColumnsSupplier.class, m_composer);
+ assertTrue("no select columns, or wrong number of select columns",
+ xSelectColumns != null && xSelectColumns.getColumns() != null && xSelectColumns.getColumns().getElementNames().length == 6);
+
+ // structured filter
+ m_composer.setQuery("SELECT \"ID\", \"Postal\", \"Address\" FROM \"customers\"");
+ m_composer.setFilter(COMPLEXFILTER);
+ final PropertyValue[][] aStructuredFilter = m_composer.getStructuredFilter();
+ m_composer.setFilter("");
+ m_composer.setStructuredFilter(aStructuredFilter);
+ if (!m_composer.getFilter().equals(COMPLEXFILTER))
{
- fail("Exception caught: " + e);
+ System.out.println(COMPLEXFILTER);
+ System.out.println(m_composer.getFilter());
}
+ assertTrue("Structured Filter not identical", m_composer.getFilter().equals(COMPLEXFILTER));
+
+ // structured having clause
+ m_composer.setHavingClause(COMPLEXFILTER);
+ final PropertyValue[][] aStructuredHaving = m_composer.getStructuredHavingClause();
+ m_composer.setHavingClause("");
+ m_composer.setStructuredHavingClause(aStructuredHaving);
+ assertTrue("Structured Having Clause not identical", m_composer.getHavingClause().equals(COMPLEXFILTER));
}
/** test various sub query related features ("queries in queries")
@@ -228,89 +209,65 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
/** tests the XParametersSupplier functionality
*/
@Test
- public void testParameters()
+ public void testParameters() throws Exception
{
- try
- {
- // "orders for customers" is a query with a named parameter (based on another query)
- m_database.getDatabase().getDataSource().createQuery("orders for customer", "SELECT * FROM \"all orders\" WHERE \"Customer Name\" LIKE :cname");
- // "orders for customer and product" is query based on "orders for customers", adding an additional,
- // anonymous parameter
- m_database.getDatabase().getDataSource().createQuery("orders for customer and product", "SELECT * FROM \"orders for customer\" WHERE \"Product Name\" LIKE ?");
+ // "orders for customers" is a query with a named parameter (based on another query)
+ m_database.getDatabase().getDataSource().createQuery("orders for customer", "SELECT * FROM \"all orders\" WHERE \"Customer Name\" LIKE :cname");
+ // "orders for customer and product" is query based on "orders for customers", adding an additional,
+ // anonymous parameter
+ m_database.getDatabase().getDataSource().createQuery("orders for customer and product", "SELECT * FROM \"orders for customer\" WHERE \"Product Name\" LIKE ?");
- m_composer.setQuery(m_database.getDatabase().getDataSource().getQueryDefinition("orders for customer and product").getCommand());
- final XParametersSupplier suppParams = UnoRuntime.queryInterface(XParametersSupplier.class, m_composer);
- final XIndexAccess parameters = suppParams.getParameters();
+ m_composer.setQuery(m_database.getDatabase().getDataSource().getQueryDefinition("orders for customer and product").getCommand());
+ final XParametersSupplier suppParams = UnoRuntime.queryInterface(XParametersSupplier.class, m_composer);
+ final XIndexAccess parameters = suppParams.getParameters();
- final String expectedParamNames[] =
+ final String expectedParamNames[] =
- {
- "cname",
- "Product Name"
- };
-
- final int paramCount = parameters.getCount();
- assertTrue("composer did find wrong number of parameters in the nested queries.",
- paramCount == expectedParamNames.length);
+ {
+ "cname",
+ "Product Name"
+ };
- for (int i = 0; i < paramCount; ++i)
- {
- final XPropertySet parameter = UnoRuntime.queryInterface(XPropertySet.class, parameters.getByIndex(i));
- final String paramName = (String) parameter.getPropertyValue("Name");
- assertTrue("wrong parameter name at position " + (i + 1) + " (expected: " + expectedParamNames[i] + ", found: " + paramName + ")",
- paramName.equals(expectedParamNames[i]));
+ final int paramCount = parameters.getCount();
+ assertTrue("composer did find wrong number of parameters in the nested queries.",
+ paramCount == expectedParamNames.length);
- }
- }
- catch (Exception e)
+ for (int i = 0; i < paramCount; ++i)
{
- fail("caught an exception: " + e);
+ final XPropertySet parameter = UnoRuntime.queryInterface(XPropertySet.class, parameters.getByIndex(i));
+ final String paramName = (String) parameter.getPropertyValue("Name");
+ assertTrue("wrong parameter name at position " + (i + 1) + " (expected: " + expectedParamNames[i] + ", found: " + paramName + ")",
+ paramName.equals(expectedParamNames[i]));
+
}
}
@Test
- public void testConditionByColumn()
+ public void testConditionByColumn() throws Exception
{
- try
- {
- m_composer.setQuery("SELECT * FROM \"customers\"");
-
- final Object initArgs[] =
+ m_composer.setQuery("SELECT * FROM \"customers\"");
- {
- new NamedValue("AutomaticAddition", Boolean.TRUE)
- };
- final String serviceName = "com.sun.star.beans.PropertyBag";
- final XPropertyContainer filter = UnoRuntime.queryInterface(XPropertyContainer.class, getMSF().createInstanceWithArguments(serviceName, initArgs));
- filter.addProperty("Name", PropertyAttribute.MAYBEVOID, "Comment");
- filter.addProperty("RealName", PropertyAttribute.MAYBEVOID, "Comment");
- filter.addProperty("TableName", PropertyAttribute.MAYBEVOID, "customers");
- filter.addProperty("Value", PropertyAttribute.MAYBEVOID, "Good one.");
- filter.addProperty("Type", PropertyAttribute.MAYBEVOID, Integer.valueOf(DataType.LONGVARCHAR));
- final XPropertySet column = UnoRuntime.queryInterface(XPropertySet.class, filter);
-
- m_composer.appendFilterByColumn(column, true, SQLFilterOperator.LIKE);
- assertTrue("At least one row should exist", m_database.getConnection().createStatement().executeQuery(m_composer.getQuery()).next());
+ final Object initArgs[] =
- }
- catch (Exception e)
{
- // this is an error: the query is expected to be parseable
- fail("caught an exception: " + e);
- }
+ new NamedValue("AutomaticAddition", Boolean.TRUE)
+ };
+ final String serviceName = "com.sun.star.beans.PropertyBag";
+ final XPropertyContainer filter = UnoRuntime.queryInterface(XPropertyContainer.class, getMSF().createInstanceWithArguments(serviceName, initArgs));
+ filter.addProperty("Name", PropertyAttribute.MAYBEVOID, "Comment");
+ filter.addProperty("RealName", PropertyAttribute.MAYBEVOID, "Comment");
+ filter.addProperty("TableName", PropertyAttribute.MAYBEVOID, "customers");
+ filter.addProperty("Value", PropertyAttribute.MAYBEVOID, "Good one.");
+ filter.addProperty("Type", PropertyAttribute.MAYBEVOID, Integer.valueOf(DataType.LONGVARCHAR));
+ final XPropertySet column = UnoRuntime.queryInterface(XPropertySet.class, filter);
+
+ m_composer.appendFilterByColumn(column, true, SQLFilterOperator.LIKE);
+ assertTrue("At least one row should exist", m_database.getConnection().createStatement().executeQuery(m_composer.getQuery()).next());
}
- private void impl_testDisjunctiveNormalForm(String _query, PropertyValue[][] _expectedDNF)
+ private void impl_testDisjunctiveNormalForm(String _query, PropertyValue[][] _expectedDNF) throws SQLException
{
- try
- {
- m_composer.setQuery(_query);
- }
- catch (Exception e)
- {
- // this is an error: the query is expected to be parseable
- fail("caught an exception: " + e);
- }
+ m_composer.setQuery(_query);
final PropertyValue[][] disjunctiveNormalForm = m_composer.getStructuredFilter();
@@ -330,7 +287,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
* of the composer
*/
@Test
- public void testDisjunctiveNormalForm()
+ public void testDisjunctiveNormalForm() throws Exception
{
// a simple case: WHERE clause simply is a combination of predicates knitted with AND
String query =
diff --git a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
index 1e43393..5967a7e 100644
--- a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
+++ b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
@@ -17,26 +17,25 @@
*/
package complex.filter.misc;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+
import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.NoSuchElementException;
import com.sun.star.container.XNameAccess;
import com.sun.star.container.XNameContainer;
import com.sun.star.container.XNameReplace;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
import com.sun.star.lang.WrappedTargetRuntimeException;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.util.XFlushable;
-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.*;
-
/**
* This complex test checks the functionality of the properties "Finalized" and "Mandatory" of
@@ -106,7 +105,7 @@ public class FinalizedMandatoryTest
* call the function <CODE>checkReadonlySupport</CODE> to test <CODE>com.sun.star.document.FilterFactory</CODE>
* @see com.sun.star.document.FilterFactory
*/
- @Test public void checkReadonlySupportFilterFactory()
+ @Test public void checkReadonlySupportFilterFactory() throws Exception
{
checkReadonlySupport("com.sun.star.document.FilterFactory");
}
@@ -115,7 +114,7 @@ public class FinalizedMandatoryTest
* call the function <CODE>checkReadonlySupport</CODE> to test <CODE>com.sun.star.document.TypeDetection</CODE>
* @see com.sun.star.document.TypeDetection
*/
- @Test public void checkReadonlySupportTypeDetection()
+ @Test public void checkReadonlySupportTypeDetection() throws Exception
{
checkReadonlySupport("com.sun.star.document.TypeDetection");
}
@@ -125,21 +124,14 @@ public class FinalizedMandatoryTest
* For every filter a new instace was created and the tests started.
* @param serviceName the name of the service to test
*/
- private void checkReadonlySupport(String serviceName)
+ private void checkReadonlySupport(String serviceName) throws Exception
{
System.out.println("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
System.out.println("testing service '" + serviceName + "'");
XInterface oObj = null;
- try
- {
- oObj = getTestObject(serviceName);
- System.out.println("ImplName: " + util.utils.getImplName(oObj));
- }
- catch (java.lang.Exception e)
- {
- fail("could not get test object");
- }
+ oObj = getTestObject(serviceName);
+ System.out.println("ImplName: " + util.utils.getImplName(oObj));
boolean mandantoryTrue = false;
boolean mandantoryFalse = false;
@@ -157,109 +149,76 @@ public class FinalizedMandatoryTest
for (int i = 0; i < filterNames.length; i++)
{
System.out.println("------------------------------------------------");
+ filterName = filterNames[i];
+ System.out.println(filterName);
+
+ // testobject must new created for every test.
+ // We change in a loop the container and try to flush this changes.
+ // If we get an expected exception this container is corrupt. It's
+ // similar to a document which could not be saved because of invalid
+ // contend. While you don't remove the invalid conted you will never
+ // be able to save the document. Same here.
+ oObj = getTestObject(serviceName);
+
+ xNA = UnoRuntime.queryInterface(XNameAccess.class, oObj);
+ XNameContainer xNC = UnoRuntime.queryInterface(XNameContainer.class, oObj);
+ XNameReplace xNR = UnoRuntime.queryInterface(XNameReplace.class, oObj);
+ XFlushable xFlush = UnoRuntime.queryInterface(XFlushable.class, oObj);
+
+ instance = (Object[]) xNA.getByName(filterName);
+ PropertyValue[] props = (PropertyValue[]) instance;
+
+ printPropertyValues(props);
+
+ boolean isMandatory = ((Boolean) getPropertyValueValue(props, "Mandatory")).booleanValue();
+ boolean isFinalized = ((Boolean) getPropertyValueValue(props, "Finalized")).booleanValue();
+
+ // memory if every state is available
+ mandantoryTrue |= isMandatory;
+ mandantoryFalse |= !isMandatory;
+
+ finalizedTrue |= isFinalized;
+ finalizedFalse |= !isFinalized;
+
+ //change the filter
+ setPropertyValueValue((PropertyValue[]) instance, "UIName", "dummy");
+
+ // 1a.) try to change the filter in the container
+ xNR.replaceByName(filterName, instance);
+
+ // 1b.) try to wirte the changed filter to the configuration.
+ // This must result in a exception if the filter is finalized.
+ boolean flushError = false;
try
{
- filterName = filterNames[i];
- System.out.println(filterName);
-
- // testobject must new created for every test.
- // We change in a loop the container and try to flush this changes.
- // If we get an expected exception this container is corrupt. It's
- // similar to a document which could not be saved because of invalid
- // contend. While you don't remove the invalid conted you will never
- // be able to save the document. Same here.
- try
- {
- oObj = getTestObject(serviceName);
- }
- catch (java.lang.Exception e)
- {
- fail("could not get test object");
- }
-
- xNA = UnoRuntime.queryInterface(XNameAccess.class, oObj);
- XNameContainer xNC = UnoRuntime.queryInterface(XNameContainer.class, oObj);
- XNameReplace xNR = UnoRuntime.queryInterface(XNameReplace.class, oObj);
- XFlushable xFlush = UnoRuntime.queryInterface(XFlushable.class, oObj);
-
- instance = (Object[]) xNA.getByName(filterName);
- PropertyValue[] props = (PropertyValue[]) instance;
-
- printPropertyValues(props);
-
- boolean isMandatory = ((Boolean) getPropertyValueValue(props, "Mandatory")).booleanValue();
- boolean isFinalized = ((Boolean) getPropertyValueValue(props, "Finalized")).booleanValue();
-
- // memory if every state is available
- mandantoryTrue |= isMandatory;
- mandantoryFalse |= !isMandatory;
-
- finalizedTrue |= isFinalized;
- finalizedFalse |= !isFinalized;
-
- //change the filter
- setPropertyValueValue((PropertyValue[]) instance, "UIName", "dummy");
-
- // 1a.) try to change the filter in the container
- try
- {
- xNR.replaceByName(filterName, instance);
- }
- catch (IllegalArgumentException e)
- {
- fail("could not replace filter properties ('" + filterName + "')");
- }
-
- // 1b.) try to wirte the changed filter to the configuration.
- // This must result in a exception if the filter is finalized.
- boolean flushError = false;
- try
- {
- xFlush.flush();
- }
- catch (WrappedTargetRuntimeException e)
- {
- flushError = true;
- assertTrue("Unexpected exception wihle flushing changed filter '" + filterName + "'", isFinalized);
- }
- assertTrue("Expected exception was not thorwn while flushing changed filter '" + filterName + "' Finalized:" + isFinalized,
- !(flushError ^ isFinalized));
-
-
-
- // 2a.) try to remove the filter from the container
- try
- {
- xNC.removeByName(filterName);
- }
- catch (NoSuchElementException e)
- {
- fail("could not remove filter from container ('" + filterName + "')");
- }
- // 1b.) try to wirte the changed filter to the configuration.
- // This must result in a exception if the filter is mandatory
- flushError = false;
- try
- {
- xFlush.flush();
- }
- catch (WrappedTargetRuntimeException e)
- {
- flushError = true;
- assertTrue("Unexpected exception wihle flushing removed filter '" + filterName + "'", isMandatory);
- }
- assertTrue("Expected exception was not thorwn while flushing removed filter '" + filterName + "' Mandatory:" + isMandatory,
- !(flushError ^ isMandatory));
-
+ xFlush.flush();
+ }
+ catch (WrappedTargetRuntimeException e)
+ {
+ flushError = true;
+ assertTrue("Unexpected exception wihle flushing changed filter '" + filterName + "'", isFinalized);
}
- catch (NoSuchElementException e)
+ assertTrue("Expected exception was not thorwn while flushing changed filter '" + filterName + "' Finalized:" + isFinalized,
+ !(flushError ^ isFinalized));
+
+
+
+ // 2a.) try to remove the filter from the container
+ xNC.removeByName(filterName);
+ // 1b.) try to wirte the changed filter to the configuration.
+ // This must result in a exception if the filter is mandatory
+ flushError = false;
+ try
{
- fail("Couldn't get elements from object");
+ xFlush.flush();
}
- catch (WrappedTargetException e)
+ catch (WrappedTargetRuntimeException e)
{
- fail("Couldn't get elements from object");
+ flushError = true;
+ assertTrue("Unexpected exception wihle flushing removed filter '" + filterName + "'", isMandatory);
}
+ assertTrue("Expected exception was not thorwn while flushing removed filter '" + filterName + "' Mandatory:" + isMandatory,
+ !(flushError ^ isMandatory));
}
String preMsg = "Could not find filter with state ";
String postMsg = " Please check if such filter is installed!";
diff --git a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java
index 75903c0..c5e342b 100644
--- a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java
+++ b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java
@@ -44,17 +44,15 @@ public class TypeDetection6FileFormat
*/
@Before public void before() throws Exception
{
-
xMSF = getMSF();
assertNotNull("Could not get XMultiServiceFactory", xMSF);
-
}
/**
* call the function <CODE>checkFileFormatSupport</CODE> to test <CODE>com.sun.star.document.FilterFactory</CODE>
* @see com.sun.star.document.FilterFactory
*/
- @Test public void checkFilterFactory()
+ @Test public void checkFilterFactory() throws Exception
{
checkFileFormatSupport("com.sun.star.document.FilterFactory");
}
@@ -63,10 +61,9 @@ public class TypeDetection6FileFormat
* call the function <CODE>checkFileFormatSupport</CODE> to test <CODE>com.sun.star.document.TypeDetection</CODE>
* @see com.sun.star.document.TypeDetection
*/
- @Test public void checkTypeDetection()
+ @Test public void checkTypeDetection() throws Exception
{
checkFileFormatSupport("com.sun.star.document.TypeDetection");
-
}
/**
@@ -74,27 +71,18 @@ public class TypeDetection6FileFormat
* The serve was created and the filter 'TypeDetection6FileFormat' was searched
* @param serviceName the name of the service to test
*/
- private void checkFileFormatSupport(String serviceName)
+ private void checkFileFormatSupport(String serviceName) throws Exception
{
System.out.println("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
System.out.println("testing service '" + serviceName + "'");
XInterface oObj = null;
- try
- {
- oObj = getTestObject(serviceName);
- System.out.println("ImplName: " + utils.getImplName(oObj));
- }
- catch (java.lang.Exception e)
- {
- fail("could not get test object");
- }
+ oObj = getTestObject(serviceName);
+ System.out.println("ImplName: " + utils.getImplName(oObj));
XNameAccess xNA = UnoRuntime.queryInterface(XNameAccess.class, oObj);
String msg = "Could not find filter 'TypeDetection6FileFormat'!";
msg += "\nMaybe 'TypeDetection6FileFormat.xcu' is not registered.";
assertTrue(msg, xNA.hasByName("TypeDetection6FileFormat"));
-
-
}
/**
diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index 3c53c34..1cf2ceb 100644
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -18,7 +18,6 @@
package complex.forms;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
@@ -43,7 +42,6 @@ import com.sun.star.lang.EventObject;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.CloseVetoException;
import com.sun.star.util.XCloseable;
/**
@@ -54,42 +52,28 @@ public class CheckOGroupBoxModel
private XMultiPropertySet m_xPropSet;
private XComponent m_xDrawDoc;
- @Before public void before()
+ @Before public void before() throws Exception
{
SOfficeFactory SOF = SOfficeFactory.getFactory(getMSF());
- try
- {
- System.out.println("creating a draw document");
- m_xDrawDoc = SOF.createDrawDoc(null);
- }
- catch (com.sun.star.uno.Exception e)
- {
- fail("Couldn't create document.");
- }
+ System.out.println("creating a draw document");
+ m_xDrawDoc = SOF.createDrawDoc(null);
String objName = "GroupBox";
XControlShape shape = FormTools.insertControlShape(m_xDrawDoc, 5000, 7000, 2000, 2000, objName);
m_xPropSet = UnoRuntime.queryInterface(XMultiPropertySet.class, shape.getControl());
}
- @After public void after()
+ @After public void after() throws Exception
{
XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, m_xDrawDoc);
if (xClose != null)
{
- try
- {
- xClose.close(true);
- }
- catch (CloseVetoException ex)
- {
- fail("Can't close document. Exception caught: " + ex.getMessage());
- /* ignore! */
- }
+ xClose.close(true);
}
}
- @Test public void setPropertyValues()
+
+ @Test public void setPropertyValues() throws Exception
{
String[] boundPropsToTest = getBoundPropsToTest();
@@ -103,22 +87,7 @@ public class CheckOGroupBoxModel
{
newValue[i] = ValueChanger.changePValue(gValues[i]);
}
- try
- {
- m_xPropSet.setPropertyValues(boundPropsToTest, newValue);
- }
- catch (com.sun.star.beans.PropertyVetoException e)
- {
- fail("Exception occurred while trying to change the properties.");
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- fail("Exception occurred while trying to change the properties.");
- }
- catch (com.sun.star.lang.WrappedTargetException e)
- {
- fail("Exception occurred while trying to change the properties.");
- } // end of try-catch
+ m_xPropSet.setPropertyValues(boundPropsToTest, newValue);
assertTrue("Listener was not called.", ml.wasListenerCalled());
m_xPropSet.removePropertiesChangeListener(ml);
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 916e570..6516d27 100644
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -31,7 +31,6 @@ import com.sun.star.beans.XPropertySet;
import com.sun.star.drawing.XShape;
import com.sun.star.frame.XFrame;
import com.sun.star.frame.XModel;
-import com.sun.star.lang.IndexOutOfBoundsException;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.ui.XContextMenuInterception;
import com.sun.star.ui.XContextMenuInterceptor;
@@ -79,7 +78,7 @@ public class CheckContextMenuInterceptor
}
@After
- public void after()
+ public void after() throws Exception
{
System.out.println("release the popup menu");
try
@@ -98,116 +97,97 @@ public class CheckContextMenuInterceptor
XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xFrame);
- try
- {
- xClose.close(true);
- }
- catch (com.sun.star.util.CloseVetoException exVeto)
- {
- fail("Test frame couldn't be closed successfully.");
- }
+ xClose.close(true);
xFrame = null;
-
}
@Test
- public void checkContextMenuInterceptor()
+ public void checkContextMenuInterceptor() throws Exception
{
System.out.println(" **** Context Menu Interceptor *** ");
- try
- {
- // intialize the test document
- xDrawDoc = DrawTools.createDrawDoc(xMSF);
+ // intialize the test document
+ xDrawDoc = DrawTools.createDrawDoc(xMSF);
- SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF);
- XShape oShape = SOF.createShape(xDrawDoc, 5000, 5000, 1500, 1000, "GraphicObject");
- DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc, 0)).add(oShape);
+ SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF);
+ XShape oShape = SOF.createShape(xDrawDoc, 5000, 5000, 1500, 1000, "GraphicObject");
+ DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc, 0)).add(oShape);
- com.sun.star.frame.XModel xModel =
- UnoRuntime.queryInterface(com.sun.star.frame.XModel.class, xDrawDoc);
+ com.sun.star.frame.XModel xModel =
+ UnoRuntime.queryInterface(com.sun.star.frame.XModel.class, xDrawDoc);
- // get the frame for later usage
- xFrame = xModel.getCurrentController().getFrame();
+ // get the frame for later usage
+ xFrame = xModel.getCurrentController().getFrame();
- // ensure that the document content is optimal visible
- DesktopTools.zoomToEntirePage(xDrawDoc);
+ // ensure that the document content is optimal visible
+ DesktopTools.zoomToEntirePage(xDrawDoc);
- XBitmap xBitmap = null;
+ XBitmap xBitmap = null;
- // adding graphic as ObjRelation for GraphicObjectShape
- XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class, oShape);
- System.out.println("Inserting a shape into the document");
+ // adding graphic as ObjRelation for GraphicObjectShape
+ XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class, oShape);
+ System.out.println("Inserting a shape into the document");
- try
- {
- String sFile = OfficeFileUrl.getAbsolute(new File("space-metal.jpg"));
- oShapeProps.setPropertyValue("GraphicURL", sFile);
- Object oProp = oShapeProps.getPropertyValue("GraphicObjectFillBitmap");
- xBitmap = (XBitmap) AnyConverter.toObject(new Type(XBitmap.class), oProp);
- }
- catch (com.sun.star.lang.WrappedTargetException e)
- {
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- }
- catch (com.sun.star.beans.PropertyVetoException e)
- {
- }
- catch (com.sun.star.beans.UnknownPropertyException e)
- {
- }
+ try
+ {
+ String sFile = OfficeFileUrl.getAbsolute(new File("space-metal.jpg"));
+ oShapeProps.setPropertyValue("GraphicURL", sFile);
+ Object oProp = oShapeProps.getPropertyValue("GraphicObjectFillBitmap");
+ xBitmap = (XBitmap) AnyConverter.toObject(new Type(XBitmap.class), oProp);
+ }
+ catch (com.sun.star.lang.WrappedTargetException e)
+ {
+ }
+ catch (com.sun.star.lang.IllegalArgumentException e)
+ {
+ }
+ catch (com.sun.star.beans.PropertyVetoException e)
+ {
+ }
+ catch (com.sun.star.beans.UnknownPropertyException e)
+ {
+ }
- // reuse the frame
- com.sun.star.frame.XController xController = xFrame.getController();
- XContextMenuInterception xContextMenuInterception = null;
- XContextMenuInterceptor xContextMenuInterceptor = null;
+ // reuse the frame
+ com.sun.star.frame.XController xController = xFrame.getController();
+ XContextMenuInterception xContextMenuInterception = null;
+ XContextMenuInterceptor xContextMenuInterceptor = null;
- if (xController != null)
- {
- System.out.println("Creating context menu interceptor");
+ if (xController != null)
+ {
+ System.out.println("Creating context menu interceptor");
- // add our context menu interceptor
- xContextMenuInterception =
- UnoRuntime.queryInterface(XContextMenuInterception.class, xController);
+ // add our context menu interceptor
+ xContextMenuInterception =
+ UnoRuntime.queryInterface(XContextMenuInterception.class, xController);
- if (xContextMenuInterception != null)
- {
- ContextMenuInterceptor aContextMenuInterceptor = new ContextMenuInterceptor(xBitmap);
- xContextMenuInterceptor =
- UnoRuntime.queryInterface(XContextMenuInterceptor.class, aContextMenuInterceptor);
+ if (xContextMenuInterception != null)
+ {
+ ContextMenuInterceptor aContextMenuInterceptor = new ContextMenuInterceptor(xBitmap);
+ xContextMenuInterceptor =
+ UnoRuntime.queryInterface(XContextMenuInterceptor.class, aContextMenuInterceptor);
- System.out.println("Register context menu interceptor");
- xContextMenuInterception.registerContextMenuInterceptor(xContextMenuInterceptor);
- }
+ System.out.println("Register context menu interceptor");
+ xContextMenuInterception.registerContextMenuInterceptor(xContextMenuInterceptor);
}
+ }
- openContextMenu(UnoRuntime.queryInterface(XModel.class, xDrawDoc));
+ openContextMenu(UnoRuntime.queryInterface(XModel.class, xDrawDoc));
- checkHelpEntry();
+ checkHelpEntry();
- // remove our context menu interceptor
- if (xContextMenuInterception != null
- && xContextMenuInterceptor != null)
- {
- System.out.println("Release context menu interceptor");
- xContextMenuInterception.releaseContextMenuInterceptor(
- xContextMenuInterceptor);
- }
- }
- catch (com.sun.star.uno.RuntimeException ex)
+ // remove our context menu interceptor
+ if (xContextMenuInterception != null
+ && xContextMenuInterceptor != null)
{
- fail("Runtime exception caught!" + ex.getMessage());
- }
- catch (java.lang.Exception ex)
- {
- fail("Java lang exception caught!" + ex.getMessage());
+ System.out.println("Release context menu interceptor");
+ xContextMenuInterception.releaseContextMenuInterceptor(
+ xContextMenuInterceptor);
}
}
- private void checkHelpEntry()
+ private void checkHelpEntry() throws Exception
{
XInterface toolkit = null;
@@ -240,24 +220,14 @@ public class CheckContextMenuInterceptor
System.out.println("ImplementationName: " + util.utils.getImplName(oPopMenu));
XAccessible xHelp = null;
- try
- {
- System.out.println("Try to get first entry of context menu...");
- xHelp = oPopMenu.getAccessibleChild(0);
-
- }
- catch (IndexOutOfBoundsException e)
- {
- fail("Not possible to get first entry of context menu");
- }
-
+ System.out.println("Try to get first entry of context menu...");
+ xHelp = oPopMenu.getAccessibleChild(0);
if (xHelp == null)
{
fail("first entry of context menu is NULL");
}
XAccessibleContext xHelpCont = xHelp.getAccessibleContext();
-
if (xHelpCont == null)
{
fail("No able to retrieve accessible context from first entry of context menu");
@@ -270,16 +240,8 @@ public class CheckContextMenuInterceptor
fail("First entry of context menu is not from context menu interceptor");
}
- try
- {
- System.out.println("try to get first children of Help context...");
- xHelpCont.getAccessibleChild(0);
- }
- catch (IndexOutOfBoundsException e)
- {
- fail("not possible to get first children of Help context");
- }
-
+ System.out.println("try to get first children of Help context...");
+ xHelpCont.getAccessibleChild(0);
}
private void openContextMenu(XModel aModel)
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index c227be2..febef2b 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -68,30 +68,23 @@ public class checkdispatchapi
@descr create an empty test frame, where we can load
different components inside.
*/
- @Before public void before()
+ @Before public void before() throws Exception
{
- try
- {
- // get uno service manager from global test environment
- m_xMSF = getMSF();
+ // get uno service manager from global test environment
+ m_xMSF = getMSF();
- db = new connectivity.tools.HsqlDatabase(m_xMSF);
+ db = new connectivity.tools.HsqlDatabase(m_xMSF);
- // create desktop
- m_xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xMSF.createInstance("com.sun.star.frame.Desktop"));
+ // create desktop
+ m_xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xMSF.createInstance("com.sun.star.frame.Desktop"));
- m_xFrame = impl_createNewFrame();
- }
- catch (java.lang.Throwable ex)
- {
- fail("Can't initialize test environment.");
- }
+ m_xFrame = impl_createNewFrame();
}
/** @short close the environment.
*/
- @After public void after()
+ @After public void after() throws Exception
{
db.close();
impl_closeFrame(m_xFrame);
@@ -99,49 +92,49 @@ public class checkdispatchapi
}
- @Test public void checkDispatchInfoOfWriter()
+ @Test public void checkDispatchInfoOfWriter() throws Exception
{
impl_checkDispatchInfoOfXXX("private:factory/swriter");
}
- @Test public void checkDispatchInfoOfCalc()
+ @Test public void checkDispatchInfoOfCalc() throws Exception
{
impl_checkDispatchInfoOfXXX("private:factory/scalc");
}
- @Test public void checkDispatchInfoOfDraw()
+ @Test public void checkDispatchInfoOfDraw() throws Exception
{
impl_checkDispatchInfoOfXXX("private:factory/sdraw");
}
- @Test public void checkDispatchInfoOfImpress()
+ @Test public void checkDispatchInfoOfImpress() throws Exception
{
impl_checkDispatchInfoOfXXX("private:factory/simpress");
}
- @Test public void checkDispatchInfoOfChart()
+ @Test public void checkDispatchInfoOfChart() throws Exception
{
impl_checkDispatchInfoOfXXX("private:factory/schart");
}
- @Test public void checkDispatchInfoOfMath()
+ @Test public void checkDispatchInfoOfMath() throws Exception
{
impl_checkDispatchInfoOfXXX("private:factory/smath");
}
- @Test public void checkDispatchInfoOfDataBase()
+ @Test public void checkDispatchInfoOfDataBase() throws Exception
{
impl_checkDispatchInfoOfXXX("private:factory/sdatabase");
}
- @Test public void checkDispatchInfoOfBibliography()
+ @Test public void checkDispatchInfoOfBibliography() throws Exception
{
impl_checkDispatchInfoOfXXX(".component:Bibliography/View1");
}
@@ -153,19 +146,19 @@ public class checkdispatchapi
}
- @Test public void checkDispatchInfoOfTableDesign()
+ @Test public void checkDispatchInfoOfTableDesign() throws Exception
{
callDatabaseDispatch(".component:DB/TableDesign");
}
- @Test public void checkDispatchInfoOfFormGridView()
+ @Test public void checkDispatchInfoOfFormGridView() throws Exception
{
impl_checkDispatchInfoOfXXX(".component:DB/FormGridView");
}
- @Test public void checkDispatchInfoOfDataSourceBrowser()
+ @Test public void checkDispatchInfoOfDataSourceBrowser() throws Exception
{
impl_checkDispatchInfoOfXXX(".component:DB/DataSourceBrowser");
}
@@ -200,21 +193,21 @@ public class checkdispatchapi
}
- @Test public void checkDispatchInfoOfBasic()
+ @Test public void checkDispatchInfoOfBasic() throws Exception
{
Object aComponent = impl_createUNOComponent("com.sun.star.script.BasicIDE");
impl_checkDispatchInfo(aComponent);
}
- @Test public void checkDispatchInfoOfStartModule()
+ @Test public void checkDispatchInfoOfStartModule() throws Exception
{
Object aComponent = impl_createUNOComponent("com.sun.star.frame.StartModule");
impl_checkDispatchInfo(aComponent);
}
- public void checkInterceptorLifeTime()
+ public void checkInterceptorLifeTime() throws Exception
{
// Note: It's important for the following test, that aInterceptor will be hold alive by the uno reference
// xInterceptor. Otherwhise we can't check some internal states of aInterceptor at the end of this method, because
@@ -249,7 +242,7 @@ public class checkdispatchapi
}
- public void checkInterception()
+ public void checkInterception() throws Exception
{
String[] lDisabledURLs = new String[] { ".uno:Open" };
@@ -273,7 +266,7 @@ public class checkdispatchapi
}
- private void impl_checkDispatchInfoOfXXX(String sXXX)
+ private void impl_checkDispatchInfoOfXXX(String sXXX) throws Exception
{
XFrame xFrame = impl_createNewFrame();
impl_loadIntoFrame(xFrame, sXXX, null);
@@ -284,7 +277,7 @@ public class checkdispatchapi
/** @short load an URL into the current test frame.
*/
- private void impl_loadIntoFrame(XFrame xFrame, String sURL, PropertyValue args[])
+ private void impl_loadIntoFrame(XFrame xFrame, String sURL, PropertyValue args[]) throws Exception
{
XComponentLoader xLoader = UnoRuntime.queryInterface(XComponentLoader.class, xFrame);
if (xLoader == null)
@@ -292,15 +285,7 @@ public class checkdispatchapi
fail("Frame does not provide required interface XComponentLoader.");
}
- XComponent xDoc = null;
- try
- {
- xDoc = xLoader.loadComponentFromURL(sURL, "_self", 0, args);
- }
- catch (java.lang.Throwable ex)
- {
- xDoc = null;
- }
+ XComponent xDoc = xLoader.loadComponentFromURL(sURL, "_self", 0, args);
if (xDoc == null)
{
@@ -334,7 +319,7 @@ public class checkdispatchapi
/** @short check the interface XDispatchInformationProvider
at the specified component.
*/
- private void impl_checkDispatchInfo(Object aComponent)
+ private void impl_checkDispatchInfo(Object aComponent) throws Exception
{
XDispatchInformationProvider xInfoProvider = UnoRuntime.queryInterface(XDispatchInformationProvider.class, aComponent);
if (xInfoProvider == null)
@@ -344,86 +329,62 @@ public class checkdispatchapi
return;
}
- try
+ short[] lGroups = xInfoProvider.getSupportedCommandGroups();
+ int c1 = lGroups.length;
+ int i1 = 0;
+ for (i1 = 0; i1 < c1; ++i1)
{
- short[] lGroups = xInfoProvider.getSupportedCommandGroups();
- int c1 = lGroups.length;
- int i1 = 0;
- for (i1 = 0; i1 < c1; ++i1)
+ short nGroup = lGroups[i1];
+ DispatchInformation[] lInfos = xInfoProvider.getConfigurableDispatchInformation(nGroup);
+ int c2 = lInfos.length;
+ int i2 = 0;
+
+ // check for empty lists
+ // Warning
+ if (lInfos.length < 1)
{
- short nGroup = lGroups[i1];
- DispatchInformation[] lInfos = xInfoProvider.getConfigurableDispatchInformation(nGroup);
- int c2 = lInfos.length;
- int i2 = 0;
-
- // check for empty lists
- // Warning
- if (lInfos.length < 1)
+ System.out.println("Warning:\tCould not get any DispatchInformation for group [" + nGroup + "].");
+ }
+
+ // check for duplicates (and by the way, if the info item match the requested group)
+ HashMap<String, String> aCheckMap = new HashMap<String, String>(c2);
+ for (i2 = 0; i2 < c2; ++i2)
+ {
+ DispatchInformation aInfo = lInfos[i2];
+ if (aInfo.GroupId != nGroup)
{
- System.out.println("Warning:\tCould not get any DispatchInformation for group [" + nGroup + "].");
+ // Error
+ fail("At least one DispatchInformation item does not match the requested group.\n\trequested group=[" + nGroup
+ + "] returned groupd=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test
+ continue;
}
- // check for duplicates (and by the way, if the info item match the requested group)
- HashMap<String, String> aCheckMap = new HashMap<String, String>(c2);
- for (i2 = 0; i2 < c2; ++i2)
+ if (aCheckMap.containsKey(aInfo.Command))
{
- DispatchInformation aInfo = lInfos[i2];
- if (aInfo.GroupId != nGroup)
- {
- // Error
- fail("At least one DispatchInformation item does not match the requested group.\n\trequested group=[" + nGroup
- + "] returned groupd=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test
- continue;
- }
-
- if (aCheckMap.containsKey(aInfo.Command))
- {
- // Error
- fail("Found a duplicate item: group=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test
- continue;
- }
-
- aCheckMap.put(aInfo.Command, aInfo.Command);
- System.out.println("\t[" + aInfo.GroupId + "] \"" + aInfo.Command + "\"");
+ // Error
+ fail("Found a duplicate item: group=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test
+ continue;
}
+
+ aCheckMap.put(aInfo.Command, aInfo.Command);
+ System.out.println("\t[" + aInfo.GroupId + "] \"" + aInfo.Command + "\"");
}
}
- catch (java.lang.Throwable ex)
- {
- fail("Exception caught during using XDispatchInformationProvider.");
- }
}
private synchronized XFrame impl_createNewFrame()
{
- XFrame xFrame = null;
-
- try
- {
- xFrame = m_xDesktop.findFrame("_blank", 0);
- xFrame.getContainerWindow().setVisible(true);
- }
- catch (java.lang.Throwable ex)
- {
- fail("Could not create the frame instance.");
- }
-
+ XFrame xFrame = m_xDesktop.findFrame("_blank", 0);
+ xFrame.getContainerWindow().setVisible(true);
return xFrame;
}
- private synchronized void impl_closeFrame(XFrame xFrame)
+ private synchronized void impl_closeFrame(XFrame xFrame) throws Exception
{
XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xFrame);
- try
- {
- xClose.close(false);
- }
- catch (com.sun.star.util.CloseVetoException exVeto)
- {
- fail("Test frame couldn't be closed successfully.");
- }
+ xClose.close(false);
}
private XMultiServiceFactory getMSF()
diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
index f556627..fd7fffc 100644
--- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
+++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
@@ -25,7 +25,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
/**
@@ -36,19 +35,12 @@ import static org.junit.Assert.*;
public class GetServiceWhileDisposingOffice
{
- @Test public void checkServiceWhileDisposing()
+ @Test public void checkServiceWhileDisposing() throws Exception
{
XMultiServiceFactory xMSF = getMSF();
XDesktop xDesktop = null;
- try
- {
- xDesktop = UnoRuntime.queryInterface(XDesktop.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
- }
- catch (com.sun.star.uno.Exception e)
- {
- fail("Could not create a desktop instance.");
- }
+ xDesktop = UnoRuntime.queryInterface(XDesktop.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
int step = 0;
try
{
@@ -63,11 +55,6 @@ public class GetServiceWhileDisposingOffice
{
System.out.println("DisposedException in step: " + step);
}
- catch (Exception e)
- {
- fail(e.getMessage());
- }
-
}
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index da3b57a..c41388b 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -114,33 +114,18 @@ public class CheckXComponentLoader
@descr Use either a component loader from desktop or
from frame
*/
- @Before public void before()
+ @Before public void before() throws Exception
{
// get uno service manager from global test environment
/* points to the global uno service manager. */
XMultiServiceFactory xMSF = getMSF();
// create stream provider
- try
- {
- m_xStreamProvider = UnoRuntime.queryInterface(XSimpleFileAccess.class, xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"));
- }
- catch(java.lang.Throwable ex)
- {
- fail("Could not create a stream provider instance.");
- }
+ m_xStreamProvider = UnoRuntime.queryInterface(XSimpleFileAccess.class, xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"));
// create desktop instance
/* provides XComponentLoader interface. */
- XFrame xDesktop = null;
- try
- {
- xDesktop = UnoRuntime.queryInterface(XFrame.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
- }
- catch(java.lang.Throwable ex)
- {
- fail("Could not create the desktop instance.");
- }
+ XFrame xDesktop = UnoRuntime.queryInterface(XFrame.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
// create frame instance
m_xFrame = xDesktop.findFrame("testFrame_componentLoader",
@@ -162,49 +147,37 @@ public class CheckXComponentLoader
m_lTestFiles = new ArrayList<String>();
final String sTestDocURL = OfficeFileUrl.getAbsolute(new File("testdocuments"));
m_sTestDocPath = graphical.FileHelper.getSystemPathFromFileURL(sTestDocURL);
- try
+ File aBaseDir = new File(m_sTestDocPath);
+ List<File> lDirContent = URLHelper.getSystemFilesFromDir(aBaseDir.getPath());
+ Iterator<File> lList = lDirContent.iterator();
+ int nBasePathLength = m_sTestDocPath.length();
+ while(lList.hasNext())
{
- File aBaseDir = new File(m_sTestDocPath);
- List<File> lDirContent = URLHelper.getSystemFilesFromDir(aBaseDir.getPath());
- Iterator<File> lList = lDirContent.iterator();
- int nBasePathLength = m_sTestDocPath.length();
- while(lList.hasNext())
- {
- File aFile = lList.next();
+ File aFile = lList.next();
- // ignore broken links and directories at all
- if (
- (!aFile.exists()) ||
- (!aFile.isFile())
- )
- {
- continue;
- }
+ // ignore broken links and directories at all
+ if (
+ (!aFile.exists()) ||
+ (!aFile.isFile())
+ )
+ {
+ continue;
+ }
- String sCompletePath = aFile.getAbsolutePath();
- String sSubPath = sCompletePath.substring(nBasePathLength);
+ String sCompletePath = aFile.getAbsolutePath();
+ String sSubPath = sCompletePath.substring(nBasePathLength);
- m_lTestFiles.add(sSubPath);
- }
- }
- catch(java.lang.Throwable ex)
- {
- fail("Couldn't find test documents.");
+ m_lTestFiles.add(sSubPath);
}
}
/** @short close the environment.
*/
- @After public void after()
+ @After public void after() throws Exception
{
XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, m_xFrame);
- try
- {
- xClose.close(false);
- }
- catch(com.sun.star.util.CloseVetoException exVeto)
- { fail("Test frame couldn't be closed successfully."); }
+ xClose.close(false);
m_xFrame = null;
m_xLoader = null;
@@ -281,7 +254,7 @@ public class CheckXComponentLoader
String sSourceURL,
String sTargetURL,
String sFilter ,
- String sPassword )
+ String sPassword ) throws Exception
{
PropertyValue[] lLoadProps = new PropertyValue[1];
@@ -304,24 +277,17 @@ public class CheckXComponentLoader
lSaveProps[2].Value = Boolean.TRUE;
XComponent xDoc = null;
- try
- {
- // load it
- xDoc = xLoader.loadComponentFromURL(sSourceURL, "_blank", 0, lLoadProps);
- assertNotNull("Could create office document, which should be saved as temp one.", xDoc);
+ // load it
+ xDoc = xLoader.loadComponentFromURL(sSourceURL, "_blank", 0, lLoadProps);
+ assertNotNull("Could create office document, which should be saved as temp one.", xDoc);
- // save it as temp file
- XStorable xStore = UnoRuntime.queryInterface(XStorable.class, xDoc);
- xStore.storeAsURL(sTargetURL, lSaveProps);
+ // save it as temp file
+ XStorable xStore = UnoRuntime.queryInterface(XStorable.class, xDoc);
+ xStore.storeAsURL(sTargetURL, lSaveProps);
- // Dont forget to close this file. Otherwise the temp file is locked!
- XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc);
- xClose.close(false);
- }
- catch(java.lang.Throwable ex)
- {
- fail("Could not create temp office document.");
- }
+ // Dont forget to close this file. Otherwise the temp file is locked!
+ XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc);
+ xClose.close(false);
}
@@ -331,7 +297,7 @@ public class CheckXComponentLoader
as password for the ftp connection,
or - if none given a default one.
*/
- @Test public void checkLoadingWithPassword()
+ @Test public void checkLoadingWithPassword() throws Exception
{
String sTempFile = impl_getTempFileName(m_sTempPath, SUFFIX_PASSWORD_TEMPFILE, PREFIX_PASSWORD_TEMPFILE);
File aTestFile = new File(sTempFile);
@@ -363,7 +329,7 @@ public class CheckXComponentLoader
* Check URL encoding. The first filename that matches "*.sxw"
* is used as source for several encodings.
*/
- @Test public void checkURLEncoding() {
+ @Test public void checkURLEncoding() throws Exception {
PropertyValue[] lProps = new PropertyValue[1];
lProps[0] = new PropertyValue();
@@ -409,28 +375,23 @@ public class CheckXComponentLoader
};
for (int i = 0; i < sEncoding.length; i = i + 2) {
- try {
- String encURL = new String(baURL, sEncoding[i]);
- System.out.println("ENC[" + sEncoding[i] + "]");
-
- if (sEncoding[i + 1].equals("TRUE")) {
- loadURL(m_xLoader, RESULT_VALID_DOC, encURL, "_blank", 0,
- lProps);
- } else {
- //with cws_loadenv01 changed to IllegalArgumentException
- loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, encURL, "_blank", 0,
- lProps);
- }
- } catch (java.io.UnsupportedEncodingException e) {
- fail("Unsopported Encoding: " + sEncoding[i] +
- "\n Not able to test encoding on this platform.");
+ String encURL = new String(baURL, sEncoding[i]);
+ System.out.println("ENC[" + sEncoding[i] + "]");
+
+ if (sEncoding[i + 1].equals("TRUE")) {
+ loadURL(m_xLoader, RESULT_VALID_DOC, encURL, "_blank", 0,
+ lProps);
+ } else {
+ //with cws_loadenv01 changed to IllegalArgumentException
+ loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, encURL, "_blank", 0,
+ lProps);
}
}
}
/** TODo document me
*/
- @Test public void checkStreamLoading()
+ @Test public void checkStreamLoading() throws Exception
{
PropertyValue[] lProps = new PropertyValue[2];
@@ -447,19 +408,12 @@ public class CheckXComponentLoader
File aFile = new File(m_sTestDocPath, aSnapshot.next());
String sURL = URLHelper.getFileURLFromSystemPath(aFile);
- try
- {
- XInputStream xStream = m_xStreamProvider.openFileRead(sURL);
- lProps[1].Value = xStream;
- }
- catch(com.sun.star.uno.Exception e)
- {
- fail("Could not open test file \""+sURL+"\" for stream test.");
- }
+ XInputStream xStream = m_xStreamProvider.openFileRead(sURL);
+ lProps[1].Value = xStream;
// check different version of "private:stream" URL!
loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream" , "_blank", 0, lProps);
- }
+ }
}
/**
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index a343758..d3aa875 100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -95,7 +95,7 @@ public class PathSettingsTest
* This methods sets the 'aPathSettings' and 'xPropertyInfoOfPathSettings' variables.
*/
@Before
- public void before()
+ public void before() throws Exception
{
try
{
@@ -127,10 +127,6 @@ public class PathSettingsTest
System.out.println(e.getClass().getName());
System.out.println("Message: " + e.getMessage());
}
- catch (Exception e)
- {
- fail("What exception?");
- }
}
private String convertToString(Object o)
diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index d7ea8fa..7b86d15 100644
--- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@ -18,9 +18,20 @@
package complex.reportdesign;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import helper.URLHelper;
+
import java.io.File;
import java.util.ArrayList;
+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 com.sun.star.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XNameAccess;
@@ -28,28 +39,21 @@ import com.sun.star.frame.XComponentLoader;
import com.sun.star.frame.XDesktop;
import com.sun.star.frame.XModel;
import com.sun.star.frame.XStorable;
+import com.sun.star.io.IOException;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sdb.XDocumentDataSource;
import com.sun.star.sdb.XOfficeDatabaseDocument;
import com.sun.star.sdb.XReportDocumentsSupplier;
import com.sun.star.sdb.application.XDatabaseDocumentUI;
+import com.sun.star.uno.RuntimeException;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
+import com.sun.star.util.CloseVetoException;
import com.sun.star.util.XCloseable;
-import helper.URLHelper;
-
import convwatch.DB;
-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.*;
-
class PropertySetHelper
{
XPropertySet m_xPropertySet;
@@ -137,22 +141,14 @@ public class ReportDesignerTest
}
private XDesktop m_xDesktop = null;
- public XDesktop getXDesktop()
+ public XDesktop getXDesktop() throws com.sun.star.uno.Exception
{
if (m_xDesktop == null)
{
- try
- {
XInterface xInterface = (XInterface) getMSF().createInstance( "com.sun.star.frame.Desktop" );
m_xDesktop = UnoRuntime.queryInterface(XDesktop.class, xInterface);
assertNotNull("Can't get XDesktop", m_xDesktop);
- }
- catch (com.sun.star.uno.Exception e)
- {
- System.out.println("ERROR: uno.Exception caught");
- System.out.println("Message: " + e.getMessage());
- }
}
return m_xDesktop;
}
@@ -177,7 +173,7 @@ public class ReportDesignerTest
private static final int WRITER = 1;
private static final int CALC = 2;
- @Test public void firsttest()
+ @Test public void firsttest() throws Exception
{
// -------------------- preconditions, try to find an office --------------------
@@ -206,7 +202,7 @@ public class ReportDesignerTest
}
- private void startTestForFile(String _sDocument, int _nType)
+ private void startTestForFile(String _sDocument, int _nType) throws Exception
{
FileURL aFileURL = new FileURL(_sDocument);
assertTrue("Test File doesn't '" + _sDocument + "'exist.", aFileURL.exists());
@@ -219,55 +215,48 @@ public class ReportDesignerTest
assertNotNull("Can't load document ", xDocComponent);
- try
- {
- XInterface x = (XInterface)getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
- assertNotNull("can't create instance of com.sun.star.sdb.DatabaseContext", x);
- System.out.println("createInstance com.sun.star.sdb.DatabaseContext done");
+ XInterface x = (XInterface)getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
+ assertNotNull("can't create instance of com.sun.star.sdb.DatabaseContext", x);
+ System.out.println("createInstance com.sun.star.sdb.DatabaseContext done");
- XNameAccess xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, x);
- showElements(xNameAccess);
- Object aObj = xNameAccess.getByName(sFileURL);
+ XNameAccess xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, x);
+ showElements(xNameAccess);
+ Object aObj = xNameAccess.getByName(sFileURL);
- XDocumentDataSource xDataSource = UnoRuntime.queryInterface(XDocumentDataSource.class, aObj);
- XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument();
+ XDocumentDataSource xDataSource = UnoRuntime.queryInterface(XDocumentDataSource.class, aObj);
+ XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument();
- assertNotNull("can't access DatabaseDocument", xOfficeDBDoc);
+ assertNotNull("can't access DatabaseDocument", xOfficeDBDoc);
- XModel xDBSource = UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
- Object aController = xDBSource.getCurrentController();
- assertNotNull("Controller of xOfficeDatabaseDocument is empty!", aController);
+ XModel xDBSource = UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
+ Object aController = xDBSource.getCurrentController();
+ assertNotNull("Controller of xOfficeDatabaseDocument is empty!", aController);
- XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
- /* boolean isConnect = */
-// TODO: throws an exception in DEV300m78
- aDBDocUI.connect();
- Object aActiveConnectionObj = aDBDocUI.getActiveConnection();
- assertNotNull("ActiveConnection is empty", aActiveConnectionObj);
+ XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
+ /* boolean isConnect = */
+ // TODO: throws an exception in DEV300m78
+ aDBDocUI.connect();
+ Object aActiveConnectionObj = aDBDocUI.getActiveConnection();
+ assertNotNull("ActiveConnection is empty", aActiveConnectionObj);
- XReportDocumentsSupplier xSupplier = UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
- xNameAccess = xSupplier.getReportDocuments();
- assertNotNull("xOfficeDatabaseDocument returns no Report Document", xNameAccess);
+ XReportDocumentsSupplier xSupplier = UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
+ xNameAccess = xSupplier.getReportDocuments();
+ assertNotNull("xOfficeDatabaseDocument returns no Report Document", xNameAccess);
- showElements(xNameAccess);
+ showElements(xNameAccess);
- ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
+ ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
- PropertyValue aActiveConnection = new PropertyValue();
- aActiveConnection.Name = "ActiveConnection";
- aActiveConnection.Value = aActiveConnectionObj;
- aPropertyList.add(aActiveConnection);
+ PropertyValue aActiveConnection = new PropertyValue();
+ aActiveConnection.Name = "ActiveConnection";
+ aActiveConnection.Value = aActiveConnectionObj;
+ aPropertyList.add(aActiveConnection);
- loadAndStoreReports(xNameAccess, aPropertyList, _nType);
- createDBEntry();
- }
- catch(com.sun.star.uno.Exception e)
- {
- fail("ERROR: Exception caught" + e.getMessage());
- }
+ loadAndStoreReports(xNameAccess, aPropertyList, _nType);
+ createDBEntry();
- // Close the document
- closeComponent(xDocComponent);
+ // Close the document
+ closeComponent(xDocComponent);
}
private String getDocumentPoolName(int _nType)
@@ -295,7 +284,7 @@ public class ReportDesignerTest
// sSpecial);
}
- private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList<PropertyValue> _aPropertyList, int _nType)
+ private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList<PropertyValue> _aPropertyList, int _nType) throws Exception
{
if (_xNameAccess != null)
{
@@ -365,7 +354,7 @@ public class ReportDesignerTest
/*
store given _xComponent under the given Name in DOC_COMPARATOR_INPUTPATH
*/
- private void storeComponent(String _sName, Object _xComponent, int _nType)
+ private void storeComponent(String _sName, Object _xComponent, int _nType) throws Exception
{
String sOutputPath = getOutputPath();
@@ -398,59 +387,26 @@ public class ReportDesignerTest
if (aStorable != null)
{
System.out.println("store document as URL: '" + sOutputURL + "'");
- try
- {
- aStorable.storeAsURL(sOutputURL, PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList));
- }
- catch (com.sun.star.io.IOException e)
- {
- System.out.println("ERROR: Exception caught");
- System.out.println("Can't write document URL: '" + sOutputURL + "'");
- System.out.println("Message: " + e.getMessage());
- }
+ aStorable.storeAsURL(sOutputURL, PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList));
}
}
- private XComponent loadComponent(String _sName, Object _xComponent, ArrayList<PropertyValue> _aPropertyList)
+ private XComponent loadComponent(String _sName, Object _xComponent, ArrayList<PropertyValue> _aPropertyList) throws RuntimeException, IOException
{
XComponent xDocComponent = null;
XComponentLoader xComponentLoader = UnoRuntime.queryInterface(XComponentLoader.class, _xComponent);
- try
- {
- PropertyValue[] aLoadProperties = PropertyHelper.createPropertyValueArrayFormArrayList(_aPropertyList);
- System.out.println("Load component: '" + _sName + "'");
- xDocComponent = xComponentLoader.loadComponentFromURL(_sName, "_blank", 0, aLoadProperties);
- }
- catch (com.sun.star.io.IOException e)
- {
- System.out.println("ERROR: Exception caught");
- System.out.println("Can't load document '" + _sName + "'");
- System.out.println("Message: " + e.getMessage());
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- System.out.println("ERROR: Exception caught");
- System.out.println("Illegal Arguments given to loadComponentFromURL.");
- System.out.println("Message: " + e.getMessage());
- }
+ PropertyValue[] aLoadProperties = PropertyHelper.createPropertyValueArrayFormArrayList(_aPropertyList);
+ System.out.println("Load component: '" + _sName + "'");
+ xDocComponent = xComponentLoader.loadComponentFromURL(_sName, "_blank", 0, aLoadProperties);
return xDocComponent;
}
- private void closeComponent(XComponent _xDoc)
+ private void closeComponent(XComponent _xDoc) throws CloseVetoException
{
// Close the document
XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, _xDoc);
- try
- {
- xCloseable.close(true);
- }
- catch (com.sun.star.util.CloseVetoException e)
- {
- System.out.println("ERROR: CloseVetoException caught");
- System.out.println("CloseVetoException occurred. Can't close document.");
- System.out.println("Message: " + e.getMessage());
- }
+ xCloseable.close(true);
}
diff --git a/toolkit/qa/complex/toolkit/UnitConversion.java b/toolkit/qa/complex/toolkit/UnitConversion.java
index 430bd7e..cfe2662 100644
--- a/toolkit/qa/complex/toolkit/UnitConversion.java
+++ b/toolkit/qa/complex/toolkit/UnitConversion.java
@@ -74,18 +74,11 @@ public class UnitConversion
*/
private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit, String _sEinheit)
{
- try
- {
- com.sun.star.awt.Size aSizeIn = m_xConversion.convertSizeToLogic(_aSize, _aMeasureUnit);
- System.out.println("Window size:");
- System.out.println("Width:" + aSizeIn.Width + " " + _sEinheit);
- System.out.println("Height:" + aSizeIn.Height + " " + _sEinheit);
- System.out.println("");
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- System.out.println("Caught IllegalArgumentException in convertSizeToLogic with '" + _sEinheit + "' " + e.getMessage());
- }
+ com.sun.star.awt.Size aSizeIn = m_xConversion.convertSizeToLogic(_aSize, _aMeasureUnit);
+ System.out.println("Window size:");
+ System.out.println("Width:" + aSizeIn.Width + " " + _sEinheit);
+ System.out.println("Height:" + aSizeIn.Height + " " + _sEinheit);
+ System.out.println("");
}
/**
@@ -139,77 +132,56 @@ public class UnitConversion
m_xConversion = UnoRuntime.queryInterface(XUnitConversion.class, xWindowPeer);
// try to get the position of the window in 1/100mm with the XUnitConversion method
- try
- {
- com.sun.star.awt.Point aPointInMM_100TH = m_xConversion.convertPointToLogic(aPoint, com.sun.star.util.MeasureUnit.MM_100TH);
- System.out.println("Window position:");
- System.out.println("X:" + aPointInMM_100TH.X + " 1/100mm");
- System.out.println("Y:" + aPointInMM_100TH.Y + " 1/100mm");
- System.out.println("");
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- fail("failed: IllegalArgumentException caught in convertPointToLogic " + e.getMessage());
- }
+ com.sun.star.awt.Point aPointInMM_100TH = m_xConversion.convertPointToLogic(aPoint, com.sun.star.util.MeasureUnit.MM_100TH);
+ System.out.println("Window position:");
+ System.out.println("X:" + aPointInMM_100TH.X + " 1/100mm");
+ System.out.println("Y:" + aPointInMM_100TH.Y + " 1/100mm");
+ System.out.println("");
// try to get the size of the window in 1/100mm with the XUnitConversion method
com.sun.star.awt.Size aSizeInMM_100TH = null;
com.sun.star.awt.Size aSizeInMM_10TH = null;
- try
- {
- aSizeInMM_100TH = m_xConversion.convertSizeToLogic(aSize, com.sun.star.util.MeasureUnit.MM_100TH);
- System.out.println("Window size:");
- System.out.println("Width:" + aSizeInMM_100TH.Width + " 1/100mm");
- System.out.println("Height:" + aSizeInMM_100TH.Height + " 1/100mm");
- System.out.println("");
-
- // try to get the size of the window in 1/10mm with the XUnitConversion method
-
- aSizeInMM_10TH = m_xConversion.convertSizeToLogic(aSize, com.sun.star.util.MeasureUnit.MM_10TH);
- System.out.println("Window size:");
- System.out.println("Width:" + aSizeInMM_10TH.Width + " 1/10mm");
- System.out.println("Height:" + aSizeInMM_10TH.Height + " 1/10mm");
- System.out.println("");
-
- // check the size with a delta which must be smaller a given difference
- assertTrue("Size.Width not correct", delta(aSizeInMM_100TH.Width, aSizeInMM_10TH.Width * 10) < 10);
- assertTrue("Size.Height not correct", delta(aSizeInMM_100TH.Height, aSizeInMM_10TH.Height * 10) < 10);
-
- // new
- checkSize(aSize, com.sun.star.util.MeasureUnit.PIXEL, "pixel");
- checkSize(aSize, com.sun.star.util.MeasureUnit.APPFONT, "appfont");
- checkSize(aSize, com.sun.star.util.MeasureUnit.SYSFONT, "sysfont");
-
- // simply check some more parameters
- checkSize(aSize, com.sun.star.util.MeasureUnit.MM, "mm");
- checkSize(aSize, com.sun.star.util.MeasureUnit.CM, "cm");
- checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_1000TH, "1/1000inch");
- checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_100TH, "1/100inch");
- checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_10TH, "1/10inch");
- checkSize(aSize, com.sun.star.util.MeasureUnit.INCH, "inch");
- checkSize(aSize, com.sun.star.util.MeasureUnit.POINT, "point");
- checkSize(aSize, com.sun.star.util.MeasureUnit.TWIP, "twip");
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- fail("failed: IllegalArgumentException caught in convertSizeToLogic " + e.getMessage());
- }
+ aSizeInMM_100TH = m_xConversion.convertSizeToLogic(aSize, com.sun.star.util.MeasureUnit.MM_100TH);
+ System.out.println("Window size:");
+ System.out.println("Width:" + aSizeInMM_100TH.Width + " 1/100mm");
+ System.out.println("Height:" + aSizeInMM_100TH.Height + " 1/100mm");
+ System.out.println("");
+
+ // try to get the size of the window in 1/10mm with the XUnitConversion method
+
+ aSizeInMM_10TH = m_xConversion.convertSizeToLogic(aSize, com.sun.star.util.MeasureUnit.MM_10TH);
+ System.out.println("Window size:");
+ System.out.println("Width:" + aSizeInMM_10TH.Width + " 1/10mm");
+ System.out.println("Height:" + aSizeInMM_10TH.Height + " 1/10mm");
+ System.out.println("");
+
+ // check the size with a delta which must be smaller a given difference
+ assertTrue("Size.Width not correct", delta(aSizeInMM_100TH.Width, aSizeInMM_10TH.Width * 10) < 10);
+ assertTrue("Size.Height not correct", delta(aSizeInMM_100TH.Height, aSizeInMM_10TH.Height * 10) < 10);
+
+ // new
+ checkSize(aSize, com.sun.star.util.MeasureUnit.PIXEL, "pixel");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.APPFONT, "appfont");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.SYSFONT, "sysfont");
+
+ // simply check some more parameters
+ checkSize(aSize, com.sun.star.util.MeasureUnit.MM, "mm");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.CM, "cm");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_1000TH, "1/1000inch");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_100TH, "1/100inch");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_10TH, "1/10inch");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.INCH, "inch");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.POINT, "point");
+ checkSize(aSize, com.sun.star.util.MeasureUnit.TWIP, "twip");
// convert the 1/100mm window size back to pixel
- try
- {
- com.sun.star.awt.Size aNewSize = m_xConversion.convertSizeToPixel(aSizeInMM_100TH, com.sun.star.util.MeasureUnit.MM_100TH);
- System.out.println("Window size:");
- System.out.println("Width:" + aNewSize.Width + " pixel");
- System.out.println("Height:" + aNewSize.Height + " pixel");
-
- // assure the pixels are the same as we already know
- assertTrue("failed: Size from pixel to 1/100mm to pixel", aSize.Width == aNewSize.Width && aSize.Height == aNewSize.Height);
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- fail("failed: IllegalArgumentException caught in convertSizeToPixel " + e.getMessage());
- }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list