From 5d0fe54df99082f3fa60b05b702c9dfc609f3cc9 Mon Sep 17 00:00:00 2001 From: "Redhuan D. Oon" Date: Thu, 25 Feb 2010 14:21:59 +0000 Subject: [PATCH] FR: [ 2214883 ] Remove SQL code and Replace for Query -- JUnit test included (no failures) --- .../src/org/compiere/model/MPaySelection.java | 39 +++------------- .../test/functional/MPaySelectionTest.java | 44 +++++++++++++++++++ 2 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 extend/src/test/functional/MPaySelectionTest.java diff --git a/base/src/org/compiere/model/MPaySelection.java b/base/src/org/compiere/model/MPaySelection.java index a683d73066..09a669e280 100644 --- a/base/src/org/compiere/model/MPaySelection.java +++ b/base/src/org/compiere/model/MPaySelection.java @@ -16,12 +16,9 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.ArrayList; +import java.util.List; import java.util.Properties; -import java.util.logging.Level; - import org.compiere.util.DB; import org.compiere.util.Env; @@ -86,34 +83,12 @@ public class MPaySelection extends X_C_PaySelection set_TrxName(m_lines, get_TrxName()); return m_lines; } - ArrayList list = new ArrayList(); - String sql = "SELECT * FROM C_PaySelectionLine WHERE C_PaySelection_ID=? ORDER BY Line"; - PreparedStatement pstmt = null; - try - { - pstmt = DB.prepareStatement (sql, get_TrxName()); - pstmt.setInt (1, getC_PaySelection_ID()); - ResultSet rs = pstmt.executeQuery (); - while (rs.next ()) - list.add (new MPaySelectionLine(getCtx(), rs, get_TrxName())); - rs.close (); - pstmt.close (); - pstmt = null; - } - catch (Exception e) - { - log.log(Level.SEVERE, "getLines", e); - } - try - { - if (pstmt != null) - pstmt.close (); - pstmt = null; - } - catch (Exception e) - { - pstmt = null; - } + //FR: [ 2214883 ] Remove SQL code and Replace for Query - red1 + String whereClause = "C_PaySelection_ID=?"; + List list = new Query(getCtx(), MPaySelectionLine.Table_Name, whereClause, null) + .setParameters(new Object[]{getC_PaySelection_ID()}) + .setOrderBy("Line") + .list(); // m_lines = new MPaySelectionLine[list.size ()]; list.toArray (m_lines); diff --git a/extend/src/test/functional/MPaySelectionTest.java b/extend/src/test/functional/MPaySelectionTest.java new file mode 100644 index 0000000000..3036e3cf15 --- /dev/null +++ b/extend/src/test/functional/MPaySelectionTest.java @@ -0,0 +1,44 @@ +/****************************************************************************** + * Product: Adempiere ERP & CRM Smart Business Solution * + * Copyright (C) 2008 SC ARHIPAC SERVICE SRL. All Rights Reserved. * + * This program is free software; you can redistribute it and/or modify it * + * under the terms version 2 of the GNU General Public License as published * + * by the Free Software Foundation. This program is distributed in the hope * + * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * + * See the GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., * + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * + *****************************************************************************/ +package test.functional; + +import org.compiere.model.MPaySelection; +import org.compiere.model.MPaySelectionLine; +import org.compiere.util.Env; + +import test.AdempiereTestCase; + +/** + * @author Teo Sarca, www.arhipac.ro + */ +public class MPaySelectionTest extends AdempiereTestCase +{ + private MPaySelection lines = null; + + @Override + protected void setUp() throws Exception + { + super.setUp(); + assertEquals("Client is not GardenWorld", 11, Env.getAD_Client_ID(getCtx())); + } + + public void testQuery() throws Exception + { + lines = new MPaySelection(getCtx(), 100, getTrxName()); + MPaySelectionLine[] payselection = lines.getLines(true); + assertTrue("There should be payment lines", payselection.length > 0); + + } + +}