summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-11-08 16:01:31 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-11-08 16:01:31 +0100
commita71df3417c7e7e14fc9b1d802e75ebdffa6bab27 (patch)
tree027f4df8d9cb9aa33efd75d7502f72823bc501d8 /qadevOOo
parent5aabc9ca1f75a003ddd07e9dd30c5d74a3b9858c (diff)
parent2c316dc755b333fe377ddb8b8c8a99f8324cf86f (diff)
CWS-TOOLING: integrate CWS dba34a
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/runner/stats/Summarizer.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/GenericModelTest.java28
2 files changed, 16 insertions, 14 deletions
diff --git a/qadevOOo/runner/stats/Summarizer.java b/qadevOOo/runner/stats/Summarizer.java
index 2d28ea1fe..16fb3d880 100644
--- a/qadevOOo/runner/stats/Summarizer.java
+++ b/qadevOOo/runner/stats/Summarizer.java
@@ -78,7 +78,7 @@ public class Summarizer
{
if (states.elementAt(j).equals("not part of the job"))
{
- state = "Not possible since not all Interfaces/Services have been checked";
+ state = "PASSED(some interfaces/services not tested).OK";
}
else
{
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index 8ddbbc293..f3657e6ac 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -27,6 +27,7 @@
package mod._forms;
import com.sun.star.beans.NamedValue;
import com.sun.star.beans.PropertyValue;
+import com.sun.star.container.XIndexAccess;
import java.io.PrintWriter;
import lib.StatusException;
@@ -251,11 +252,10 @@ public class GenericModelTest extends TestCase {
if (m_ConnectionColsed) return;
try {
+ XIndexAccess forms = UnoRuntime.queryInterface( XIndexAccess.class,
+ FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc ) ) );
XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class),
- (FormTools.getForms(
- WriterTools.getDrawPage(
- m_xTextDoc)))
- .getByName("Standard"));
+ forms.getByIndex(0));
if (debug){
if (myForm == null){
@@ -269,18 +269,20 @@ public class GenericModelTest extends TestCase {
}
- XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface(
- XPropertySet.class, myForm);
- XConnection connection = (XConnection) AnyConverter.toObject(
- new Type(XConnection.class),
- xSetProp.getPropertyValue("ActiveConnection"));
- if (debug && connection == null){
- log.println("ERROR: could not get property 'ActiveConnection' from the XForm");
+ XPropertySet xSetProp = UnoRuntime.queryInterface( XPropertySet.class, myForm );
+ XConnection connection = UnoRuntime.queryInterface( XConnection.class, xSetProp.getPropertyValue( "ActiveConnection" ) );
+ if ( connection == null )
+ {
+ if ( debug )
+ log.println("ERROR: could not get property 'ActiveConnection' from the XForm");
+ }
+ else
+ {
+ connection.close();
}
-
- connection.close();
} catch (Exception e) {
log.println("ERROR: Can't close the connection: " + e.toString());
+ e.printStackTrace( log );
}
log.println("closing data source...");