mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert "continue" flag to an enum

Browse Source 
Change-Id: I160de1152978f301c514d9107c9e9082bab3cf05
This commit is contained in:
Noel Grandin
2015-10-16 10:55:02 +02:00
parent a3a89c1523
commit 14bf708ef5
4 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/qa/complex/connectivity/FlatFileAccess.java
View File

@@ -228,11 +228,11 @@ public class FlatFileAccess extends ComplexTestCase
{ {
values.add( (T)i_getter.getValue( rowSet ) ); values.add( (T)i_getter.getValue( rowSet ) );
} }
assureEquals( i_context + ": " + i_failureDesc, i_expectedValues, values.toArray(), true ); assureEquals( i_context + ": " + i_failureDesc, i_expectedValues, values.toArray(), ContinueWithTest.YES );
} }
catch( final SQLException e ) catch( final SQLException e )
{ {
failed( i_context + ": caught an exception: " + e.toString(), false ); failed( i_context + ": caught an exception: " + e.toString(), ContinueWithTest.NO );
} }
finally finally
{ {

34
filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
View File

@@ -270,7 +270,7 @@ public class TypeDetection extends ComplexTestCase {
} }
} catch (ClassCastException e){ } catch (ClassCastException e){
failed(e.toString(), true); failed(e.toString(), ContinueWithTest.YES);
} }
} }
@@ -296,7 +296,7 @@ public class TypeDetection extends ComplexTestCase {
boolean fileTypeOK = helper.checkFileType(type, fileType); boolean fileTypeOK = helper.checkFileType(type, fileType);
assure("\nURL-test : " + fileAlias + ":\n\treturned type: '" + type + assure("\nURL-test : " + fileAlias + ":\n\treturned type: '" + type +
"'\n\texpected type: '" + fileType + "'",fileTypeOK ,true); "'\n\texpected type: '" + fileType + "'",fileTypeOK ,ContinueWithTest.YES);
} }
/** Filles a MediaDescriptor with a <code>XInputStream</code> of the test /** Filles a MediaDescriptor with a <code>XInputStream</code> of the test
@@ -317,7 +317,7 @@ public class TypeDetection extends ComplexTestCase {
try{ try{
xStream = helper.getFileStream( fileURL ); xStream = helper.getFileStream( fileURL );
} catch (NotConnectedException e) { } catch (NotConnectedException e) {
failed("Could not get XInputStream from file :'" + fileURL + "'",true); failed("Could not get XInputStream from file :'" + fileURL + "'",ContinueWithTest.YES);
return; return;
} }
@@ -332,7 +332,7 @@ public class TypeDetection extends ComplexTestCase {
boolean fileTypeOK = helper.checkFileType(type, fileType); boolean fileTypeOK = helper.checkFileType(type, fileType);
assure("\nXInputStream-test: " + fileAlias + ":\n\treturned type: '" + type + assure("\nXInputStream-test: " + fileAlias + ":\n\treturned type: '" + type +
"'\n\texpected type: '" + fileType + "'", fileTypeOK, true); "'\n\texpected type: '" + fileType + "'", fileTypeOK, ContinueWithTest.YES);
} }
@@ -375,16 +375,16 @@ public class TypeDetection extends ComplexTestCase {
assure("\n" + fileAlias + ":\n\treturned type: '" + type + assure("\n" + fileAlias + ":\n\treturned type: '" + type +
"'\n\texpected type: '" + expectedFileType + "'", "'\n\texpected type: '" + expectedFileType + "'",
fileTypeOK, true); fileTypeOK, ContinueWithTest.YES);
} catch (FileAliasNotFoundException e){ } catch (FileAliasNotFoundException e){
failed(e.toString(),true); failed(e.toString(),ContinueWithTest.YES);
} }
} }
} catch (ClassCastException e){ } catch (ClassCastException e){
failed(e.toString(), true); failed(e.toString(), ContinueWithTest.YES);
} }
} }
@@ -429,16 +429,16 @@ public class TypeDetection extends ComplexTestCase {
assure("\n" + fileAlias + ":\n\treturned type: '" + type + assure("\n" + fileAlias + ":\n\treturned type: '" + type +
"'\n\texpected type: '" + expectedType + "'", "'\n\texpected type: '" + expectedType + "'",
fileTypeOK,true); fileTypeOK,ContinueWithTest.YES);
} catch (FileAliasNotFoundException e){ } catch (FileAliasNotFoundException e){
failed(e.toString(),true); failed(e.toString(),ContinueWithTest.YES);
} }
} }
} catch (ClassCastException e){ } catch (ClassCastException e){
failed(e.toString(), true); failed(e.toString(), ContinueWithTest.YES);
} }
} }
@@ -474,16 +474,16 @@ public class TypeDetection extends ComplexTestCase {
assure("\n" + fileAlias + ":\n\treturned type: '" + type + assure("\n" + fileAlias + ":\n\treturned type: '" + type +
"'\t\nexpected type: '" + fileType + "'", "'\t\nexpected type: '" + fileType + "'",
fileTypeOK, true); fileTypeOK, ContinueWithTest.YES);
} catch (FileAliasNotFoundException e){ } catch (FileAliasNotFoundException e){
failed(e.toString(),true); failed(e.toString(),ContinueWithTest.YES);
} }
} }
} catch (ClassCastException e){ } catch (ClassCastException e){
failed(e.toString(), true); failed(e.toString(), ContinueWithTest.YES);
} }
} }
@@ -531,15 +531,15 @@ public class TypeDetection extends ComplexTestCase {
} }
if (file.canWrite() && bReadOnly) if (file.canWrite() && bReadOnly)
assure("\nStreamLoader: file '"+ fileURL +"' is writable but out-Parameter does contain 'ReadOnly' property",false ,true); assure("\nStreamLoader: file '"+ fileURL +"' is writable but out-Parameter does contain 'ReadOnly' property", false, ContinueWithTest.YES);
else if ((!file.canWrite()) && (!bReadOnly)) else if ((!file.canWrite()) && (!bReadOnly))
assure("\nStreamLoader: file '"+ fileURL +"'is readonly but out-Parameter does not contain 'ReadOnly' property",false ,true); assure("\nStreamLoader: file '"+ fileURL +"'is readonly but out-Parameter does not contain 'ReadOnly' property", false, ContinueWithTest.YES);
else assure("all ok",true,true); else assure("all ok", true, ContinueWithTest.YES);
} }
} catch (ClassCastException e){ } catch (ClassCastException e){
failed(e.toString(), true); failed(e.toString(), ContinueWithTest.YES);
} }
} }

10
framework/qa/complex/framework/recovery/RecoveryTest.java
View File

@@ -323,7 +323,7 @@ public class RecoveryTest extends ComplexTestCase {
XDialog oDialog = null; XDialog oDialog = null;
oDialog = rt.getActiveDialogAfterStartup(xMSF); oDialog = rt.getActiveDialogAfterStartup(xMSF);
assure("could not get Recovery Dialog at start of office", (oDialog != null), CONTINUE); assure("could not get Recovery Dialog at start of office", (oDialog != null), ContinueWithTest.YES);
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, oDialog); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, oDialog);
log.println("got the following dialog: '" +oDialog.getTitle() + "'"); log.println("got the following dialog: '" +oDialog.getTitle() + "'");
@@ -427,7 +427,7 @@ public class RecoveryTest extends ComplexTestCase {
XWindow oDialog = null; XWindow oDialog = null;
oDialog = rt.getActiveWindow(xMSF); oDialog = rt.getActiveWindow(xMSF);
assure("could not get 'Save Documents' Dialog: ", (oDialog != null), CONTINUE); assure("could not get 'Save Documents' Dialog: ", (oDialog != null), ContinueWithTest.YES);
UITools oUITools = new UITools(oDialog); UITools oUITools = new UITools(oDialog);
@@ -438,7 +438,7 @@ public class RecoveryTest extends ComplexTestCase {
try{ try{
documents = oUITools.getListBoxItems(listBoxName); documents = oUITools.getListBoxItems(listBoxName);
} catch (java.lang.Exception e){ } catch (java.lang.Exception e){
failed("could not get the document names from the 'Save Documents' dialog", CONTINUE); failed("could not get the document names from the 'Save Documents' dialog", ContinueWithTest.YES);
} }
log.println("there are " + documents.length + " documents to save"); log.println("there are " + documents.length + " documents to save");
log.println("The following documents will be saved:"); log.println("The following documents will be saved:");
@@ -451,12 +451,12 @@ public class RecoveryTest extends ComplexTestCase {
try{ try{
oUITools.setTextEditFiledText("Save to", tempURL); oUITools.setTextEditFiledText("Save to", tempURL);
} catch (java.lang.Exception e){ } catch (java.lang.Exception e){
failed("could not set target directory for saving documents at 'Save Documents' dialog", CONTINUE); failed("could not set target directory for saving documents at 'Save Documents' dialog", ContinueWithTest.YES);
} }
try{ try{
oUITools.clickButton("OK"); oUITools.clickButton("OK");
} catch (java.lang.Exception e){ } catch (java.lang.Exception e){
failed("could not click 'OK' at 'Save Documents' dialog", CONTINUE); failed("could not click 'OK' at 'Save Documents' dialog", ContinueWithTest.YES);
} }
} }
} catch (com.sun.star.accessibility.IllegalAccessibleComponentStateException e){ } catch (com.sun.star.accessibility.IllegalAccessibleComponentStateException e){

29
qadevOOo/runner/complexlib/Assurance.java
View File

@@ -24,7 +24,10 @@ package complexlib;
*/ */
public class Assurance public class Assurance
{ {
public static final boolean CONTINUE = true; /** Used to indicate that we should continue with test method, even if check fails */
public enum ContinueWithTest {
YES, NO
}
/** State of the current test method **/ /** State of the current test method **/
protected boolean bSuccessful = true; protected boolean bSuccessful = true;
@@ -39,7 +42,7 @@ public class Assurance
* @param s The condition that should be true. * @param s The condition that should be true.
*/ */
protected void assure(boolean s) { protected void assure(boolean s) {
assure("Assure failed.", s, false); assure("Assure failed.", s, ContinueWithTest.NO);
} }
/** /**
@@ -49,7 +52,7 @@ public class Assurance
* @param s The condition that should be true. * @param s The condition that should be true.
*/ */
protected void assure(String msg, boolean s) { protected void assure(String msg, boolean s) {
assure(msg, s, false); assure(msg, s, ContinueWithTest.NO);
} }
/** /**
@@ -59,7 +62,7 @@ public class Assurance
* @param actual specifies the actual int value * @param actual specifies the actual int value
*/ */
protected void assureEquals( String message, int expected, int actual ) { protected void assureEquals( String message, int expected, int actual ) {
assureEquals( message, Integer.valueOf( expected ), Integer.valueOf( actual ), false ); assureEquals( message, Integer.valueOf( expected ), Integer.valueOf( actual ), ContinueWithTest.NO );
} }
/** /**
@@ -69,13 +72,13 @@ public class Assurance
* @param actual specifies the actual string value * @param actual specifies the actual string value
*/ */
protected void assureEquals( String message, String expected, String actual ) { protected void assureEquals( String message, String expected, String actual ) {
assureEquals( message, expected, actual, false ); assureEquals( message, expected, actual, ContinueWithTest.NO );
} }
/** /**
* assures the two given sequences are of equal length, and have equal content * assures the two given sequences are of equal length, and have equal content
*/ */
public <T> void assureEquals( String i_message, T[] i_expected, T[] i_actual, boolean i_continue ) public <T> void assureEquals( String i_message, T[] i_expected, T[] i_actual, ContinueWithTest i_continue )
{ {
if ( i_expected.length != i_actual.length ) if ( i_expected.length != i_actual.length )
failed( i_message + ": expected element count: " + i_expected.length + ", actual element count: " + i_actual.length ); failed( i_message + ": expected element count: " + i_expected.length + ", actual element count: " + i_actual.length );
@@ -91,7 +94,7 @@ public class Assurance
* @param msg The message of the failure. * @param msg The message of the failure.
*/ */
protected void failed(String msg) { protected void failed(String msg) {
assure(msg, false, false); assure(msg, false, ContinueWithTest.NO);
} }
/** /**
@@ -103,19 +106,19 @@ public class Assurance
* The current method will of course marked as failed. * The current method will of course marked as failed.
* @param msg The message that is evaluated. * @param msg The message that is evaluated.
* @param s The condition that should be true. * @param s The condition that should be true.
* @param cont Continue with test method, even if s is false. * @param cont if YES, continue with test method, even if s is false.
*/ */
protected void assure(String msg, boolean s, boolean cont) { protected void assure(String msg, boolean s, ContinueWithTest cont) {
bSuccessful &= s; bSuccessful &= s;
if (!s) { if (!s) {
message += msg + "\r\n"; message += msg + "\r\n";
if (!cont) { if (cont == ContinueWithTest.NO) {
throw new AssureException(msg); throw new AssureException(msg);
} }
} }
} }
private void assureEquals( String message, Object expected, Object actual, boolean cont ) { private void assureEquals( String message, Object expected, Object actual, ContinueWithTest cont ) {
assure( message + " (expected: " + expected.toString() + ", actual: " + actual.toString() + ")", assure( message + " (expected: " + expected.toString() + ", actual: " + actual.toString() + ")",
expected.equals( actual ), cont ); expected.equals( actual ), cont );
} }
@@ -128,9 +131,9 @@ public class Assurance
* method will continue.<br> * method will continue.<br>
* The current method will of course marked as failed. * The current method will of course marked as failed.
* @param msg The message that is evaluated. * @param msg The message that is evaluated.
* @param cont Continue with test method, even if s is false. * @param cont if YES, continue with test method, even if s is false.
*/ */
protected void failed(String msg, boolean cont) { protected void failed(String msg, ContinueWithTest cont) {
assure(msg, false, cont); assure(msg, false, cont);
} }