diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java index 9c89476c58..56c7ed33b2 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/AssertRecord.java @@ -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{ + } 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{ + } 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{ + } else { exception(getCell(i, 1), e); - return; - } + } + return; } finally { @@ -162,7 +158,7 @@ public class AssertRecord extends TableFixture { right(i, 1); if (gpo != null) { getCell(i, 1).addToBody(gpo.toString()); - } + } alreadyread = true; } else { // columns @@ -196,7 +192,7 @@ public class AssertRecord extends TableFixture { } } } - }//end while + } } // set the variables at the end // read - set context variables diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java index a77e82e0a8..f1a34b5201 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java @@ -64,13 +64,13 @@ 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; - + for (int i = 0; i < rows; i++) { String cell_title = getText(i, 0); - String cell_value = getText(i, 1); + String cell_value = getText(i, 1); if (cell_title.equalsIgnoreCase("*Table*")) { if (i > 0) { exception(getCell(i, 1), new Exception("*Table* must be defined in first row")); @@ -80,9 +80,9 @@ public class CreateRecord extends TableFixture { // TODO : trx // 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) + if (table == null || table.get_ID() <= 0) { + 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,16 +118,16 @@ 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); + } else { + right(i, 1); } getCell(i, 1).addToBody(gpo.toString()); for (int idx = 0; idx < poinfo.getColumnCount(); idx++) { @@ -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")); + 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) + columnsOK = false; + boolean ok = Util.evaluateError(e.getMessage(), cell_value, isErrorExpected); + if (ok) right(getCell(i, 1)); else exception(getCell(i, 1), e); diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java index 734a58376e..5b279938ce 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/DeleteRecord.java @@ -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 * @@ -48,7 +42,7 @@ public class DeleteRecord extends TableFixture { /* (non-Javadoc) * @see fitnesse.fixtures.TableFixture#doStaticTable(int) */ - + private volatile static Instance adempiereInstance = null; @@ -72,8 +66,8 @@ public class DeleteRecord extends TableFixture { boolean alreadyread = false; StringBuilder whereclause = new StringBuilder(""); - boolean error = false; - String msgerror=null; + boolean isErrorExpected = false; + String msgerror = null; for (int i = 0; i < rows; i++) { String cell_title = getText(i, 0); @@ -99,8 +93,8 @@ 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); - msgerror=cell_value; + isErrorExpected = "*Delete*Error*".equalsIgnoreCase(cell_title); + msgerror = cell_value; if (!tableOK) { getCell(i, 1).addToBody("Table " + tableName + " does not exist"); wrong(i, 1); @@ -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; @@ -172,11 +162,11 @@ public class DeleteRecord extends TableFixture { if (whereclause.length() > 0) whereclause.append(" AND "); whereclause.append(cell_title).append("=").append(value_evaluated); - } + } } } }//end while - + } } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java index 42e58caae1..93a3887aad 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java @@ -54,8 +54,8 @@ public class Login extends TableFixture { if (adempiereInstance == null) { adempiereInstance = Static_iDempiereInstance.getInstance(); } - boolean error="*Login*Error*".equalsIgnoreCase(getText(rows-1, 0)); - String msgerror=getText(rows-1, 1); + 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); String cell_value = getText(i, 1); @@ -106,31 +106,30 @@ public class Login extends TableFixture { || m_password == null || m_password.length() == 0 || 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 + else exception(getCell(rows-1, 1), new Exception("Incomplete data to login, needed User|Password|AD_Role_ID|AD_Client_ID")); } else { 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{ + } else { right(rows-1, 0); right(rows-1, 1); } } 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)); } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java index 9f6cb3d36a..e6f281d0ed 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/ReadRecord.java @@ -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); @@ -89,7 +89,7 @@ public class ReadRecord extends TableFixture { if (i != 1) { exception(getCell(i, 1), new Exception("*Where* must be defined in second row")); return; - } + } whereclause = cell_value; } else if (cell_title.equalsIgnoreCase("*Read*") || cell_title.equalsIgnoreCase("*Read*Error*")) { if (! tableOK) { @@ -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{ + } 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{ + } 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{ + } else { exception(getCell(i, 1), e); - return; - } + } + return; } finally { @@ -158,7 +155,7 @@ public class ReadRecord extends TableFixture { right(i, 1); if (gpo != null) { getCell(i, 1).addToBody(gpo.toString()); - } + } // read - set context variables for (int idx = 0; idx < poinfo.getColumnCount(); idx++) { String colname = poinfo.getColumnName(idx); diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java index 7fe5239453..53da5cd38d 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java @@ -83,8 +83,8 @@ public class RunProcess extends TableFixture { HashMap fmap = new HashMap(); int recordID = 0; String docAction = null; - boolean error="*Run*Error*".equalsIgnoreCase(getText(rows-1, 0)); - String msgerror1=getText(rows-1, 1); + 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); String cell_value = getText(i, 1); @@ -95,14 +95,14 @@ 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){ + if (processID <= 0) { + 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; - } + } else { + exception(getCell(i, 1), new Exception("Process with Value=" + processValue + " doesn't exist")); + } + return; } process = new MProcess(ctx, processID, null); } else if (cell_title.equalsIgnoreCase("*ProcessID*")) { @@ -113,15 +113,15 @@ 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; + } else { + exception(getCell(i, 1), new Exception("Process with ID=" + processID + " doesn't exist")); } + return; } - } else if (cell_title.equalsIgnoreCase("*Run*") || cell_title.equalsIgnoreCase("*Run*Error*") ) { + } else if (cell_title.equalsIgnoreCase("*Run*") || cell_title.equalsIgnoreCase("*Run*Error*")) { if (i != rows-1) { exception(getCell(i, 1), new Exception("*Run* must be called in last row")); return; @@ -130,11 +130,11 @@ public class RunProcess extends TableFixture { pInstance = new MPInstance (process, 0); MPInstancePara[] iParams = pInstance.getParameters(); String errorMsg = setParams(process, iParams, fmap); - if (errorMsg != null){ - boolean value=Util.evaluateError(msgerror1,errorMsg, error); - if(value){ - - }else{ + if (errorMsg != null) { + boolean ok = Util.evaluateError(msgerror1,errorMsg, isErrorExpected); + if (ok) { + // do nothing + } else { exception(getCell(i, 1), new Exception(errorMsg)); } } @@ -159,7 +159,7 @@ public class RunProcess extends TableFixture { po.set_ValueOfColumn("DocAction", docAction); po.saveEx(); } - + } } } @@ -176,52 +176,51 @@ 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(); MWorkflow wf = MWorkflow.get (ctx, AD_Workflow_ID); MWFProcess wfProcess = wf.startWait(pi); // may return null - if(wfProcess != null) + if (wfProcess != null) { getCell(i, 1).addToBody(Msg.parseTranslation(ctx, pi.getSummary())); addLogInfo(pInstance, i); - + if (wf.getWorkflowType().equals(MWorkflow.WORKFLOWTYPE_DocumentProcess)) { MTable table = MTable.get(ctx, wf.getAD_Table_ID()); if (table != null) { PO po = table.getPO(recordID, null); - if(!docAction.equals(po.get_Value("DocStatus"))){ - if(value){ - right(getCell(i, 1)); - }else{ + if (!docAction.equals(po.get_Value("DocStatus"))) { + boolean ok = Util.evaluateError(Msg.parseTranslation(ctx, pi.getSummary()), msgerror1, isErrorExpected); + if (ok) { + right(getCell(i, 1)); + } else { wrong(getCell(i, 1)); } + } else { + if (isErrorExpected) { + wrong(getCell(i, 1)); + } else { + right(getCell(i, 1)); + } } - else { - if (value) { - right(getCell(i, 1)); - } else { - wrong(getCell(i, 1)); - } - } - } - } - else{ - if(value){ - right(getCell(i, 1)); - }else{ - wrong(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); + } else { + exception(getCell(i, 1), ex); } } //started = wfProcess != null; @@ -243,23 +242,23 @@ 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{ - exception(getCell(i, 1), new Exception(pi.getSummary())); - processOK = false; + } else { + exception(getCell(i, 1), new Exception(pi.getSummary())); + processOK = false; } } else { - if(error){ + if (isErrorExpected) { wrong(getCell(i, 1)); - }else{ - getCell(i, 1).addToBody(Msg.parseTranslation(ctx, pi.getSummary())); - addLogInfo(pInstance, i); - right(getCell(i, 1)); + } else { + getCell(i, 1).addToBody(Msg.parseTranslation(ctx, pi.getSummary())); + addLogInfo(pInstance, i); + right(getCell(i, 1)); } } } diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java index b3a492d847..4a11961e6a 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java @@ -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,8 +70,8 @@ public class UpdateRecord extends TableFixture { boolean alreadyread = false; StringBuilder whereclause = new StringBuilder(""); - boolean error = false; - String msgerror=null; + boolean isErrorExpected = false; + String msgerror = null; for (int i = 0; i < rows; i++) { String cell_title = getText(i, 0); String cell_value = getText(i, 1); @@ -97,8 +96,8 @@ 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); - msgerror=cell_value; + isErrorExpected = "*Update*Error*".equalsIgnoreCase(cell_title); + msgerror = cell_value; if (!tableOK) { getCell(i, 1).addToBody("Table " + tableName + " does not exist"); wrong(i, 1); @@ -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; @@ -169,21 +164,20 @@ public class UpdateRecord extends TableFixture { whereclause.append(" AND "); whereclause.append(cell_title).append("=").append(value_evaluated); } else { - if(gpo != null){ - if(gpo.set_ValueOfColumnReturningBoolean(cell_title, cell_value)){ - if(error){ + if (gpo != null) { + if (gpo.set_ValueOfColumnReturningBoolean(cell_title, cell_value)) { + if (isErrorExpected) { wrong(getCell(i, 1)); - }else{ + } 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); diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java index f92082b156..e20edecab2 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Util.java @@ -250,16 +250,16 @@ 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) - error=""; + + if (error == null) + error = ""; if (cell == null) - cell=""; - - if (isError) { + cell = ""; + + if (isExpectedError) { if (cell.length() > 0) { if (error.contains(cell)) { evaluate = true; @@ -275,5 +275,5 @@ public class Util { } return evaluate; } - + } // AdempiereUtil diff --git a/org.idempiere.fitrecorder/src/org/idempiere/fitrecorder/FitRecorder.java b/org.idempiere.fitrecorder/src/org/idempiere/fitrecorder/FitRecorder.java index 04d8564227..0fa59bb9d7 100644 --- a/org.idempiere.fitrecorder/src/org/idempiere/fitrecorder/FitRecorder.java +++ b/org.idempiere.fitrecorder/src/org/idempiere/fitrecorder/FitRecorder.java @@ -183,7 +183,7 @@ public class FitRecorder implements ModelValidator { // Ignore records created within a workflow process if (po.get_TrxName().startsWith("WFP_")) return null; - + writeFile("\n"); writeFile("\n"); writeFile("CREATE RECORD"); @@ -227,10 +227,10 @@ public class FitRecorder implements ModelValidator { writeFile("\n"); } - + if(type == TYPE_AFTER_CHANGE) { - if (po instanceof MPInstance) + if (po instanceof MPInstance) { MProcess pro = MProcess.get(Env.getCtx(), po.get_ValueAsInt("AD_Process_ID")); MPInstance pint = (MPInstance)po; @@ -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(); @@ -387,7 +386,7 @@ public class FitRecorder implements ModelValidator { } - if(type == TYPE_AFTER_DELETE) + if (type == TYPE_AFTER_DELETE) { if (dontLogTables.contains(po.get_TableName().toUpperCase())) return null; @@ -399,7 +398,7 @@ public class FitRecorder implements ModelValidator { // Ignore records created within a workflow process if (po.get_TrxName().startsWith("WFP_")) return null; - + writeFile("\n"); writeFile("\n"); writeFile("DELETE RECORD"); @@ -422,14 +421,12 @@ public class FitRecorder implements ModelValidator { String value=null; if (DisplayType.isLookup(column.getAD_Reference_ID()) && DisplayType.List != column.getAD_Reference_ID()) { value = resolveValue(po, table, column); - }else{ + } else { value=po.get_ValueAsString(colName); } - if (column.isAllowLogging()) - { - if (column.isKey()) - { + if (column.isAllowLogging()) { + if (column.isKey()) { if (!key) { writeFile("| *Where* | "); writeFile(colName + " = " + value+ " | "); @@ -440,7 +437,7 @@ public class FitRecorder implements ModelValidator { } } } - }//while columns + }//while columns writeFile("\n"); writeFile("| *Delete* |"); @@ -517,7 +514,7 @@ public class FitRecorder implements ModelValidator { } else { value = po.get_ValueAsString(column.getColumnName()); } - + return value; }