summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-11 15:58:09 +0200
committerNoel Grandin <noel@peralex.com>2014-08-14 10:59:48 +0200
commitac5954d7c540f34702033d7d951d1d16cb96730a (patch)
tree310ba9698a10c74662de0714db683f932de32b0c /framework
parent89c0a2b2f65beeb6f42d3334662100a13169a8d6 (diff)
java: remove commented out code
Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1
Diffstat (limited to 'framework')
-rw-r--r--framework/qa/complex/XUserInputInterception/EventTest.java22
-rw-r--r--framework/qa/complex/api_internal/CheckAPI.java1
-rw-r--r--framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java2
-rw-r--r--framework/qa/complex/desktop/DesktopTerminate.java1
-rw-r--r--framework/qa/complex/dispatches/checkdispatchapi.java1
-rw-r--r--framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java1
-rw-r--r--framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java24
-rw-r--r--framework/qa/complex/path_settings/PathSettingsTest.java1
8 files changed, 9 insertions, 44 deletions
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index b7e5fe304bfa..f7e0f546a620 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -166,28 +166,6 @@ public class EventTest {
}
/**
- * creates a chart document and check the <CODE>XMouseClickHandler</CODE> and
- * <CODE>XKeyHandler</CODE>
- * @see com.sun.star.awt.XKeyHandler
- * @see com.sun.star.awt.XMouseClickHandler
- */
-// TODO!
-// @Test public void checkChartDocument(){
-//
-// XChartDocument xDoc = null;
-//
-// try{
-// xDoc = m_SOF.createChartDoc("ChartTest");
-// } catch (com.sun.star.uno.Exception e){
-// fail("Could not create a chart document: " +e.toString());
-// }
-//
-// checkListener(xDoc);
-//
-// closeDoc(xDoc);
-// }
-
- /**
* creates a math document and check the <CODE>XMouseClickHandler</CODE> and
* <CODE>XKeyHandler</CODE>
* @see com.sun.star.awt.XKeyHandler
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index ce73df14cea4..c2a5f5f95476 100644
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -67,7 +67,6 @@ public class CheckAPI {
@Test public void checkAPI() {
System.out.println("Start with test");
// if test is idle for 5 minutes, assume that it hangs and kill it.
- // param.put("TimeOut", new Integer("300000"));
XMultiServiceFactory xMSF = getMSF();
Object oObj = null;
try {
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 59d8abc6b58d..2f96fe716191 100644
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -199,12 +199,10 @@ public class CheckContextMenuInterceptor
}
catch (com.sun.star.uno.RuntimeException ex)
{
- // ex.printStackTrace();
fail("Runtime exception caught!" + ex.getMessage());
}
catch (java.lang.Exception ex)
{
- // ex.printStackTrace();
fail("Java lang exception caught!" + ex.getMessage());
}
}
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index dc75566355b9..f11923312d27 100644
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -150,7 +150,6 @@ public class DesktopTerminate
{
System.out.println("tearDownConnection()");
// don't do a tearDown here, desktop is already terminated.
- // connection.tearDown();
}
private static final OfficeConnection connection = new OfficeConnection();
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index 32f91388ceec..62d43e2bea0a 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -398,7 +398,6 @@ public class checkdispatchapi
catch (java.lang.Throwable ex)
{
fail("Exception caught during using XDispatchInformationProvider.");
- // ex.printStackTrace();
}
}
diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
index 031dfd5d4469..8600c0248e31 100644
--- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
+++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
@@ -90,7 +90,6 @@ public class GetServiceWhileDisposingOffice
{
System.out.println("tearDownConnection()");
// Office is already terminated.
- // connection.tearDown();
}
private static final OfficeConnection connection = new OfficeConnection();
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index 955fa0b1dd38..622f33588abc 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -241,22 +241,16 @@ public class CheckXComponentLoader
File aSysFile = new File(m_sTestDocPath, aSnapshot.next());
String sURL = URLHelper.getFileURLFromSystemPath(aSysFile);
- if (/*! (sURL.endsWith(".jpg") ||
- sURL.endsWith(".gif"))*/
- true
- )
+ loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps);
+ // Its not needed to reset this using states!
+ // Its done internally ...
+ if (!xIndicator.wasUsed())
{
- loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps);
- // Its not needed to reset this using states!
- // Its done internally ...
- if (!xIndicator.wasUsed())
- {
- System.out.println("External progress was not used for loading.");
- }
- if (xHandler.wasUsed())
- {
- System.out.println("External interaction handler was not used for loading.");
- }
+ System.out.println("External progress was not used for loading.");
+ }
+ if (xHandler.wasUsed())
+ {
+ System.out.println("External interaction handler was not used for loading.");
}
}
}
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 1e1bc5f4c4b3..995d43084f3f 100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -126,7 +126,6 @@ public class PathSettingsTest
{
System.out.println(e.getClass().getName());
System.out.println("Message: " + e.getMessage());
- // fail("Could not create an instance of the test object.");
}
catch (Exception e)
{