midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-851 fitnesse improvements / Peer Review

This commit is contained in:
Carlos Ruiz 2013-04-22 14:51:29 -05:00
parent c0d9c39f0d
commit 4a33f4434e
9 changed files with 186 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java
View File

@ -67,7 +67,7 @@ public class AssertRecord extends TableFixture {
POInfo poinfo = null;
boolean alreadyread = false;
StringBuilder whereclause = new StringBuilder("");
boolean error=false;
boolean isErrorExpected = false;
for (int i = 0; i < rows; i++) {
String cell_title = getText(i, 0);
String cell_value = getText(i, 1);
@ -93,7 +93,7 @@ public class AssertRecord extends TableFixture {
whereclause.append(cell_value);
} else if (cell_title.equalsIgnoreCase("*Read*") || cell_title.equalsIgnoreCase("*Read*Error*") )
{
error= "*Read*Error*".equalsIgnoreCase(cell_title);
isErrorExpected = "*Read*Error*".equalsIgnoreCase(cell_title);
if (! tableOK) {
getCell(i, 1).addToBody("Table " + tableName + " does not exist");
wrong(i, 1);
@ -113,45 +113,41 @@ public class AssertRecord extends TableFixture {
rs = pstmt.executeQuery();
if (rs.next()) {
gpo = table.getPO(rs, null);
if(error){
if (isErrorExpected) {
wrong(i,1);
return;
}
} else {
getCell(i, 1).addToBody("No record found: " + sql);
boolean value=Util.evaluateError("No record found: ",cell_value,error);
if(value){
boolean ok = Util.evaluateError("No record found: ", cell_value, isErrorExpected);
if (ok) {
right(i,1);
return;
} else {
wrong(i,1);
return;
}
return;
}
if (rs.next()) {
getCell(i, 1).addToBody("More than one record found: " + sql);
boolean value=Util.evaluateError("More than one record found: ",cell_value,error);
if(value){
boolean ok = Util.evaluateError("More than one record found: ", cell_value, isErrorExpected);
if (ok) {
right(i,1);
return;
} else {
wrong(i,1);
return;
}
return;
}
}
catch (SQLException e)
{
boolean value=Util.evaluateError(e.getMessage(),cell_value,error);
if(value){
boolean ok = Util.evaluateError(e.getMessage(), cell_value, isErrorExpected);
if (ok) {
right(getCell(i, 1));
return;
} else {
exception(getCell(i, 1), e);
return;
}
return;
}
finally
{
@ -196,7 +192,7 @@ public class AssertRecord extends TableFixture {
}
}
}
}//end while
}
}
// set the variables at the end
// read - set context variables

24
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java
View File

@ -64,7 +64,7 @@ public class CreateRecord extends TableFixture {
String columnName = null;
boolean tableOK = false;
boolean columnsOK = true;
boolean error="*Save*Error*".equalsIgnoreCase(getText(rows-1, 0));
boolean isErrorExpected = "*Save*Error*".equalsIgnoreCase(getText(rows-1, 0));
MTable table = null;
POInfo poinfo = null;
@ -81,8 +81,8 @@ public class CreateRecord extends TableFixture {
// TODO : verify if the record already exists
table = MTable.get(ctx, tableName);
if (table == null || table.get_ID() <= 0) {
boolean value=Util.evaluateError("Table " + tableName + " does not exist", cell_value, error);
if(value)
boolean ok = Util.evaluateError("Table " + tableName + " does not exist", cell_value, isErrorExpected);
if (ok)
right(i,1);
else
wrong(i,1);
@ -100,8 +100,8 @@ public class CreateRecord extends TableFixture {
if (! tableOK) {
getCell(i, 1).addToBody("Table " + tableName + " does not exist");
boolean value=Util.evaluateError("Table " + tableName + " does not exist", cell_value, error);
if(value)
boolean ok = Util.evaluateError("Table " + tableName + " does not exist", cell_value, isErrorExpected);
if (ok)
right(i,1);
else
wrong(i,1);
@ -118,13 +118,13 @@ public class CreateRecord extends TableFixture {
msg.append("Error: " + vnp.getName());
}
getCell(i, 1).addToBody(msg.toString());
boolean value=Util.evaluateError(msg.toString(),cell_value,error);
if(value)
boolean ok = Util.evaluateError(msg.toString(),cell_value,isErrorExpected);
if (ok)
right(i,1);
else
wrong(i,1);
} else {
if(error){
if (isErrorExpected) {
wrong(i,1);
} else {
right(i, 1);
@ -194,16 +194,16 @@ public class CreateRecord extends TableFixture {
try {
if (!gpo.set_ValueOfColumnReturningBoolean(columnName, value)) {
columnsOK = false;
boolean value1=Util.evaluateError("Cannot set value of column",cell_value,error);
if(value1)
boolean ok = Util.evaluateError("Cannot set value of column", cell_value, isErrorExpected);
if (ok)
right(getCell(i, 1));
else
exception(getCell(i, 1), new Exception("Cannot set value of column"));
}
} catch (Exception e) {
columnsOK = false;
boolean value1=Util.evaluateError("Cannot set value of column",cell_value,error);
if(value1)
boolean ok = Util.evaluateError(e.getMessage(), cell_value, isErrorExpected);
if (ok)
right(getCell(i, 1));
else
exception(getCell(i, 1), e);

38
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java
View File

@ -1,7 +1,6 @@
/**********************************************************************
* This file is part of Adempiere ERP Bazaar *
* http://www.adempiere.org *
* *
* This file is part of iDempiere ERP Bazaar *
* http://www.idempiere.org *
* *
* Copyright (C) Contributors *
* *
@ -20,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
* MA 02110-1301, USA. *
* *
***********************************************************************/
**********************************************************************/
package org.idempiere.fitnesse.fixture;
@ -31,14 +30,9 @@ import java.util.Properties;
import org.compiere.model.MTable;
import org.compiere.model.PO;
import org.compiere.util.DB;
import org.idempiere.fitnesse.fixture.Instance;
import org.idempiere.fitnesse.fixture.Static_iDempiereInstance;
import org.idempiere.fitnesse.fixture.Util;
import fitnesse.fixtures.TableFixture;
/**
* @author juliana
*
@ -72,7 +66,7 @@ public class DeleteRecord extends TableFixture {
boolean alreadyread = false;
StringBuilder whereclause = new StringBuilder("");
boolean error = false;
boolean isErrorExpected = false;
String msgerror = null;
for (int i = 0; i < rows; i++) {
@ -99,7 +93,7 @@ public class DeleteRecord extends TableFixture {
}
whereclause.append(cell_value);
} else if (cell_title.equalsIgnoreCase("*Delete*") || cell_title.equalsIgnoreCase("*Delete*Error*")) {
error = "*Delete*Error*".equalsIgnoreCase(cell_title);
isErrorExpected = "*Delete*Error*".equalsIgnoreCase(cell_title);
msgerror = cell_value;
if (!tableOK) {
getCell(i, 1).addToBody("Table " + tableName + " does not exist");
@ -121,26 +115,23 @@ public class DeleteRecord extends TableFixture {
gpo = table.getPO(rs, null);
} else {
getCell(i, 1).addToBody("No record found: " + sql);
boolean value = Util.evaluateError("No record found: ",cell_value, error);
if (value) {
boolean ok = Util.evaluateError("No record found: ",cell_value, isErrorExpected);
if (ok) {
right(i, 1);
return;
} else {
wrong(i, 1);
return;
}
return;
}
if (rs.next()) {
getCell(i, 1).addToBody("More than one record found: " + sql);
boolean value = Util.evaluateError("More than one record found: ", cell_value,error);
if (value) {
boolean ok = Util.evaluateError("More than one record found: ", cell_value,isErrorExpected);
if (ok) {
right(i, 1);
return;
} else {
wrong(i, 1);
return;
}
return;
}
if (gpo != null) {
@ -148,14 +139,13 @@ public class DeleteRecord extends TableFixture {
}
} catch (Exception e) {
boolean value = Util.evaluateError(e.getMessage(),msgerror, error);
if (value) {
boolean ok = Util.evaluateError(e.getMessage(), msgerror, isErrorExpected);
if (ok) {
right(getCell(i, 1));
return;
} else {
exception(getCell(i, 1), e);
return;
}
return;
} finally {
DB.close(rs, pstmt);
rs = null;

15
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java
View File

@ -54,7 +54,7 @@ public class Login extends TableFixture {
if (adempiereInstance == null) {
adempiereInstance = Static_iDempiereInstance.getInstance();
}
boolean error="*Login*Error*".equalsIgnoreCase(getText(rows-1, 0));
boolean isErrorExpected = "*Login*Error*".equalsIgnoreCase(getText(rows-1, 0));
String msgerror = getText(rows-1, 1);
for (int i = 0; i < rows; i++) {
String cell_title = getText(i, 0);
@ -107,8 +107,8 @@ public class Login extends TableFixture {
|| m_role_id < 0
|| m_client_id < 0) {
boolean value=Util.evaluateError("Incomplete data to login, needed User|Password|AD_Role_ID|AD_Client_ID", msgerror, error);
if(value)
boolean ok = Util.evaluateError("Incomplete data to login, needed User|Password|AD_Role_ID|AD_Client_ID", msgerror, isErrorExpected);
if (ok)
right(i,1);
else
exception(getCell(rows-1, 1), new Exception("Incomplete data to login, needed User|Password|AD_Role_ID|AD_Client_ID"));
@ -117,7 +117,7 @@ public class Login extends TableFixture {
String msg = modelLogin();
if (msg == null || msg.length() == 0) {
MSession.get (Env.getCtx(), true);// Start Session
if(error){
if (isErrorExpected) {
wrong(rows-1, 0);
wrong(rows-1, 1);
} else {
@ -126,11 +126,10 @@ public class Login extends TableFixture {
}
} else {
boolean value=Util.evaluateError(msg, msgerror, error);
if(value){
boolean ok = Util.evaluateError(msg, msgerror, isErrorExpected);
if (ok) {
right(rows-1, 0);
}
else{
} else {
wrong(rows-1, 0);
exception(getCell(rows-1, 1), new Exception(msg));
}

27
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java
View File

@ -67,7 +67,7 @@ public class ReadRecord extends TableFixture {
POInfo poinfo = null;
boolean alreadyread = false;
String whereclause = new String("");
boolean error=false;
boolean isErrorExpected = false;
for (int i = 0; i < rows; i++) {
String cell_title = getText(i, 0);
String cell_value = getText(i, 1);
@ -97,7 +97,7 @@ public class ReadRecord extends TableFixture {
wrong(i, 1);
return;
}
error="*Read*Error*".equalsIgnoreCase(cell_title);
isErrorExpected="*Read*Error*".equalsIgnoreCase(cell_title);
if (whereclause.length() == 0) {
getCell(i, 1).addToBody("No where clause");
wrong(i, 1);
@ -112,42 +112,39 @@ public class ReadRecord extends TableFixture {
rs = pstmt.executeQuery();
if (rs.next()) {
gpo = table.getPO(rs, null);
if(error){
if (isErrorExpected) {
wrong(i,1);
}
} else {
getCell(i, 1).addToBody("No record found: " + sql);
boolean value=Util.evaluateError("No record found: ",cell_value,error);
if(value){
boolean ok = Util.evaluateError("No record found: ", cell_value, isErrorExpected);
if (ok) {
right(i,1);
return;
} else {
wrong(i,1);
return;
}
return;
}
if (rs.next()) {
getCell(i, 1).addToBody("More than one record found: " + sql);
boolean value=Util.evaluateError("More than one record found: ",cell_value,error);
if(value){
boolean ok = Util.evaluateError("More than one record found: ",cell_value,isErrorExpected);
if (ok) {
right(i,1);
return;
} else {
wrong(i,1);
return;
}
return;
}
}
catch (SQLException e)
{
boolean value=Util.evaluateError(e.getMessage(),cell_value,error);
if(value){
boolean ok = Util.evaluateError(e.getMessage(),cell_value,isErrorExpected);
if (ok) {
right(getCell(i, 1));
return;
} else {
exception(getCell(i, 1), e);
return;
}
return;
}
finally
{

53
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java
View File

@ -83,7 +83,7 @@ public class RunProcess extends TableFixture {
HashMap<String,Object> fmap = new HashMap<String,Object>();
int recordID = 0;
String docAction = null;
boolean error="*Run*Error*".equalsIgnoreCase(getText(rows-1, 0));
boolean isErrorExpected = "*Run*Error*".equalsIgnoreCase(getText(rows-1, 0));
String msgerror1 = getText(rows-1, 1);
for (int i = 0; i < rows; i++) {
String cell_title = getText(i, 0);
@ -96,13 +96,13 @@ public class RunProcess extends TableFixture {
String processValue = cell_value;
int processID = MProcess.getProcess_ID(processValue, null);
if (processID <= 0) {
boolean value=Util.evaluateError(msgerror1,"Process with Value=" + processValue + " doesn't exist", error);
if(value){
boolean ok = Util.evaluateError(msgerror1,"Process with Value=" + processValue + " doesn't exist", isErrorExpected);
if (ok) {
right(getCell(i, 1));
} else {
exception(getCell(i, 1), new Exception("Process with Value=" + processValue + " doesn't exist"));
return;
}
return;
}
process = new MProcess(ctx, processID, null);
} else if (cell_title.equalsIgnoreCase("*ProcessID*")) {
@ -113,13 +113,13 @@ public class RunProcess extends TableFixture {
int processID = getInt(i, 1);
process = new MProcess(ctx, processID, null);
if (process == null || process.get_ID() <= 0) {
boolean value=Util.evaluateError(msgerror1,"Process with ID=" + processID + " doesn't exist", error);
if(value){
boolean ok = Util.evaluateError(msgerror1,"Process with ID=" + processID + " doesn't exist", isErrorExpected);
if (ok) {
right(getCell(i, 1));
} else {
exception(getCell(i, 1), new Exception("Process with ID=" + processID + " doesn't exist"));
return;
}
return;
}
} else if (cell_title.equalsIgnoreCase("*Run*") || cell_title.equalsIgnoreCase("*Run*Error*")) {
if (i != rows-1) {
@ -131,9 +131,9 @@ public class RunProcess extends TableFixture {
MPInstancePara[] iParams = pInstance.getParameters();
String errorMsg = setParams(process, iParams, fmap);
if (errorMsg != null) {
boolean value=Util.evaluateError(msgerror1,errorMsg, error);
if(value){
boolean ok = Util.evaluateError(msgerror1,errorMsg, isErrorExpected);
if (ok) {
// do nothing
} else {
exception(getCell(i, 1), new Exception(errorMsg));
}
@ -176,7 +176,6 @@ public class RunProcess extends TableFixture {
// Start
if (process.isWorkflow())
{
boolean value=Util.evaluateError(msgerror1,pi.getSummary(), error);
try
{
int AD_Workflow_ID = process.getAD_Workflow_ID();
@ -192,33 +191,33 @@ public class RunProcess extends TableFixture {
if (table != null) {
PO po = table.getPO(recordID, null);
if (!docAction.equals(po.get_Value("DocStatus"))) {
if(value){
boolean ok = Util.evaluateError(Msg.parseTranslation(ctx, pi.getSummary()), msgerror1, isErrorExpected);
if (ok) {
right(getCell(i, 1));
} else {
wrong(getCell(i, 1));
}
}
else {
if (value) {
right(getCell(i, 1));
} else {
if (isErrorExpected) {
wrong(getCell(i, 1));
}
}
}
}
else{
if(value){
right(getCell(i, 1));
} else {
right(getCell(i, 1));
}
}
}
} else {
if (isErrorExpected) {
wrong(getCell(i, 1));
} else {
right(getCell(i, 1));
}
}
}
}
catch(Exception ex)
{
if(value){
boolean ok = Util.evaluateError(ex.getMessage(), cell_value, isErrorExpected);
if (ok) {
right(getCell(i, 1));
} else {
exception(getCell(i, 1), ex);
@ -243,8 +242,8 @@ public class RunProcess extends TableFixture {
}
if (!processOK || pi.isError())
{
boolean value=Util.evaluateError(msgerror1,pi.getSummary(), error);
if(value){
boolean ok = Util.evaluateError(msgerror1,pi.getSummary(), isErrorExpected);
if (ok) {
right(getCell(i, 1));
processOK = true;
} else {
@ -254,7 +253,7 @@ public class RunProcess extends TableFixture {
}
else
{
if(error){
if (isErrorExpected) {
wrong(getCell(i, 1));
} else {
getCell(i, 1).addToBody(Msg.parseTranslation(ctx, pi.getSummary()));

40
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java
View File

@ -1,7 +1,6 @@
/**********************************************************************
* This file is part of Adempiere ERP Bazaar *
* http://www.adempiere.org *
* *
* This file is part of iDempiere ERP Bazaar *
* http://www.idempiere.org *
* *
* Copyright (C) Contributors *
* *
@ -20,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
* MA 02110-1301, USA. *
* *
***********************************************************************/
**********************************************************************/
package org.idempiere.fitnesse.fixture;
@ -71,7 +70,7 @@ public class UpdateRecord extends TableFixture {
boolean alreadyread = false;
StringBuilder whereclause = new StringBuilder("");
boolean error = false;
boolean isErrorExpected = false;
String msgerror = null;
for (int i = 0; i < rows; i++) {
String cell_title = getText(i, 0);
@ -97,7 +96,7 @@ public class UpdateRecord extends TableFixture {
}
whereclause.append(cell_value);
} else if (cell_title.equalsIgnoreCase("*Update*") || cell_title.equalsIgnoreCase("*Update*Error*")) {
error = "*Update*Error*".equalsIgnoreCase(cell_title);
isErrorExpected = "*Update*Error*".equalsIgnoreCase(cell_title);
msgerror = cell_value;
if (!tableOK) {
getCell(i, 1).addToBody("Table " + tableName + " does not exist");
@ -119,36 +118,32 @@ public class UpdateRecord extends TableFixture {
gpo = table.getPO(rs, null);
} else {
getCell(i, 1).addToBody("No record found: " + sql);
boolean value = Util.evaluateError("No record found: ",cell_value, error);
if (value) {
boolean ok = Util.evaluateError("No record found: ",cell_value, isErrorExpected);
if (ok) {
right(i, 1);
return;
} else {
wrong(i, 1);
return;
}
return;
}
if (rs.next()) {
getCell(i, 1).addToBody("More than one record found: " + sql);
boolean value = Util.evaluateError("More than one record found: ", cell_value,error);
if (value) {
boolean ok = Util.evaluateError("More than one record found: ", cell_value,isErrorExpected);
if (ok) {
right(i, 1);
return;
} else {
wrong(i, 1);
return;
}
return;
}
} catch (SQLException e) {
boolean value = Util.evaluateError(e.getMessage(),cell_value, error);
if (value) {
boolean ok = Util.evaluateError(e.getMessage(),cell_value, isErrorExpected);
if (ok) {
right(getCell(i, 1));
return;
} else {
exception(getCell(i, 1), e);
return;
}
return;
} finally {
DB.close(rs, pstmt);
rs = null;
@ -171,19 +166,18 @@ public class UpdateRecord extends TableFixture {
} else {
if (gpo != null) {
if (gpo.set_ValueOfColumnReturningBoolean(cell_title, cell_value)) {
if(error){
if (isErrorExpected) {
wrong(getCell(i, 1));
} else {
right(getCell(i, 1));
}
}
try {
gpo.saveEx();
} catch (Exception e) {
boolean value = Util.evaluateError(e.getMessage(),msgerror, error);
if (value)
boolean ok = Util.evaluateError(e.getMessage(),msgerror, isErrorExpected);
if (ok)
right(getCell(i, 1));
else
exception(getCell(i, 1),e);

4
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java
View File

@ -251,7 +251,7 @@ public class Util {
return evaluate(ctx, windowNo, expr, null);
}
public static boolean evaluateError(String error, String cell,boolean isError) {
public static boolean evaluateError(String error, String cell, boolean isExpectedError) {
boolean evaluate = false;
if (error == null)
@ -259,7 +259,7 @@ public class Util {
if (cell == null)
cell = "";
if (isError) {
if (isExpectedError) {
if (cell.length() > 0) {
if (error.contains(cell)) {
evaluate = true;

9
org.idempiere.fitrecorder/src/org/idempiere/fitrecorder/FitRecorder.java
View File

@ -294,8 +294,7 @@ public class FitRecorder implements ModelValidator {
writeFile("|*Run*|");
writeFile("\n");
}else if(po instanceof MSession)
{
} else if (po instanceof MSession) {
MSession session = (MSession) po;
if (session.isProcessed()) {
closefile();
@ -426,10 +425,8 @@ public class FitRecorder implements ModelValidator {
value=po.get_ValueAsString(colName);
}
if (column.isAllowLogging())
{
if (column.isKey())
{
if (column.isAllowLogging()) {
if (column.isKey()) {
if (!key) {
writeFile("| *Where* | ");
writeFile(colName + " = " + value+ " | ");