details: /erp/devel/pi/rev/5d0759d9d49d
changeset: 12901:5d0759d9d49d
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Fri Jun 17 14:56:54 2011 +0200
summary: [APRM] Make stable JUnit test cases
diffstat:
modules/org.openbravo.advpaymentmngt/build.xml
| 13 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java
| 52 ++++++++++
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java
| 11 --
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java
| 1 -
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
| 12 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java
| 27 +++-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java
| 31 +++--
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java
| 24 +++-
8 files changed, 121 insertions(+), 50 deletions(-)
diffs (truncated from 348 to 300 lines):
diff -r fe772b3f5e90 -r 5d0759d9d49d
modules/org.openbravo.advpaymentmngt/build.xml
--- a/modules/org.openbravo.advpaymentmngt/build.xml Fri Jun 17 00:18:11
2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/build.xml Fri Jun 17 14:56:54
2011 +0200
@@ -36,11 +36,12 @@
</dirset>
</path>
- <target name="all" depends="PaymentMethodTest, FinancialAccountTest,
- PaymentTest_01, PaymentTest_02, PaymentTest_03,
- PaymentTest_04, PaymentTest_05, PaymentTest_06,
- PaymentTest_07, PaymentTest_08, PaymentTest_09,
- PaymentTest_10, PaymentTest_11">
+ <target name="all">
+ <junit printsummary="yes" haltonfailure="yes">
+ <classpath refid="project.class.path" />
+ <formatter type="plain" usefile="no"/>
+ <test name="org.openbravo.advpaymentmngt.test.draft.AllTests"
haltonfailure="true"/>
+ </junit>
</target>
<target name="PaymentMethodTest">
@@ -147,4 +148,4 @@
</junit>
</target>
-</project>
\ No newline at end of file
+</project>
diff -r fe772b3f5e90 -r 5d0759d9d49d
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java
Fri Jun 17 14:56:54 2011 +0200
@@ -0,0 +1,52 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.advpaymentmngt.test.draft;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static Test suite() {
+ final TestSuite suite = new TestSuite("Test for
org.openbravo.advpaymentmngt");
+ // $JUnit-BEGIN$
+
+ // Master Data Configuration
+ suite.addTestSuite(FinancialAccountTest.class);
+ suite.addTestSuite(PaymentMethodTest.class);
+
+ // Payment scenarios
+ suite.addTestSuite(PaymentTest_01.class);
+ suite.addTestSuite(PaymentTest_02.class);
+ suite.addTestSuite(PaymentTest_03.class);
+ suite.addTestSuite(PaymentTest_04.class);
+ suite.addTestSuite(PaymentTest_05.class);
+ suite.addTestSuite(PaymentTest_06.class);
+ suite.addTestSuite(PaymentTest_07.class);
+ suite.addTestSuite(PaymentTest_08.class);
+ suite.addTestSuite(PaymentTest_09.class);
+ suite.addTestSuite(PaymentTest_10.class);
+ suite.addTestSuite(PaymentTest_11.class);
+
+ // $JUnit-END$
+ return suite;
+ }
+
+}
diff -r fe772b3f5e90 -r 5d0759d9d49d
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java
Fri Jun 17 00:18:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java
Fri Jun 17 14:56:54 2011 +0200
@@ -67,16 +67,6 @@
}
/**
- * Currency is mandatory
- */
- public void testAddFinancialAccountNotValid1() {
- TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_4",
STANDARD_DESCRIPTION, null,
- BANK, false, getOneInstance(Location.class),
getOneInstance(BusinessPartner.class), "2054",
- null, null, null, null, null, null, null, null, BigDecimal.ZERO,
BigDecimal.ZERO, null,
- false, false);
- }
-
- /**
* Deletes all the Payment Methods created for testing
*/
public void testDeleteFinancialAccounts() {
@@ -86,7 +76,6 @@
.add(Restrictions.eq(FIN_FinancialAccount.PROPERTY_DESCRIPTION,
STANDARD_DESCRIPTION));
final List<FIN_FinancialAccount> finAccs = obCriteria.list();
for (FIN_FinancialAccount fa : finAccs) {
- System.out.println("Removing payment method: " + fa.getName());
OBDal.getInstance().remove(fa);
}
}
diff -r fe772b3f5e90 -r 5d0759d9d49d
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java
Fri Jun 17 00:18:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java
Fri Jun 17 14:56:54 2011 +0200
@@ -88,7 +88,6 @@
obCriteria.add(Restrictions.eq(FIN_PaymentMethod.PROPERTY_DESCRIPTION,
STANDARD_DESCRIPTION));
final List<FIN_PaymentMethod> paymentMethods = obCriteria.list();
for (FIN_PaymentMethod pm : paymentMethods) {
- System.out.println("Removing payment method: " + pm.getName());
OBDal.getInstance().remove(pm);
}
}
diff -r fe772b3f5e90 -r 5d0759d9d49d
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
Fri Jun 17 00:18:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
Fri Jun 17 14:56:54 2011 +0200
@@ -99,8 +99,10 @@
new
Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
.getFINPaymentScheduleList().get(0)));
- assertTrue("Payment Schedule Outstanding Amount != 0",
invoice.getFINPaymentScheduleList()
- .get(0).getOutstandingAmount().compareTo(psd.getAmount()) == 0);
+ assertTrue("Payment Schedule Outstanding Amount ("
+ +
invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount().toPlainString()
+ + ") != " + paymentAmount.toPlainString(),
invoice.getFINPaymentScheduleList().get(0)
+ .getOutstandingAmount().compareTo(paymentAmount) == 0);
assertTrue("Payment Schedule Received Amount != Total Amount", invoice
.getGrandTotalAmount().compareTo(
@@ -171,9 +173,9 @@
String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
BigDecimal invoicedQuantity = new BigDecimal("5");
- BigDecimal netUnitPrice = new BigDecimal("2.04");
- BigDecimal netListPrice = new BigDecimal("2.04");
- BigDecimal lineNetAmount = new BigDecimal("10.20");
+ BigDecimal netUnitPrice = new BigDecimal("2");
+ BigDecimal netListPrice = new BigDecimal("2");
+ BigDecimal lineNetAmount = new BigDecimal("1");
BigDecimal priceLimit = new BigDecimal("1");
PriceList testPriceList = OBDal.getInstance().get(PriceList.class,
priceListId);
diff -r fe772b3f5e90 -r 5d0759d9d49d
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java
Fri Jun 17 00:18:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java
Fri Jun 17 14:56:54 2011 +0200
@@ -71,6 +71,7 @@
private static final String DEPOSIT_ACCOUNT = "DEP";
private static final String CASH = "C";
private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_07";
+ private static final String SIMPLE_EXECUTION_PROCESS =
"717D521D5F454FAD9199B831001BB4E0";
private String financialAccountId;
@@ -90,23 +91,31 @@
try {
// DATA SETUP
Invoice invoice = dataSetup();
- FIN_Payment payment = invoice.getFINPaymentScheduleList().get(0)
-
.getFINPaymentScheduleDetailInvoicePaymentScheduleList().get(0).getPaymentDetails()
- .getFinPayment();
+ FIN_Payment payment = null;
+ for (FIN_PaymentScheduleDetail psd :
invoice.getFINPaymentScheduleList().get(0)
+ .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) {
+ if
("RPAE".equals(psd.getPaymentDetails().getFinPayment().getStatus())) {
+ payment = psd.getPaymentDetails().getFinPayment();
+ }
+ }
FIN_ExecutePayment executePayment = new FIN_ExecutePayment();
List<FIN_Payment> payments = new ArrayList<FIN_Payment>();
payments.add(payment);
- executePayment.init("OTHER",
payment.getPaymentMethod().getPayinExecutionProcess(),
- payments, null, payment.getOrganization());
+ executePayment.init("OTHER",
OBDal.getInstance().get(PaymentExecutionProcess.class,
+ SIMPLE_EXECUTION_PROCESS), payments, null,
payment.getOrganization());
OBError result = executePayment.execute();
// CHECK PAYMENT EXECUTION
assertTrue("Payment error while executing",
!"Error".equals(result.getType()));
Order order = invoice.getSalesOrder();
// CHECK OUTPUT DATA ORDER
- assertTrue("Order Payment Schedule Outstanding Amount != 0",
BigDecimal.ZERO
-
.compareTo(order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) ==
0);
- assertTrue("Order Payment Schedule Received Amount != Total Amount",
order
+ assertTrue("Order Payment Schedule Outstanding Amount ("
+ + order.getFINPaymentScheduleList().get(0).getOutstandingAmount()
+ ") != 0",
+ BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0)
+ .getOutstandingAmount()) == 0);
+ assertTrue("Order Payment Schedule Received Amount ("
+ + getPaidAmount(order.getFINPaymentScheduleList()).toPlainString()
+ + ") != Total Amount (" +
order.getGrandTotalAmount().toPlainString(), order
.getGrandTotalAmount().compareTo(getPaidAmount(order.getFINPaymentScheduleList()))
== 0);
assertTrue("Status != Payment Received",
"RPR".equals(payment.getStatus()));
// CHECK OUTPUT DATA INVOICE
@@ -145,7 +154,7 @@
String docTypeId = "40EE9B1CD3B345FABEFDA62B407B407F"; // AR Invoice
String orderDocTypeId = "CB6EEA256BBC41109911215C5A14D39B"; // Standard
Order
String warehouseId = "71B43F2AAE3641CA849B131960BCEFF4";
- final String SIMPLE_EXECUTION_PROCESS =
"717D521D5F454FAD9199B831001BB4E0"; // Simple Execution
+
// Process
BigDecimal quantity = new BigDecimal("10");
BigDecimal invoicedQuantity = new BigDecimal("10");
diff -r fe772b3f5e90 -r 5d0759d9d49d
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java
Fri Jun 17 00:18:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java
Fri Jun 17 14:56:54 2011 +0200
@@ -74,6 +74,7 @@
private static final String DEPOSIT_ACCOUNT = "DEP";
private static final String CASH = "C";
private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_09";
+ private static final String SIMPLE_EXECUTION_PROCESS =
"717D521D5F454FAD9199B831001BB4E0";
private String financialAccountId;
@@ -93,24 +94,33 @@
try {
// DATA SETUP
Invoice invoice = dataSetup();
- FIN_Payment payment = invoice.getFINPaymentScheduleList().get(0)
-
.getFINPaymentScheduleDetailInvoicePaymentScheduleList().get(0).getPaymentDetails()
- .getFinPayment();
+ FIN_Payment payment = null;
+ for (FIN_PaymentScheduleDetail psd :
invoice.getFINPaymentScheduleList().get(0)
+ .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) {
+ if
("RPAE".equals(psd.getPaymentDetails().getFinPayment().getStatus())) {
+ payment = psd.getPaymentDetails().getFinPayment();
+ }
+ }
FIN_ExecutePayment executePayment = new FIN_ExecutePayment();
List<FIN_Payment> payments = new ArrayList<FIN_Payment>();
payments.add(payment);
- executePayment.init("OTHER",
payment.getPaymentMethod().getPayinExecutionProcess(),
- payments, null, payment.getOrganization());
+ executePayment.init("OTHER",
OBDal.getInstance().get(PaymentExecutionProcess.class,
+ SIMPLE_EXECUTION_PROCESS), payments, null,
payment.getOrganization());
OBError result = executePayment.execute();
+
// CHECK PAYMENT EXECUTION
assertTrue("Payment error while executing",
!"Error".equals(result.getType()));
Order order = invoice.getSalesOrder();
// CHECK OUTPUT DATA ORDER
- assertTrue("Order Payment Schedule Outstanding Amount != 0",
BigDecimal.ZERO
-
.compareTo(order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) ==
0);
+ assertTrue("Order Payment Schedule Outstanding Amount ("
+ + order.getFINPaymentScheduleList().get(0).getOutstandingAmount()
+ ")!= 0",
+ BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0)
+ .getOutstandingAmount()) == 0);
// CHECK OUTPUT DATA INVOICE
- assertTrue("Invoice Payment Schedule Outstanding Amount != 0",
BigDecimal.ZERO
-
.compareTo(invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount())
== 0);
+ assertTrue("Invoice Payment Schedule Outstanding Amount ("
+ +
invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount() + ") != 0",
+
BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0)
+ .getOutstandingAmount()) == 0);
assertTrue("Invoice remains not paid", invoice.isPaymentComplete());
assertTrue("Invoice Payment Schedule Received Amount != Total Amount",
invoice.getGrandTotalAmount().compareTo(
@@ -145,7 +155,7 @@
String orderDocTypeId = "CB6EEA256BBC41109911215C5A14D39B"; // Standard
Order
String warehouseId = "71B43F2AAE3641CA849B131960BCEFF4";
String discountId = "831A7639FBE348B1A06EA3C0B0616B75"; // Descuento 10%
- final String SIMPLE_EXECUTION_PROCESS =
"717D521D5F454FAD9199B831001BB4E0"; // Simple Execution
+
// Process
BigDecimal quantity = new BigDecimal("10");
BigDecimal invoicedQuantity = new BigDecimal("10");
@@ -252,7 +262,6 @@
TestUtility.processPayment(payment, "P");
payment = OBDal.getInstance().get(FIN_Payment.class, payment.getId());
order = OBDal.getInstance().get(Order.class, order.getId());
-
// CHECK OUTPUT DATA FOR ORDER
OBContext.setAdminMode();
try {
diff -r fe772b3f5e90 -r 5d0759d9d49d
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java
Fri Jun 17 00:18:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java
Fri Jun 17 14:56:54 2011 +0200
@@ -74,6 +74,7 @@
private static final String DEPOSIT_ACCOUNT = "DEP";
private static final String CASH = "C";
private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_10";
+ private static final String SIMPLE_EXECUTION_PROCESS =
"717D521D5F454FAD9199B831001BB4E0";
private String financialAccountId;
@@ -93,14 +94,19 @@
try {
// DATA SETUP
Invoice invoice = dataSetup();
- FIN_Payment payment = invoice.getFINPaymentScheduleList().get(0)
-
.getFINPaymentScheduleDetailInvoicePaymentScheduleList().get(0).getPaymentDetails()
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
