strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qadev40: #161119# refactoring

Browse source
This commit is contained in:
Lars Langhans 2010-02-09 11:18:22 +01:00
parent 91aa9c502d
commit dee940058d
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
qadevOOo/runner/lib/MultiMethodTest.java
View file

@ -167,7 +167,8 @@ public class MultiMethodTest
if (! entry.entryName.equals("ifc.qadevooo._SelfTest")) if (! entry.entryName.equals("ifc.qadevooo._SelfTest"))
{ {
String ifcName = getInterfaceName(); String ifcName = getInterfaceName();
System.out.println("checking : " + ifcName); // System.out.println("checking : " + ifcName);
System.out.print("checking: [" + entry.longName + "]");
// defining a name of the class corresponding to the tested interface // defining a name of the class corresponding to the tested interface
// or service // or service
@ -186,12 +187,12 @@ public class MultiMethodTest
} }
catch (ClassNotFoundException cnfE) catch (ClassNotFoundException cnfE)
{ {
System.out.println();
cnfE.printStackTrace(log); cnfE.printStackTrace(log);
log.println("could not find a class : " + getTestedClassName()); log.println("could not find a class : " + getTestedClassName());
return null; return null;
} }
System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]");
// quering the tested interface from the tested object // quering the tested interface from the tested object
XInterface tCase = tEnv.getTestObject(); XInterface tCase = tEnv.getTestObject();
@ -234,7 +235,8 @@ public class MultiMethodTest
DescEntry aSubEntry = entry.SubEntries[i]; DescEntry aSubEntry = entry.SubEntries[i];
try try
{ {
executeMethod(aSubEntry.entryName); final String sEntryName = aSubEntry.entryName;
executeMethod(sEntryName);
} }
catch (Exception e) catch (Exception e)
{ {
@ -258,7 +260,7 @@ public class MultiMethodTest
* Is called before calling method tests, but after initialization. * Is called before calling method tests, but after initialization.
* Subclasses may override to perform actions before method tests. * Subclasses may override to perform actions before method tests.
*/ */
protected void before() throws Exception protected void before()
{ {
} }
@ -321,13 +323,15 @@ public class MultiMethodTest
/** /**
* Checks if the <code>method</code> is optional in the service. * Checks if the <code>method</code> is optional in the service.
*/ */
protected boolean isOptional(String method) protected boolean isOptional(String _method)
{ {
for (int k = 0; k < entry.SubEntryCount; k++) for (int k = 0; k < entry.SubEntryCount; k++)
{ {
if (entry.SubEntries[k].entryName.equals(method)) final String sName = entry.SubEntries[k].entryName;
if (sName.equals(_method))
{ {
return entry.SubEntries[k].isOptional; final boolean bIsOptional = entry.SubEntries[k].isOptional;
return bIsOptional;
} }
} }
return false; return false;
@ -370,6 +374,7 @@ public class MultiMethodTest
log.println("Execute: " + method); log.println("Execute: " + method);
callMethod(method); callMethod(method);
log.println(method + ": " + tRes.getStatusFor(method)); log.println(method + ": " + tRes.getStatusFor(method));
log.println();
} }
} }

3
qadevOOo/runner/lib/MultiPropertyTest.java
View file

@ -158,7 +158,8 @@ public class MultiPropertyTest extends MultiMethodTest
if (info != null) if (info != null)
{ {
if (!info.hasPropertyByName(propName)) final boolean bHasProperty = info.hasPropertyByName(propName);
if (!bHasProperty)
{ {
if (isOptional(propName) || optionalService) if (isOptional(propName) || optionalService)
{ {