remove some unnecessary exception wrapping in the Java tests

Modify createTestEnvironment so that it throws Exception. This
is appropriate for unit testing.
The wrapping adds no value and the calling method already has
a catch(Exception) to handle anything.

Change-Id: I430a414f63d2cbfc3b65ecfde0285509265e5192

4 files changed, 15 insertions, 40 deletions

diff --git a/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java b/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java
index 465199414397..b24ca70e77d1 100644
--- a/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java
+++ b/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java
@@ -20,7 +20,6 @@ package mod._ucb;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -41,19 +40,14 @@ public class UcbContentProviderProxyFactory extends TestCase {
     */
     @Override
     public TestEnvironment createTestEnvironment
-            (TestParameters Param,PrintWriter log ) {
+            (TestParameters Param,PrintWriter log ) throws Exception {
 
         XInterface oObj = null;
         Object oInterface = null;
 
-        try {
-            XMultiServiceFactory xMSF = Param.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" );
-        } catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
+        XMultiServiceFactory xMSF = Param.getMSF();
+        oInterface = xMSF.createInstance
+            ( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" );
 
         oObj = (XInterface) oInterface;
 
diff --git a/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java b/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java
index 4f518b1c3cca..5f04e3864728 100644
--- a/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java
+++ b/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java
@@ -20,7 +20,6 @@ package mod._ucb;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -32,19 +31,14 @@ public class UcbPropertiesManager extends TestCase {
 
     @Override
     public TestEnvironment createTestEnvironment
-            ( TestParameters Param, PrintWriter log ) {
+            ( TestParameters Param, PrintWriter log ) throws Exception {
 
         XInterface oObj = null;
         Object oInterface = null;
 
-        try {
-            XMultiServiceFactory xMSF = Param.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.comp.ucb.UcbPropertiesManager" );
-        } catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
+        XMultiServiceFactory xMSF = Param.getMSF();
+        oInterface = xMSF.createInstance
+            ( "com.sun.star.comp.ucb.UcbPropertiesManager" );
 
         oObj = (XInterface) oInterface;
 
diff --git a/qadevOOo/tests/java/mod/_ucb/UcbStore.java b/qadevOOo/tests/java/mod/_ucb/UcbStore.java
index 35a8ac9e5643..784210db5c3a 100644
--- a/qadevOOo/tests/java/mod/_ucb/UcbStore.java
+++ b/qadevOOo/tests/java/mod/_ucb/UcbStore.java
@@ -20,7 +20,6 @@ package mod._ucb;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -42,18 +41,12 @@ public class UcbStore extends TestCase {
     @Override
     public TestEnvironment createTestEnvironment( TestParameters Param,
                                                   PrintWriter log )
-                                                    throws StatusException {
+                                                    throws Exception {
         XInterface oObj = null;
         Object oInterface = null;
 
-        try {
-            XMultiServiceFactory xMSF = Param.getMSF();
-            oInterface = xMSF.createInstance( "com.sun.star.comp.ucb.UcbStore" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
+        XMultiServiceFactory xMSF = Param.getMSF();
+        oInterface = xMSF.createInstance( "com.sun.star.comp.ucb.UcbStore" );
 
         oObj = (XInterface) oInterface;
 
diff --git a/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java b/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java
index 5272ec325754..17f4155691ad 100644
--- a/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java
+++ b/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java
@@ -20,7 +20,6 @@ package mod._ucb;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -43,19 +42,14 @@ public class UniversalContentBroker extends TestCase {
     */
     @Override
     public TestEnvironment createTestEnvironment
-            ( TestParameters Param, PrintWriter log ) {
+            ( TestParameters Param, PrintWriter log ) throws Exception {
 
         XInterface oObj = null;
         Object oInterface = null;
 
-        try {
-            XMultiServiceFactory xMSF = Param.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.comp.ucb.UniversalContentBroker" );
-        } catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
+        XMultiServiceFactory xMSF = Param.getMSF();
+        oInterface = xMSF.createInstance
+            ( "com.sun.star.comp.ucb.UniversalContentBroker" );
 
         oObj = (XInterface) oInterface;