Skip to content

C
core
Kaydet (Commit) 275f0c7b authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

Let JUnit take care of exceptions 

Inspired by commit
4dd0ac62

Change-Id: I6ca29aecde357a3cb5852acfc9b5443761052960
Reviewed-on: https://gerrit.libreoffice.org/16094Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 9eb1bfcb
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 532 deletions
dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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()
{
try
protected void createTestCase() throws Exception
{
m_database = new CRMDatabase( getMSF(), false );
}
catch ( Exception e )
{
e.printStackTrace( System.err );
fail( "caught an exception (" + e.getMessage() + ") while creating the test case");
}
}
@Before
@Override
public void before()
public void before() throws Exception
{
createTestCase();
}
......@@ -57,20 +45,13 @@ public abstract class CRMBasedTestCase extends TestCase
@After
@Override
public void after()
{
try
public void after() throws Exception
{
if ( m_database != null )
{
m_database.saveAndClose();
}
}
catch ( Exception ex )
{
Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, null, ex );
}
}
/** creates a SingleSelectQueryComposer for our connection
......
dbaccess/qa/complex/dbaccess/CopyTableWizard.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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,20 +64,13 @@ public class CopyTableWizard extends CRMBasedTestCase
@Before
@Override
public void before()
{
try
public void before() throws Exception
{
createTestCase();
source = new DatabaseApplication(m_database.getDatabase());
destinationDB = new DbaseDatabase( getMSF() );
dest = new DatabaseApplication( destinationDB );
}
catch (java.lang.Exception ex)
{
fail("");
}
}
private class CopyThread implements Runnable
......
dbaccess/qa/complex/dbaccess/DataSource.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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,9 +36,7 @@ public class DataSource extends TestCase
connectivity.tools.DataSource m_dataSource;
private void createTestCase()
{
try
private void createTestCase() throws Exception
{
if (m_database == null)
{
......@@ -48,21 +45,10 @@ public class DataSource extends TestCase
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());
}
}
@Test
public void testRegistrationName()
{
try
public void testRegistrationName() throws Exception
{
createTestCase();
// 1. check the existing "Bibliography" data source whether it has the proper name
......@@ -79,9 +65,4 @@ public class DataSource extends TestCase
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();
}
}
}
dbaccess/qa/complex/dbaccess/Parser.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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,19 +35,11 @@ public class Parser extends CRMBasedTestCase
{
@Override
protected void createTestCase()
{
try
protected void createTestCase() throws Exception
{
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");
}
}
@Test
......
dbaccess/qa/complex/dbaccess/PropertyBag.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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,8 +115,6 @@ 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);
......@@ -124,11 +122,6 @@ public class PropertyBag extends TestCase
{
fail("set property is not remembered");
}
}
catch(com.sun.star.uno.Exception e)
{
fail( "setting or getting a property value failed" );
}
// try setting an illegal value for the property
caughtExpected = false;
......
dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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()
{
try
protected void createTestCase() throws Exception
{
super.createTestCase();
createQueries();
m_composer = createQueryComposer();
}
catch (Exception e)
{
fail("caught an exception (" + e.getMessage() + ") while creating the test case");
}
}
......@@ -120,12 +115,10 @@ 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));
......@@ -138,21 +131,14 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
m_composer.setCommand(sql, CommandType.COMMAND);
assertTrue("setCommand/getQuery COMMAND inconsistent", m_composer.getQuery().equals(sql));
}
catch (Exception e)
{
fail("Exception caught: " + e);
}
}
/** 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'";
......@@ -202,11 +188,6 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
m_composer.setStructuredHavingClause(aStructuredHaving);
assertTrue("Structured Having Clause not identical", m_composer.getHavingClause().equals(COMPLEXFILTER));
}
catch (Exception e)
{
fail("Exception caught: " + e);
}
}
/** test various sub query related features ("queries in queries")
*/
......@@ -228,9 +209,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
/** tests the XParametersSupplier functionality
*/
@Test
public void testParameters()
{
try
public void testParameters() throws Exception
{
// "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");
......@@ -262,16 +241,9 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
}
}
catch (Exception e)
{
fail("caught an exception: " + e);
}
}
@Test
public void testConditionByColumn()
{
try
public void testConditionByColumn() throws Exception
{
m_composer.setQuery("SELECT * FROM \"customers\"");
......@@ -291,26 +263,11 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
m_composer.appendFilterByColumn(column, true, SQLFilterOperator.LIKE);
assertTrue("At least one row should exist", m_database.getConnection().createStatement().executeQuery(m_composer.getQuery()).next());
}
catch (Exception e)
{
// this is an error: the query is expected to be parseable
fail("caught an exception: " + e);
}
}
private void impl_testDisjunctiveNormalForm(String _query, PropertyValue[][] _expectedDNF)
{
try
private void impl_testDisjunctiveNormalForm(String _query, PropertyValue[][] _expectedDNF) throws SQLException
{
m_composer.setQuery(_query);
}
catch (Exception e)
{
// this is an error: the query is expected to be parseable
fail("caught an exception: " + e);
}
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 =
......
filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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");
}
boolean mandantoryTrue = false;
boolean mandantoryFalse = false;
......@@ -157,8 +149,6 @@ public class FinalizedMandatoryTest
for (int i = 0; i < filterNames.length; i++)
{
System.out.println("------------------------------------------------");
try
{
filterName = filterNames[i];
System.out.println(filterName);
......@@ -168,14 +158,7 @@ public class FinalizedMandatoryTest
// 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);
......@@ -201,14 +184,7 @@ public class FinalizedMandatoryTest
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.
......@@ -228,14 +204,7 @@ public class FinalizedMandatoryTest
// 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;
......@@ -250,16 +219,6 @@ public class FinalizedMandatoryTest
}
assertTrue("Expected exception was not thorwn while flushing removed filter '" + filterName + "' Mandatory:" + isMandatory,
!(flushError ^ isMandatory));
}
catch (NoSuchElementException e)
{
fail("Couldn't get elements from object");
}
catch (WrappedTargetException e)
{
fail("Couldn't get elements from object");
}
}
String preMsg = "Could not find filter with state ";
String postMsg = " Please check if such filter is installed!";
......
filter/qa/complex/filter/misc/TypeDetection6FileFormat.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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");
}
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"));
}
/**
......
forms/qa/complex/forms/CheckOGroupBoxModel.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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.");
}
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! */
}
}
}
@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
assertTrue("Listener was not called.", ml.wasListenerCalled());
m_xPropSet.removePropertiesChangeListener(ml);
......
framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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,26 +97,16 @@ 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.");
}
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);
......@@ -197,17 +186,8 @@ public class CheckContextMenuInterceptor
xContextMenuInterceptor);
}
}
catch (com.sun.star.uno.RuntimeException ex)
{
fail("Runtime exception caught!" + ex.getMessage());
}
catch (java.lang.Exception ex)
{
fail("Java lang exception caught!" + ex.getMessage());
}
}
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");
}
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,17 +240,9 @@ 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");
}
}
private void openContextMenu(XModel aModel)
{
......
framework/qa/complex/dispatches/checkdispatchapi.java
Dosyayı görüntüle @ 275f0c7b
......@@ -68,9 +68,7 @@ public class checkdispatchapi
@descr create an empty test frame, where we can load
different components inside.
*/
@Before public void before()
{
try
@Before public void before() throws Exception
{
// get uno service manager from global test environment
m_xMSF = getMSF();
......@@ -82,16 +80,11 @@ public class checkdispatchapi
m_xFrame = impl_createNewFrame();
}
catch (java.lang.Throwable ex)
{
fail("Can't initialize test environment.");
}
}
/** @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,8 +329,6 @@ public class checkdispatchapi
return;
}
try
{
short[] lGroups = xInfoProvider.getSupportedCommandGroups();
int c1 = lGroups.length;
int i1 = 0;
......@@ -388,43 +371,21 @@ public class checkdispatchapi
}
}
}
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 xFrame = m_xDesktop.findFrame("_blank", 0);
xFrame.getContainerWindow().setVisible(true);
}
catch (java.lang.Throwable ex)
{
fail("Could not create the frame instance.");
}
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.");
}
}
private XMultiServiceFactory getMSF()
{
......
framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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.");
}
int step = 0;
try
{
......@@ -63,11 +55,6 @@ public class GetServiceWhileDisposingOffice
{
System.out.println("DisposedException in step: " + step);
}
catch (Exception e)
{
fail(e.getMessage());
}
}
......
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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.");
}
// 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,8 +147,6 @@ 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();
......@@ -187,24 +170,14 @@ public class CheckXComponentLoader
m_lTestFiles.add(sSubPath);
}
}
catch(java.lang.Throwable ex)
{
fail("Couldn't find test documents.");
}
}
/** @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."); }
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,8 +277,6 @@ 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);
......@@ -318,11 +289,6 @@ public class CheckXComponentLoader
XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc);
xClose.close(false);
}
catch(java.lang.Throwable ex)
{
fail("Could not create temp office document.");
}
}
/** @short Check the password handling.
......@@ -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,7 +375,6 @@ 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] + "]");
......@@ -421,16 +386,12 @@ public class CheckXComponentLoader
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.");
}
}
}
/** TODo document me
*/
@Test public void checkStreamLoading()
@Test public void checkStreamLoading() throws Exception
{
PropertyValue[] lProps = new PropertyValue[2];
......@@ -447,15 +408,8 @@ 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.");
}
// check different version of "private:stream" URL!
loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream" , "_blank", 0, lProps);
......
framework/qa/complex/path_settings/PathSettingsTest.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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)
......
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
Dosyayı görüntüle @ 275f0c7b
......@@ -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,23 +141,15 @@ 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,8 +215,6 @@ 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");
......@@ -240,7 +234,7 @@ public class ReportDesignerTest
XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
/* boolean isConnect = */
// TODO: throws an exception in DEV300m78
// TODO: throws an exception in DEV300m78
aDBDocUI.connect();
Object aActiveConnectionObj = aDBDocUI.getActiveConnection();
assertNotNull("ActiveConnection is empty", aActiveConnectionObj);
......@@ -260,11 +254,6 @@ public class ReportDesignerTest
loadAndStoreReports(xNameAccess, aPropertyList, _nType);
createDBEntry();
}
catch(com.sun.star.uno.Exception e)
{
fail("ERROR: Exception caught" + e.getMessage());
}
// Close the document
closeComponent(xDocComponent);
......@@ -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,60 +387,27 @@ 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());
}
}
}
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());
}
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());
}
}
private XMultiServiceFactory getMSF()
......
toolkit/qa/complex/toolkit/UnitConversion.java
Dosyayı görüntüle @ 275f0c7b
......@@ -73,8 +73,6 @@ public class UnitConversion
* @param _sEinheit
*/
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:");
......@@ -82,11 +80,6 @@ public class UnitConversion
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());
}
}
/**
* The real test function
......@@ -139,24 +132,15 @@ 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());
}
// 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");
......@@ -189,15 +173,8 @@ public class UnitConversion
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());
}
// 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");
......@@ -205,11 +182,6 @@ public class UnitConversion
// 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());
}
// close the window.
// IMHO a little bit stupid, but the XWindow doesn't support a XCloseable interface
......
vcl/qa/complex/memCheck/CheckMemoryUsage.java
Dosyayı görüntüle @ 275f0c7b
......@@ -163,7 +163,7 @@ public class CheckMemoryUsage
* for each given document type.
*/
@Test
public void loadAndSaveDocuments()
public void loadAndSaveDocuments() throws Exception
{
int nOk = 0;
int nRunThrough = 0;
......@@ -248,7 +248,7 @@ public class CheckMemoryUsage
/**
* load and save exact one document
*/
private void loadAndSaveNTimesDocument(String _sDocument, int _nCount, String _sStoreExtension)
private void loadAndSaveNTimesDocument(String _sDocument, int _nCount, String _sStoreExtension) throws Exception
{
System.out.println("Document: " + _sDocument);
XComponent xComponent = DesktopTools.loadDoc(getMSF(), _sDocument, null);
......@@ -277,16 +277,8 @@ public class CheckMemoryUsage
}
// close the doc
XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, xStorable);
try
{
xCloseable.close(true);
}
catch (com.sun.star.util.CloseVetoException e)
{
e.printStackTrace();
fail("Cannot close document: test is futile, Office will surely use more space.");
}
}
else
{
System.out.println("Cannot query for XStorable interface on document '" + _sDocument + "'");
......
vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
Dosyayı görüntüle @ 275f0c7b
......@@ -282,37 +282,15 @@ public class PersistentWindowTest
return docHandle;
}
private boolean connect()
{
try
private boolean connect() throws Exception
{
connection.setUp();
}
catch (InterruptedException e)
{
fail("can't connect.");
}
catch (Exception e)
{
fail("can't connect.");
}
return true;
}
private boolean disconnect()
{
try
private boolean disconnect() throws Exception
{
connection.tearDown();
}
catch (InterruptedException e)
{
fail("can't disconnect.");
}
catch (Exception e)
{
fail("can't disconnect.");
}
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment