Skip to content

Instantly share code, notes, and snippets.

@ar

ar/codeFixes.patch

Created May 26, 2012 16:55
Show Gist options
  • Save ar/2794627 to your computer and use it in GitHub Desktop.
Save ar/2794627 to your computer and use it in GitHub Desktop.
Download ZIP
Code Contribution - Christopher
Raw
codeFixes.patch
From 1c37c901400dba8b71c11e7494ef662926901549 Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 09:36:45 +0200
Subject: [PATCH 01/12] Fix double check locking idiom for DefaultTimer lazy
init
---
jpos/src/main/java/org/jpos/util/DefaultTimer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/jpos/src/main/java/org/jpos/util/DefaultTimer.java b/jpos/src/main/java/org/jpos/util/DefaultTimer.java
index af210ea..b480954 100644
--- a/jpos/src/main/java/org/jpos/util/DefaultTimer.java
+++ b/jpos/src/main/java/org/jpos/util/DefaultTimer.java
@@ -27,7 +27,7 @@ import java.util.Timer;
*/
public class DefaultTimer {
- private static Timer defaultTimer = null;
+ private static volatile Timer defaultTimer = null;
private DefaultTimer() { }
--
1.7.7.5 (Apple Git-26)
From 07c25f0665c3692c97e5d88bbce04ab794e262ff Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 09:55:59 +0200
Subject: [PATCH 02/12] Fix double check locking idiom for ISOFieldPackager
delegate
---
fix_double_check_locking_lazy_init.patch | 25 ++++++++++++++++++++
.../java/org/jpos/iso/TaggedFieldPackagerBase.java | 2 +-
2 files changed, 26 insertions(+), 1 deletions(-)
create mode 100644 fix_double_check_locking_lazy_init.patch
diff --git a/fix_double_check_locking_lazy_init.patch b/fix_double_check_locking_lazy_init.patch
new file mode 100644
index 0000000..2d75120
--- /dev/null
+++ b/fix_double_check_locking_lazy_init.patch
@@ -0,0 +1,25 @@
+From 1c37c901400dba8b71c11e7494ef662926901549 Mon Sep 17 00:00:00 2001
+From: Christopher Barham <[email protected]>
+Date: Fri, 25 May 2012 09:36:45 +0200
+Subject: [PATCH] Fix double check locking idiom for DefaultTimer lazy init
+
+---
+ jpos/src/main/java/org/jpos/util/DefaultTimer.java | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/jpos/src/main/java/org/jpos/util/DefaultTimer.java b/jpos/src/main/java/org/jpos/util/DefaultTimer.java
+index af210ea..b480954 100644
+--- a/jpos/src/main/java/org/jpos/util/DefaultTimer.java
++++ b/jpos/src/main/java/org/jpos/util/DefaultTimer.java
+@@ -27,7 +27,7 @@ import java.util.Timer;
+ */
+
+ public class DefaultTimer {
+- private static Timer defaultTimer = null;
++ private static volatile Timer defaultTimer = null;
+
+ private DefaultTimer() { }
+
+--
+1.7.7.5 (Apple Git-26)
+
diff --git a/jpos/src/main/java/org/jpos/iso/TaggedFieldPackagerBase.java b/jpos/src/main/java/org/jpos/iso/TaggedFieldPackagerBase.java
index a92c12e..1096a14 100644
--- a/jpos/src/main/java/org/jpos/iso/TaggedFieldPackagerBase.java
+++ b/jpos/src/main/java/org/jpos/iso/TaggedFieldPackagerBase.java
@@ -33,7 +33,7 @@ import java.io.UnsupportedEncodingException;
public abstract class TaggedFieldPackagerBase extends ISOFieldPackager {
private TagMapper tagMapper;
- private ISOFieldPackager delegate;
+ private volatile ISOFieldPackager delegate;
private int parentFieldNumber;
private boolean packingLenient = false;
private boolean unpackingLenient = false;
--
1.7.7.5 (Apple Git-26)
From bcdcd4a44488aaf18d1bc4593a3e1eb36adfb07a Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 09:56:48 +0200
Subject: [PATCH 03/12] delete file added in error
---
fix_double_check_locking_lazy_init.patch | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
delete mode 100644 fix_double_check_locking_lazy_init.patch
diff --git a/fix_double_check_locking_lazy_init.patch b/fix_double_check_locking_lazy_init.patch
deleted file mode 100644
index 2d75120..0000000
--- a/fix_double_check_locking_lazy_init.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1c37c901400dba8b71c11e7494ef662926901549 Mon Sep 17 00:00:00 2001
-From: Christopher Barham <[email protected]>
-Date: Fri, 25 May 2012 09:36:45 +0200
-Subject: [PATCH] Fix double check locking idiom for DefaultTimer lazy init
-
----
- jpos/src/main/java/org/jpos/util/DefaultTimer.java | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/jpos/src/main/java/org/jpos/util/DefaultTimer.java b/jpos/src/main/java/org/jpos/util/DefaultTimer.java
-index af210ea..b480954 100644
---- a/jpos/src/main/java/org/jpos/util/DefaultTimer.java
-+++ b/jpos/src/main/java/org/jpos/util/DefaultTimer.java
-@@ -27,7 +27,7 @@ import java.util.Timer;
- */
-
- public class DefaultTimer {
-- private static Timer defaultTimer = null;
-+ private static volatile Timer defaultTimer = null;
-
- private DefaultTimer() { }
-
---
-1.7.7.5 (Apple Git-26)
-
--
1.7.7.5 (Apple Git-26)
From 96e636adaea6757e46575de8d07d31ff9cd89f96 Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 11:49:15 +0200
Subject: [PATCH 04/12] minor efficiency chage - Using .isEmpty() instead of
.size() = 0 where possible.
---
jpos/src/main/java/org/jpos/q2/Q2.java | 2 +-
jpos/src/main/java/org/jpos/space/TSpace.java | 4 +-
.../org/jpos/transaction/TransactionManager.java | 2 +-
jpos/src/main/java/org/jpos/util/DirPoll.java | 4 +-
jpos/src/main/java/org/jpos/util/LogEvent.java | 2 +-
jpos/src/main/java/org/jpos/util/SimpleMsg.java | 8 +-
jpos/src/main/java/org/jpos/util/TPS.java | 164 ++++++++++++--------
7 files changed, 109 insertions(+), 77 deletions(-)
diff --git a/jpos/src/main/java/org/jpos/q2/Q2.java b/jpos/src/main/java/org/jpos/q2/Q2.java
index ab8f320..597a163 100644
--- a/jpos/src/main/java/org/jpos/q2/Q2.java
+++ b/jpos/src/main/java/org/jpos/q2/Q2.java
@@ -121,7 +121,7 @@ public class Q2 implements FileFilter, Runnable {
*/
ArrayList mbeanServerList =
MBeanServerFactory.findMBeanServer(null);
- if (mbeanServerList.size() == 0) {
+ if (mbeanServerList.isEmpty()) {
server = MBeanServerFactory.createMBeanServer (JMX_NAME);
} else {
server = (MBeanServer) mbeanServerList.get(0);
diff --git a/jpos/src/main/java/org/jpos/space/TSpace.java b/jpos/src/main/java/org/jpos/space/TSpace.java
index 7af19bb..248c897 100644
--- a/jpos/src/main/java/org/jpos/space/TSpace.java
+++ b/jpos/src/main/java/org/jpos/space/TSpace.java
@@ -350,14 +350,14 @@ public class TSpace<K,V> extends TimerTask implements LocalSpace<K,V>, Loggeable
}
if (obj == null) {
l.remove (0);
- if (l.size() == 0) {
+ if (l.isEmpty()) {
entries.remove (key);
}
}
}
if (obj != null && remove) {
l.remove (0);
- if (l.size() == 0) {
+ if (l.isEmpty()) {
entries.remove (key);
if (wasExpirable)
unregisterExpirable(key);
diff --git a/jpos/src/main/java/org/jpos/transaction/TransactionManager.java b/jpos/src/main/java/org/jpos/transaction/TransactionManager.java
index 5da5f1b..3025c35 100644
--- a/jpos/src/main/java/org/jpos/transaction/TransactionManager.java
+++ b/jpos/src/main/java/org/jpos/transaction/TransactionManager.java
@@ -542,7 +542,7 @@ public class TransactionManager
return PAUSE;
}
}
- return members.size() == 0 ? NO_JOIN :
+ return members.isEmpty() ? NO_JOIN :
(abort ? (retry ? RETRY : ABORTED) : PREPARED);
}
protected List getParticipants (String groupName) {
diff --git a/jpos/src/main/java/org/jpos/util/DirPoll.java b/jpos/src/main/java/org/jpos/util/DirPoll.java
index 02cfb49..91df77b 100644
--- a/jpos/src/main/java/org/jpos/util/DirPoll.java
+++ b/jpos/src/main/java/org/jpos/util/DirPoll.java
@@ -180,7 +180,7 @@ public class DirPoll extends SimpleLogSource
String ext = st.nextToken();
v.addElement (ext.equals ("*") ? "" : ext);
}
- if (v.size() == 0)
+ if (v.isEmpty())
v.addElement ("");
synchronized (this) {
prio = v;
@@ -208,7 +208,7 @@ public class DirPoll extends SimpleLogSource
public void run() {
Thread.currentThread().setName ("DirPoll-"+basePath);
- if (prio.size() == 0)
+ if (prio.isEmpty())
addPriority("");
while (!shutdown) {
synchronized (this) {
diff --git a/jpos/src/main/java/org/jpos/util/LogEvent.java b/jpos/src/main/java/org/jpos/util/LogEvent.java
index 3359559..6c16a97 100644
--- a/jpos/src/main/java/org/jpos/util/LogEvent.java
+++ b/jpos/src/main/java/org/jpos/util/LogEvent.java
@@ -103,7 +103,7 @@ public class LogEvent {
}
public void dump (PrintStream p, String outer) {
String indent = dumpHeader (p, outer);
- if (payLoad.size() == 0) {
+ if (payLoad.isEmpty()) {
if (tag != null)
p.println (indent + "<" + tag + "/>");
}
diff --git a/jpos/src/main/java/org/jpos/util/SimpleMsg.java b/jpos/src/main/java/org/jpos/util/SimpleMsg.java
index 0a7c3e1..7549065 100644
--- a/jpos/src/main/java/org/jpos/util/SimpleMsg.java
+++ b/jpos/src/main/java/org/jpos/util/SimpleMsg.java
@@ -46,19 +46,19 @@ import java.io.PrintStream;
}
public SimpleMsg (String tagName, String msgName, boolean msgContent) {
- this(tagName, msgName, new Boolean(msgContent));
+ this(tagName, msgName, Boolean.valueOf(msgContent));
}
public SimpleMsg (String tagName, String msgName, short msgContent) {
- this(tagName, msgName, new Short(msgContent));
+ this(tagName, msgName, Short.valueOf(msgContent));
}
public SimpleMsg (String tagName, String msgName, int msgContent) {
- this(tagName, msgName, new Integer(msgContent));
+ this(tagName, msgName, Integer.valueOf(msgContent));
}
public SimpleMsg (String tagName, String msgName, long msgContent) {
- this(tagName, msgName, new Long(msgContent));
+ this(tagName, msgName, Long.valueOf(msgContent));
}
/**
diff --git a/jpos/src/main/java/org/jpos/util/TPS.java b/jpos/src/main/java/org/jpos/util/TPS.java
index 3946c50..15996dd 100644
--- a/jpos/src/main/java/org/jpos/util/TPS.java
+++ b/jpos/src/main/java/org/jpos/util/TPS.java
@@ -15,39 +15,40 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package org.jpos.util;
import java.io.PrintStream;
import java.util.Timer;
import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantLock;
/**
- * TPS can be used to measure Transactions Per Second (or transactions during other period of time).
+ * TPS can be used to measure Transactions Per Second (or transactions during
+ * other period of time).
*
- * <p>It can operate in two different modes:
- * <ul>
- * <li>Auto update</li>
- * <li>Manual update</li>
- * </ul></p>
+ * <p>It can operate in two different modes: <ul> <li>Auto update</li>
+ * <li>Manual update</li> </ul></p>
*
- * <p>When operating in <b>auto update</b> mode, a Timer is created and the number of transactions (calls to tick())
- * is automatically calculated for every period. Under this mode, user has to call the
- * <b>stop()</b> method when this TPS object is no longer needed, otherwise it will keep a Thread
+ * <p>When operating in <b>auto update</b> mode, a Timer is created and the
+ * number of transactions (calls to tick()) is automatically calculated for
+ * every period. Under this mode, user has to call the <b>stop()</b> method when
+ * this TPS object is no longer needed, otherwise it will keep a Thread
* lingering around.</p>
*
* <p>When operating in <b>manual update</b> mode, user has to call one of its
- * floatValue() or intValue() method at regular intervals. The returned value will be the average
- * TPS for the given period since the last call</p>.
- *
+ * floatValue() or intValue() method at regular intervals. The returned value
+ * will be the average TPS for the given period since the last call</p>.
+ *
* @author Alejandro Revilla, Jeronimo Paolleti and Thiago Moretto
* @since 1.6.7 r2912
*/
-
@SuppressWarnings("unused")
public class TPS implements Loggeable {
- volatile int count;
- volatile long start;
+
+ AtomicInteger count;
+ AtomicLong start;
int peak;
long peakWhen;
static final long FROM_NANOS = 1000000L;
@@ -56,17 +57,18 @@ public class TPS implements Loggeable {
float avg;
Timer timer;
boolean autoupdate;
+ final ReentrantLock lock = new ReentrantLock();
public TPS() {
- this (1000L, false);
+ this(1000L, false);
}
/**
*
* @param autoupdate
*/
- public TPS (boolean autoupdate) {
- this (1000L, autoupdate);
+ public TPS(boolean autoupdate) {
+ this(1000L, autoupdate);
}
/**
@@ -76,22 +78,22 @@ public class TPS implements Loggeable {
super();
this.period = period;
this.autoupdate = autoupdate;
- start = System.nanoTime() / FROM_NANOS;
+ start.set(System.nanoTime() / FROM_NANOS);
if (autoupdate) {
timer = new Timer();
- timer.schedule (
- new TimerTask() {
- public void run() {
- calcTPS(period);
- }
- }, period, period
- );
+ timer.schedule(
+ new TimerTask() {
+ public void run() {
+ calcTPS(period);
+ }
+ }, period, period);
}
}
- public synchronized void tick() {
- count++;
+ public void tick() {
+ count.incrementAndGet();
}
+
public float floatValue() {
return autoupdate ? tps : calcTPS();
}
@@ -99,65 +101,95 @@ public class TPS implements Loggeable {
public int intValue() {
return Math.round(floatValue());
}
- public float getAvg () {
+
+ public float getAvg() {
return avg;
}
- public int getPeak () {
+
+ public int getPeak() {
return peak;
}
- public long getPeakWhen () {
+
+ public long getPeakWhen() {
return peakWhen;
}
+
/**
* resets average and peak
*/
- synchronized public void reset () {
- avg = 0f;
- peak = 0;
- peakWhen = 0L;
+ public void reset() {
+ lock.lock();
+ try {
+ avg = 0f;
+ peak = 0;
+ peakWhen = 0L;
+ } finally {
+ lock.unlock();
+ }
}
+
public long getPeriod() {
return period;
}
+
public long getElapsed() {
- return System.nanoTime() - start;
+ return System.nanoTime() - start.get();
}
+
public String toString() {
- return String.format ("tps=%d, peak=%d, avg=%.2f", intValue(), getPeak(), getAvg());
+ return String.format("tps=%d, peak=%d, avg=%.2f", intValue(), getPeak(), getAvg());
}
- synchronized public void stop() {
- if (timer != null) {
- timer.cancel();
- timer = null;
- autoupdate = false; // can still use it in manual mode
+
+ public void stop() {
+ lock.lock();
+ try {
+ if (timer != null) {
+ timer.cancel();
+ timer = null;
+ autoupdate = false; // can still use it in manual mode
+ }
+ } finally {
+ lock.unlock();
}
}
+
public void dump(PrintStream p, String indent) {
- p.println (indent
- +"<tps"
- + (autoupdate ? " auto='true'>" : ">")
- + this.toString()
- + "</tps>"
- );
- }
- synchronized private float calcTPS(long interval) {
- tps = (float) period * count / interval;
- avg = (avg + tps) / 2;
- if (tps > peak) {
- peak = Math.round(tps);
- peakWhen = System.currentTimeMillis();
+ p.println(indent
+ + "<tps"
+ + (autoupdate ? " auto='true'>" : ">")
+ + this.toString()
+ + "</tps>");
+ }
+
+ private float calcTPS(long interval) {
+ lock.lock();
+ try {
+ tps = (float) period * count.get() / interval;
+ avg = (avg + tps) / 2;
+ if (tps > peak) {
+ peak = Math.round(tps);
+ peakWhen = System.currentTimeMillis();
+ }
+ count.set(0);
+ return tps;
+ } finally {
+ lock.unlock();
}
- count = 0;
- return tps;
- }
- synchronized private float calcTPS () {
- long now = System.nanoTime() / FROM_NANOS;
- long interval = now - start;
- if (interval >= period) {
- calcTPS (interval);
- start = now;
+ }
+
+ private float calcTPS() {
+ lock.lock();
+ try {
+ long now = System.nanoTime() / FROM_NANOS;
+ long interval = now - start.get();
+ if (interval >= period) {
+ calcTPS(interval);
+ start.set(now);
+ }
+ return tps;
+ } finally {
+ lock.unlock();
}
- return tps;
}
}
\ No newline at end of file
--
1.7.7.5 (Apple Git-26)
From 3329948f05a599703b348a8a9d348a995406d266 Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 11:55:23 +0200
Subject: [PATCH 05/12] minor efficiency chage - Creating new Boolean is
inefficient and typically pointless.
---
.../java/org/jpos/space/JDBMSpaceTestCase.java | 4 ++--
.../test/java/org/jpos/space/JESpaceTestCase.java | 4 ++--
.../test/java/org/jpos/space/TSpaceTestCase.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jpos/src/test/java/org/jpos/space/JDBMSpaceTestCase.java b/jpos/src/test/java/org/jpos/space/JDBMSpaceTestCase.java
index 601dec2..d186379 100644
--- a/jpos/src/test/java/org/jpos/space/JDBMSpaceTestCase.java
+++ b/jpos/src/test/java/org/jpos/space/JDBMSpaceTestCase.java
@@ -29,13 +29,13 @@ public class JDBMSpaceTestCase extends TestCase {
sp = (JDBMSpace<String,Object>) JDBMSpace.getSpace ("target/test-classes/jdbm-space-test");
}
public void testSimpleOut() throws Exception {
- Object o = new Boolean (true);
+ Object o =Boolean.TRUE;
sp.out ("testSimpleOut_Key", o);
Object o1 = sp.in ("testSimpleOut_Key");
assertTrue (o.equals (o1));
}
public void testOutRdpInpRdp() throws Exception {
- Object o = new Boolean (true);
+ Object o = Boolean.TRUE;
String k = "testOutRdpInpRdp_Key";
sp.out (k, o);
assertTrue (o.equals (sp.rdp (k)));
diff --git a/jpos/src/test/java/org/jpos/space/JESpaceTestCase.java b/jpos/src/test/java/org/jpos/space/JESpaceTestCase.java
index 919344e..10713ce 100644
--- a/jpos/src/test/java/org/jpos/space/JESpaceTestCase.java
+++ b/jpos/src/test/java/org/jpos/space/JESpaceTestCase.java
@@ -31,13 +31,13 @@ public class JESpaceTestCase extends TestCase {
JESpace.getSpace ("space-test", "target/test-classes/space-test");
}
public void testSimpleOut() throws Exception {
- Object o = new Boolean (true);
+ Object o = Boolean.TRUE;
sp.out ("testSimpleOut_Key", o);
Object o1 = sp.in ("testSimpleOut_Key");
assertTrue (o.equals (o1));
}
public void testOutRdpInpRdp() throws Exception {
- Object o = new Boolean (true);
+ Object o = Boolean.TRUE;
String k = "testOutRdpInpRdp_Key";
sp.out (k, o);
assertTrue (o.equals (sp.rdp (k)));
diff --git a/jpos/src/test/java/org/jpos/space/TSpaceTestCase.java b/jpos/src/test/java/org/jpos/space/TSpaceTestCase.java
index 74a67d1..52b2127 100644
--- a/jpos/src/test/java/org/jpos/space/TSpaceTestCase.java
+++ b/jpos/src/test/java/org/jpos/space/TSpaceTestCase.java
@@ -60,7 +60,7 @@ public class TSpaceTestCase extends TestCase implements SpaceListener {
assertNull ("ABC", sp.rdp ("testExpiration_Key"));
}
public void testOutRdpInpRdp() throws Exception {
- Object o = new Boolean (true);
+ Object o = Boolean.TRUE;
String k = "testOutRdpInpRdp_Key";
sp.out (k, o);
assertTrue (o.equals (sp.rdp (k)));
--
1.7.7.5 (Apple Git-26)
From b4780a41de7786771245c6462db8a49be137c24d Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 12:01:17 +0200
Subject: [PATCH 06/12] minor efficiency code change - Use StringBuilder
instead of StringBuffer where possible.
---
.../src/main/java/org/jpos/bsh/BSHLogListener.java | 4 +-
jpos/src/main/java/org/jpos/iso/ISOAmount.java | 2 +-
jpos/src/main/java/org/jpos/iso/ISOException.java | 2 +-
jpos/src/main/java/org/jpos/iso/ISOMsg.java | 2 +-
jpos/src/main/java/org/jpos/iso/ISOServer.java | 6 +-
jpos/src/main/java/org/jpos/iso/LeftPadder.java | 2 +-
.../main/java/org/jpos/iso/channel/LogChannel.java | 2 +-
.../org/jpos/iso/channel/TelnetXMLChannel.java | 294 ++++++++++----------
.../main/java/org/jpos/iso/channel/XMLChannel.java | 2 +-
.../java/org/jpos/iso/filter/StatefulFilter.java | 2 +-
.../main/java/org/jpos/iso/gui/ISOMsgPanel.java | 2 +-
.../jpos/iso/packager/CTCSubElementPackager.java | 2 +-
.../org/jpos/iso/packager/CTCSubFieldPackager.java | 2 +-
.../java/org/jpos/iso/packager/VISA1Packager.java | 2 +-
.../main/java/org/jpos/iso/validator/MSGTEST.java | 2 +-
.../main/java/org/jpos/iso/validator/TEST0100.java | 2 +-
jpos/src/main/java/org/jpos/q2/cli/MEM.java | 2 +-
jpos/src/main/java/org/jpos/q2/cli/TAIL.java | 2 +-
jpos/src/main/java/org/jpos/q2/cli/TMMON.java | 2 +-
jpos/src/main/java/org/jpos/q2/iso/QMUX.java | 4 +-
jpos/src/main/java/org/jpos/space/JDBMSpace.java | 2 +-
.../src/main/java/org/jpos/space/SpaceFactory.java | 2 +-
jpos/src/main/java/org/jpos/space/TSpace.java | 2 +-
.../org/jpos/transaction/TransactionManager.java | 2 +-
jpos/src/main/java/org/jpos/util/FSDMsg.java | 2 +-
jpos/src/main/java/org/jpos/util/Profiler.java | 2 +-
26 files changed, 176 insertions(+), 176 deletions(-)
diff --git a/jpos/src/main/java/org/jpos/bsh/BSHLogListener.java b/jpos/src/main/java/org/jpos/bsh/BSHLogListener.java
index dc377f1..c38e436 100644
--- a/jpos/src/main/java/org/jpos/bsh/BSHLogListener.java
+++ b/jpos/src/main/java/org/jpos/bsh/BSHLogListener.java
@@ -100,7 +100,7 @@ public class BSHLogListener implements org.jpos.util.LogListener, org.jpos.core.
protected static String[] replace(String[] src, String[] patterns, String[] to){
String[] ret = new String[src.length];
for(int i=0; i<src.length; i++){
- StringBuffer buff = new StringBuffer(2*src[i].length());
+ StringBuilder buff = new StringBuilder(2*src[i].length());
int begin, end=0;
//begin is the position of the next pattern, end is the end of the last pattern
while ((begin = src[i].indexOf('$',end))>=0 && begin<src[i].length()){
@@ -178,7 +178,7 @@ public class BSHLogListener implements org.jpos.util.LogListener, org.jpos.core.
}
protected String loadCode(File f) throws IOException{
FileReader r = new FileReader(f);
- StringBuffer buf = new StringBuffer((int)f.length());
+ StringBuilder buf = new StringBuilder((int)f.length());
char[] content = new char[(int)f.length()];
int l;
while((l=r.read(content))!=-1) buf.append(content,0,l);
diff --git a/jpos/src/main/java/org/jpos/iso/ISOAmount.java b/jpos/src/main/java/org/jpos/iso/ISOAmount.java
index 4587a18..462c450 100644
--- a/jpos/src/main/java/org/jpos/iso/ISOAmount.java
+++ b/jpos/src/main/java/org/jpos/iso/ISOAmount.java
@@ -105,7 +105,7 @@ public class ISOAmount
return ISOUtil.zeropad (amount.unscaledValue().toString(), 12);
}
public String getAmountAsString() throws ISOException {
- StringBuffer sb = new StringBuffer(16);
+ StringBuilder sb = new StringBuilder(16);
sb.append (ISOUtil.zeropad (Integer.toString (currencyCode),3));
sb.append (Integer.toString(amount.scale() % 10));
sb.append (ISOUtil.zeropad (amount.unscaledValue().toString(), 12));
diff --git a/jpos/src/main/java/org/jpos/iso/ISOException.java b/jpos/src/main/java/org/jpos/iso/ISOException.java
index be9949e..3357942 100644
--- a/jpos/src/main/java/org/jpos/iso/ISOException.java
+++ b/jpos/src/main/java/org/jpos/iso/ISOException.java
@@ -104,7 +104,7 @@ public class ISOException extends Exception implements Loggeable {
p.println (indent + "</"+getTagName()+">");
}
public String toString() {
- StringBuffer buf = new StringBuffer (super.toString());
+ StringBuilder buf = new StringBuilder (super.toString());
if (nested != null)
buf.append (" (" + nested.toString() +")");
return buf.toString();
diff --git a/jpos/src/main/java/org/jpos/iso/ISOMsg.java b/jpos/src/main/java/org/jpos/iso/ISOMsg.java
index f706677..4aa3284 100644
--- a/jpos/src/main/java/org/jpos/iso/ISOMsg.java
+++ b/jpos/src/main/java/org/jpos/iso/ISOMsg.java
@@ -737,7 +737,7 @@ public class ISOMsg extends ISOComponent
* @return a string suitable for a log
*/
public String toString() {
- StringBuffer s = new StringBuffer();
+ StringBuilder s = new StringBuilder();
if (isIncoming())
s.append("<-- ");
else if (isOutgoing())
diff --git a/jpos/src/main/java/org/jpos/iso/ISOServer.java b/jpos/src/main/java/org/jpos/iso/ISOServer.java
index 5b5228c..ee87b76 100644
--- a/jpos/src/main/java/org/jpos/iso/ISOServer.java
+++ b/jpos/src/main/java/org/jpos/iso/ISOServer.java
@@ -460,7 +460,7 @@ public class ISOServer extends Observable
}
}
public String getISOChannelNames () {
- StringBuffer sb = new StringBuffer ();
+ StringBuilder sb = new StringBuilder ();
Iterator iter = channels.entrySet().iterator();
for (int i=0; iter.hasNext(); i++) {
Map.Entry entry = (Map.Entry) iter.next();
@@ -475,7 +475,7 @@ public class ISOServer extends Observable
return sb.toString();
}
public String getCountersAsString () {
- StringBuffer sb = new StringBuffer ();
+ StringBuilder sb = new StringBuilder ();
int cnt[] = getCounters();
sb.append ("connected=");
sb.append (Integer.toString(cnt[0]));
@@ -554,7 +554,7 @@ public class ISOServer extends Observable
ISOChannel c = (ISOChannel) ref.get ();
if (c != null && !LAST.equals (entry.getKey()) && c.isConnected()) {
if (c instanceof BaseChannel) {
- StringBuffer sb = new StringBuffer ();
+ StringBuilder sb = new StringBuilder ();
int[] cc = ((BaseChannel)c).getCounters();
sb.append (inner);
sb.append (entry.getKey());
diff --git a/jpos/src/main/java/org/jpos/iso/LeftPadder.java b/jpos/src/main/java/org/jpos/iso/LeftPadder.java
index 2185b6a..c5b929d 100644
--- a/jpos/src/main/java/org/jpos/iso/LeftPadder.java
+++ b/jpos/src/main/java/org/jpos/iso/LeftPadder.java
@@ -53,7 +53,7 @@ public class LeftPadder implements Padder
*/
public String pad(String data, int maxLength) throws ISOException
{
- StringBuffer padded = new StringBuffer(maxLength);
+ StringBuilder padded = new StringBuilder(maxLength);
int len = data.length();
if (len > maxLength)
{
diff --git a/jpos/src/main/java/org/jpos/iso/channel/LogChannel.java b/jpos/src/main/java/org/jpos/iso/channel/LogChannel.java
index 5ada56e..d261eba 100644
--- a/jpos/src/main/java/org/jpos/iso/channel/LogChannel.java
+++ b/jpos/src/main/java/org/jpos/iso/channel/LogChannel.java
@@ -78,7 +78,7 @@ public class LogChannel extends BaseChannel {
* @exception IOException
*/
protected byte[] streamReceive() throws IOException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
boolean inMsg = false;
while (reader != null) {
String s = reader.readLine();
diff --git a/jpos/src/main/java/org/jpos/iso/channel/TelnetXMLChannel.java b/jpos/src/main/java/org/jpos/iso/channel/TelnetXMLChannel.java
index 9ec04f0..570de9d 100644
--- a/jpos/src/main/java/org/jpos/iso/channel/TelnetXMLChannel.java
+++ b/jpos/src/main/java/org/jpos/iso/channel/TelnetXMLChannel.java
@@ -16,150 +16,150 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.jpos.iso.channel;
-
-import org.jpos.iso.*;
-import org.jpos.iso.packager.XMLPackager;
-
-import java.io.BufferedReader;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-/**
- * Implements an ISOChannel able to exchange <b>jPOS generated</b> (or
- * compliant) XML based ISO-8583 messages through a Telnet session the telnet
- * commands are simply ignored.
- *
- * @author <a href="mailto:[email protected]">Alejandro P. Revilla</a>
- * @author <a href="mailto:[email protected]">Mark Salter</a>
- * @version $Id: TelnetXMLChannel.java 2594 2008-01-22 16:41:31Z apr $
- *
- * @see ISOMsg
- * @see ISOException
- * @see ISOChannel
- */
-public class TelnetXMLChannel extends BaseChannel {
- BufferedReader reader = null;
-
- static final String isomsgStartTag = "<" + XMLPackager.ISOMSG_TAG + ">";
- static final String isomsgEndTag = "</" + XMLPackager.ISOMSG_TAG + ">";
-
- /**
- * Public constructor (used by Class.forName("...").newInstance())
- */
- public TelnetXMLChannel() {
- super();
- }
-
- /**
- * Constructs client ISOChannel
- *
- * @param host
- * server TCP Address
- * @param port
- * server port number
- * @param p
- * an ISOPackager
- * @see ISOPackager
- */
- public TelnetXMLChannel(String host, int port, ISOPackager p) {
- super(host, port, p);
- }
-
- /**
- * Construct server ISOChannel
- *
- * @param p
- * an ISOPackager
- * @see ISOPackager
- * @exception IOException
- */
- public TelnetXMLChannel(ISOPackager p) throws IOException {
- super(p);
- }
-
- /**
- * constructs a server ISOChannel associated with a Server Socket
- *
- * @param p
- * an ISOPackager
- * @param serverSocket
- * where to accept a connection
- * @exception IOException
- * @see ISOPackager
- */
- public TelnetXMLChannel(ISOPackager p, ServerSocket serverSocket)
- throws IOException {
- super(p, serverSocket);
- }
-
- /**
- * @return a byte array with the received message
- * @exception IOException
- */
- protected byte[] streamReceive() throws IOException {
- int sp = 0;
- StringBuffer sb = new StringBuffer();
- while (reader != null) {
- /*
- * Throw away any telnet commands - each is 3 bytes first being
- * x'FF'...
- */
- reader.mark(3); // Mark the current position in case there are no
- // telnet commands (FFnnmm)
- while (reader.read() == 255) {
- reader.skip(2);
- reader.mark(3);
- }
- reader.reset(); // Return to the first byte that was *not* a telnet
- // command (IAC).
-
- // Now the commands are out of the way continue with the xml stream
- // until it closes with </isomsg>.
- String s = reader.readLine();
- if (s == null)
- throw new EOFException();
- int isomsgStart = s.indexOf(isomsgStartTag);
- if (isomsgStart >= 0) {
- sp++;
- sb.append(s, isomsgStart, s.length() - isomsgStart);
- } else {
- int isomsgEnd = s.indexOf(isomsgEndTag);
- if (isomsgEnd >= 0) {
- sb.append(s,0,isomsgEnd + isomsgEndTag.length());
- if (--sp <= 0)
- break;
- } else {
- if (sp > 0)
- sb.append(s);
- }
- }
-
- }
- return sb.toString().getBytes();
- }
-
- protected int getHeaderLength() {
- // XML Channel does not support header
- return 0;
- }
-
- protected void sendMessageHeader(ISOMsg m, int len) {
- // XML Channel does not support header
- }
-
- protected void connect(Socket socket) throws IOException {
- super.connect(socket);
- reader = new BufferedReader(new InputStreamReader(serverIn));
- }
-
- public void disconnect() throws IOException {
- super.disconnect();
- if (reader != null)
- reader.close();
- reader = null;
- }
-}
+package org.jpos.iso.channel;
+
+import org.jpos.iso.*;
+import org.jpos.iso.packager.XMLPackager;
+
+import java.io.BufferedReader;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+/**
+ * Implements an ISOChannel able to exchange <b>jPOS generated</b> (or
+ * compliant) XML based ISO-8583 messages through a Telnet session the telnet
+ * commands are simply ignored.
+ *
+ * @author <a href="mailto:[email protected]">Alejandro P. Revilla</a>
+ * @author <a href="mailto:[email protected]">Mark Salter</a>
+ * @version $Id: TelnetXMLChannel.java 2594 2008-01-22 16:41:31Z apr $
+ *
+ * @see ISOMsg
+ * @see ISOException
+ * @see ISOChannel
+ */
+public class TelnetXMLChannel extends BaseChannel {
+ BufferedReader reader = null;
+
+ static final String isomsgStartTag = "<" + XMLPackager.ISOMSG_TAG + ">";
+ static final String isomsgEndTag = "</" + XMLPackager.ISOMSG_TAG + ">";
+
+ /**
+ * Public constructor (used by Class.forName("...").newInstance())
+ */
+ public TelnetXMLChannel() {
+ super();
+ }
+
+ /**
+ * Constructs client ISOChannel
+ *
+ * @param host
+ * server TCP Address
+ * @param port
+ * server port number
+ * @param p
+ * an ISOPackager
+ * @see ISOPackager
+ */
+ public TelnetXMLChannel(String host, int port, ISOPackager p) {
+ super(host, port, p);
+ }
+
+ /**
+ * Construct server ISOChannel
+ *
+ * @param p
+ * an ISOPackager
+ * @see ISOPackager
+ * @exception IOException
+ */
+ public TelnetXMLChannel(ISOPackager p) throws IOException {
+ super(p);
+ }
+
+ /**
+ * constructs a server ISOChannel associated with a Server Socket
+ *
+ * @param p
+ * an ISOPackager
+ * @param serverSocket
+ * where to accept a connection
+ * @exception IOException
+ * @see ISOPackager
+ */
+ public TelnetXMLChannel(ISOPackager p, ServerSocket serverSocket)
+ throws IOException {
+ super(p, serverSocket);
+ }
+
+ /**
+ * @return a byte array with the received message
+ * @exception IOException
+ */
+ protected byte[] streamReceive() throws IOException {
+ int sp = 0;
+ StringBuilder sb = new StringBuilder();
+ while (reader != null) {
+ /*
+ * Throw away any telnet commands - each is 3 bytes first being
+ * x'FF'...
+ */
+ reader.mark(3); // Mark the current position in case there are no
+ // telnet commands (FFnnmm)
+ while (reader.read() == 255) {
+ reader.skip(2);
+ reader.mark(3);
+ }
+ reader.reset(); // Return to the first byte that was *not* a telnet
+ // command (IAC).
+
+ // Now the commands are out of the way continue with the xml stream
+ // until it closes with </isomsg>.
+ String s = reader.readLine();
+ if (s == null)
+ throw new EOFException();
+ int isomsgStart = s.indexOf(isomsgStartTag);
+ if (isomsgStart >= 0) {
+ sp++;
+ sb.append(s, isomsgStart, s.length() - isomsgStart);
+ } else {
+ int isomsgEnd = s.indexOf(isomsgEndTag);
+ if (isomsgEnd >= 0) {
+ sb.append(s,0,isomsgEnd + isomsgEndTag.length());
+ if (--sp <= 0)
+ break;
+ } else {
+ if (sp > 0)
+ sb.append(s);
+ }
+ }
+
+ }
+ return sb.toString().getBytes();
+ }
+
+ protected int getHeaderLength() {
+ // XML Channel does not support header
+ return 0;
+ }
+
+ protected void sendMessageHeader(ISOMsg m, int len) {
+ // XML Channel does not support header
+ }
+
+ protected void connect(Socket socket) throws IOException {
+ super.connect(socket);
+ reader = new BufferedReader(new InputStreamReader(serverIn));
+ }
+
+ public void disconnect() throws IOException {
+ super.disconnect();
+ if (reader != null)
+ reader.close();
+ reader = null;
+ }
+}
diff --git a/jpos/src/main/java/org/jpos/iso/channel/XMLChannel.java b/jpos/src/main/java/org/jpos/iso/channel/XMLChannel.java
index 47788a1..fbb20a2 100644
--- a/jpos/src/main/java/org/jpos/iso/channel/XMLChannel.java
+++ b/jpos/src/main/java/org/jpos/iso/channel/XMLChannel.java
@@ -83,7 +83,7 @@ public class XMLChannel extends BaseChannel {
*/
protected byte[] streamReceive() throws IOException {
int sp = 0;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while (reader != null) {
String s = reader.readLine();
if (s == null)
diff --git a/jpos/src/main/java/org/jpos/iso/filter/StatefulFilter.java b/jpos/src/main/java/org/jpos/iso/filter/StatefulFilter.java
index 23a5c48..1a6324f 100644
--- a/jpos/src/main/java/org/jpos/iso/filter/StatefulFilter.java
+++ b/jpos/src/main/java/org/jpos/iso/filter/StatefulFilter.java
@@ -156,7 +156,7 @@ public class StatefulFilter implements ISOFilter, Configurable{
throws ISOFilter.VetoException
{
int[] key = getKey();
- StringBuffer b = new StringBuffer(getKeyPrefix());
+ StringBuilder b = new StringBuilder(getKeyPrefix());
for(int i = 0; i < key.length; i++)
b.append("|"+m.getString(key[i]));
String skey = b.toString();
diff --git a/jpos/src/main/java/org/jpos/iso/gui/ISOMsgPanel.java b/jpos/src/main/java/org/jpos/iso/gui/ISOMsgPanel.java
index 4cafe8f..6ba53c7 100644
--- a/jpos/src/main/java/org/jpos/iso/gui/ISOMsgPanel.java
+++ b/jpos/src/main/java/org/jpos/iso/gui/ISOMsgPanel.java
@@ -169,7 +169,7 @@ public class ISOMsgPanel extends JPanel {
t.setFont(new Font ("Helvetica", Font.PLAIN, 8));
t.setLineWrap(true);
try {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (m.getHeader() != null)
buf.append("--[Header]--\n"
+ISOUtil.hexString(m.getHeader()) + "\n--[Msg]--\n");
diff --git a/jpos/src/main/java/org/jpos/iso/packager/CTCSubElementPackager.java b/jpos/src/main/java/org/jpos/iso/packager/CTCSubElementPackager.java
index 14d478b..70218dd 100644
--- a/jpos/src/main/java/org/jpos/iso/packager/CTCSubElementPackager.java
+++ b/jpos/src/main/java/org/jpos/iso/packager/CTCSubElementPackager.java
@@ -47,7 +47,7 @@ public class CTCSubElementPackager extends ISOBaseValidatingPackager {
public byte[] pack ( ISOComponent c ) throws ISOException {
try {
Map tab = c.getChildren();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for ( int i = 0; i < fld.length; i++ ) {
ISOMsg f = (ISOMsg) tab.get (new Integer(i));
if ( f != null ) {
diff --git a/jpos/src/main/java/org/jpos/iso/packager/CTCSubFieldPackager.java b/jpos/src/main/java/org/jpos/iso/packager/CTCSubFieldPackager.java
index b1c439d..6a0a1d2 100644
--- a/jpos/src/main/java/org/jpos/iso/packager/CTCSubFieldPackager.java
+++ b/jpos/src/main/java/org/jpos/iso/packager/CTCSubFieldPackager.java
@@ -46,7 +46,7 @@ public class CTCSubFieldPackager extends ISOBaseValidatingPackager {
public byte[] pack ( ISOComponent c ) throws ISOException {
try {
Map tab = c.getChildren();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for ( int i = 0; i < fld.length; i++ ) {
ISOField f = (ISOField) tab.get (new Integer(i));
if ( f != null ) {
diff --git a/jpos/src/main/java/org/jpos/iso/packager/VISA1Packager.java b/jpos/src/main/java/org/jpos/iso/packager/VISA1Packager.java
index 5ea3dcf..48033fa 100644
--- a/jpos/src/main/java/org/jpos/iso/packager/VISA1Packager.java
+++ b/jpos/src/main/java/org/jpos/iso/packager/VISA1Packager.java
@@ -136,7 +136,7 @@ public class VISA1Packager
}
public String guessAutNumber (String s) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i=0; i<s.length(); i++)
if (Character.isDigit(s.charAt(i)))
buf.append (s.charAt(i));
diff --git a/jpos/src/main/java/org/jpos/iso/validator/MSGTEST.java b/jpos/src/main/java/org/jpos/iso/validator/MSGTEST.java
index 0127958..ffad3d3 100644
--- a/jpos/src/main/java/org/jpos/iso/validator/MSGTEST.java
+++ b/jpos/src/main/java/org/jpos/iso/validator/MSGTEST.java
@@ -43,7 +43,7 @@ public class MSGTEST extends ISOBaseValidator {
private String makeStrFromArray( int[] validFields ){
if ( validFields == null ) return null;
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < validFields.length; i++){
result.append( validFields[i] );
result.append( ", " );
diff --git a/jpos/src/main/java/org/jpos/iso/validator/TEST0100.java b/jpos/src/main/java/org/jpos/iso/validator/TEST0100.java
index d6c2344..c4ef55a 100644
--- a/jpos/src/main/java/org/jpos/iso/validator/TEST0100.java
+++ b/jpos/src/main/java/org/jpos/iso/validator/TEST0100.java
@@ -77,7 +77,7 @@ public class TEST0100 extends ISOBaseValidator {
private String makeStrFromArray( int[] validFields ){
if ( validFields == null ) return null;
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < validFields.length; i++){
result.append( validFields[i] );
result.append( ", " );
diff --git a/jpos/src/main/java/org/jpos/q2/cli/MEM.java b/jpos/src/main/java/org/jpos/q2/cli/MEM.java
index 27156d4..77eb753 100644
--- a/jpos/src/main/java/org/jpos/q2/cli/MEM.java
+++ b/jpos/src/main/java/org/jpos/q2/cli/MEM.java
@@ -30,7 +30,7 @@ public class MEM implements CLICommand
System.gc();
}
Runtime r = Runtime.getRuntime();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("total=");
sb.append(r.totalMemory());
sb.append(" free=");
diff --git a/jpos/src/main/java/org/jpos/q2/cli/TAIL.java b/jpos/src/main/java/org/jpos/q2/cli/TAIL.java
index 0e8bfb0..eb45b2e 100644
--- a/jpos/src/main/java/org/jpos/q2/cli/TAIL.java
+++ b/jpos/src/main/java/org/jpos/q2/cli/TAIL.java
@@ -101,7 +101,7 @@ public class TAIL implements CLICommand, LogListener
NameRegistrar nr = NameRegistrar.getInstance();
int maxw = 0;
Iterator iter = nr.getMap().entrySet().iterator();
- StringBuffer sb = new StringBuffer("available loggers:");
+ StringBuilder sb = new StringBuilder("available loggers:");
while (iter.hasNext())
{
Map.Entry entry = (Map.Entry) iter.next();
diff --git a/jpos/src/main/java/org/jpos/q2/cli/TMMON.java b/jpos/src/main/java/org/jpos/q2/cli/TMMON.java
index 4d5107d..af25b7f 100644
--- a/jpos/src/main/java/org/jpos/q2/cli/TMMON.java
+++ b/jpos/src/main/java/org/jpos/q2/cli/TMMON.java
@@ -92,7 +92,7 @@ public class TMMON implements CLICommand, TransactionStatusListener
NameRegistrar nr = NameRegistrar.getInstance();
int maxw = 0;
Iterator iter = NameRegistrar.getMap().entrySet().iterator();
- StringBuffer sb = new StringBuffer("available transaction managers:");
+ StringBuilder sb = new StringBuilder("available transaction managers:");
while (iter.hasNext())
{
Map.Entry entry = (Map.Entry) iter.next();
diff --git a/jpos/src/main/java/org/jpos/q2/iso/QMUX.java b/jpos/src/main/java/org/jpos/q2/iso/QMUX.java
index be066ef..d9c18a6 100644
--- a/jpos/src/main/java/org/jpos/q2/iso/QMUX.java
+++ b/jpos/src/main/java/org/jpos/q2/iso/QMUX.java
@@ -175,7 +175,7 @@ public class QMUX
}
public String getKey (ISOMsg m) throws ISOException {
- StringBuffer sb = new StringBuffer (out);
+ StringBuilder sb = new StringBuilder (out);
sb.append ('.');
sb.append (mapMTI(m.getMTI()));
if (headerIsKey && m.getHeader()!=null) {
@@ -206,7 +206,7 @@ public class QMUX
return sb.toString();
}
private String mapMTI (String mti) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (mti != null && mti.length() == 4) {
for (int i=0; i<mtiMapping.length; i++) {
int c = mti.charAt (i) - '0';
diff --git a/jpos/src/main/java/org/jpos/space/JDBMSpace.java b/jpos/src/main/java/org/jpos/space/JDBMSpace.java
index e0c5242..cdf0a67 100644
--- a/jpos/src/main/java/org/jpos/space/JDBMSpace.java
+++ b/jpos/src/main/java/org/jpos/space/JDBMSpace.java
@@ -485,7 +485,7 @@ public class JDBMSpace<K,V> extends TimerTask implements Space<K,V> {
}
}
public String getKeys () {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
try {
FastIterator iter = htree.keys ();
Object obj;
diff --git a/jpos/src/main/java/org/jpos/space/SpaceFactory.java b/jpos/src/main/java/org/jpos/space/SpaceFactory.java
index 93c7fef..8a1bb56 100644
--- a/jpos/src/main/java/org/jpos/space/SpaceFactory.java
+++ b/jpos/src/main/java/org/jpos/space/SpaceFactory.java
@@ -139,7 +139,7 @@ public class SpaceFactory {
return sp;
}
private static String normalize (String scheme, String name, String param) {
- StringBuffer sb = new StringBuffer (scheme);
+ StringBuilder sb = new StringBuilder (scheme);
sb.append (':');
sb.append (name);
if (param != null) {
diff --git a/jpos/src/main/java/org/jpos/space/TSpace.java b/jpos/src/main/java/org/jpos/space/TSpace.java
index 248c897..8dfb4ba 100644
--- a/jpos/src/main/java/org/jpos/space/TSpace.java
+++ b/jpos/src/main/java/org/jpos/space/TSpace.java
@@ -189,7 +189,7 @@ public class TSpace<K,V> extends TimerTask implements LocalSpace<K,V>, Loggeable
return entries.keySet();
}
public String getKeysAsString () {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Object[] keys;
synchronized (this) {
keys = entries.keySet().toArray();
diff --git a/jpos/src/main/java/org/jpos/transaction/TransactionManager.java b/jpos/src/main/java/org/jpos/transaction/TransactionManager.java
index 3025c35..ce4683c 100644
--- a/jpos/src/main/java/org/jpos/transaction/TransactionManager.java
+++ b/jpos/src/main/java/org/jpos/transaction/TransactionManager.java
@@ -624,7 +624,7 @@ public class TransactionManager
return -1;
}
protected String getKey (String prefix, long id) {
- StringBuffer sb = new StringBuffer (getName());
+ StringBuilder sb = new StringBuilder (getName());
sb.append ('.');
sb.append (prefix);
sb.append (Long.toString (id));
diff --git a/jpos/src/main/java/org/jpos/util/FSDMsg.java b/jpos/src/main/java/org/jpos/util/FSDMsg.java
index 7774de8..22028d2 100644
--- a/jpos/src/main/java/org/jpos/util/FSDMsg.java
+++ b/jpos/src/main/java/org/jpos/util/FSDMsg.java
@@ -442,7 +442,7 @@ public class FSDMsg implements Loggeable, Cloneable {
protected String read (InputStream is, int len, String type, String separator)
throws IOException
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
byte[] b = new byte[1];
boolean expectSeparator = isSeparated(separator);
boolean separated = expectSeparator;
diff --git a/jpos/src/main/java/org/jpos/util/Profiler.java b/jpos/src/main/java/org/jpos/util/Profiler.java
index 40cafb9..e37b8b0 100644
--- a/jpos/src/main/java/org/jpos/util/Profiler.java
+++ b/jpos/src/main/java/org/jpos/util/Profiler.java
@@ -130,7 +130,7 @@ public class Profiler implements Loggeable {
return totalDuration;
}
public String toString() {
- StringBuffer sb = new StringBuffer (eventName);
+ StringBuilder sb = new StringBuilder (eventName);
sb.append (" [");
sb.append (getDuration());
sb.append ('.');
--
1.7.7.5 (Apple Git-26)
From 531a5c09d421e4a79e318d5c50cf920f9140b208 Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 12:06:59 +0200
Subject: [PATCH 07/12] minor code change - remove string concatenation in the
parameter of an invocation of the append method of
StringBuilder or StringBuffer
---
jpos/src/main/java/org/jpos/iso/ISOException.java | 7 +++++--
.../java/org/jpos/iso/filter/StatefulFilter.java | 6 ++++--
.../main/java/org/jpos/iso/gui/ISOMsgPanel.java | 8 +++++---
.../jpos/iso/packager/CTCSubElementPackager.java | 3 ++-
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/jpos/src/main/java/org/jpos/iso/ISOException.java b/jpos/src/main/java/org/jpos/iso/ISOException.java
index 3357942..b0f456e 100644
--- a/jpos/src/main/java/org/jpos/iso/ISOException.java
+++ b/jpos/src/main/java/org/jpos/iso/ISOException.java
@@ -105,8 +105,11 @@ public class ISOException extends Exception implements Loggeable {
}
public String toString() {
StringBuilder buf = new StringBuilder (super.toString());
- if (nested != null)
- buf.append (" (" + nested.toString() +")");
+ if (nested != null) {
+ buf.append(" (");
+ buf.append(nested.toString());
+ buf.append(")");
+ }
return buf.toString();
}
diff --git a/jpos/src/main/java/org/jpos/iso/filter/StatefulFilter.java b/jpos/src/main/java/org/jpos/iso/filter/StatefulFilter.java
index 1a6324f..c990448 100644
--- a/jpos/src/main/java/org/jpos/iso/filter/StatefulFilter.java
+++ b/jpos/src/main/java/org/jpos/iso/filter/StatefulFilter.java
@@ -157,8 +157,10 @@ public class StatefulFilter implements ISOFilter, Configurable{
{
int[] key = getKey();
StringBuilder b = new StringBuilder(getKeyPrefix());
- for(int i = 0; i < key.length; i++)
- b.append("|"+m.getString(key[i]));
+ for(int i = 0; i < key.length; i++){
+ b.append("|");
+ b.append(m.getString(key[i]));
+ }
String skey = b.toString();
if(m.getDirection() == getMatchDirection()){
int[] savedFields = getSavedFields();
diff --git a/jpos/src/main/java/org/jpos/iso/gui/ISOMsgPanel.java b/jpos/src/main/java/org/jpos/iso/gui/ISOMsgPanel.java
index 6ba53c7..608f517 100644
--- a/jpos/src/main/java/org/jpos/iso/gui/ISOMsgPanel.java
+++ b/jpos/src/main/java/org/jpos/iso/gui/ISOMsgPanel.java
@@ -170,9 +170,11 @@ public class ISOMsgPanel extends JPanel {
t.setLineWrap(true);
try {
StringBuilder buf = new StringBuilder();
- if (m.getHeader() != null)
- buf.append("--[Header]--\n"
- +ISOUtil.hexString(m.getHeader()) + "\n--[Msg]--\n");
+ if (m.getHeader() != null) {
+ buf.append("--[Header]--\n");
+ buf.append(ISOUtil.hexString(m.getHeader()));
+ buf.append("\n--[Msg]--\n");
+ }
byte[] b = m.pack();
buf.append (ISOUtil.hexString(b));
t.setText(buf.toString());
diff --git a/jpos/src/main/java/org/jpos/iso/packager/CTCSubElementPackager.java b/jpos/src/main/java/org/jpos/iso/packager/CTCSubElementPackager.java
index 70218dd..cbf9f16 100644
--- a/jpos/src/main/java/org/jpos/iso/packager/CTCSubElementPackager.java
+++ b/jpos/src/main/java/org/jpos/iso/packager/CTCSubElementPackager.java
@@ -51,7 +51,8 @@ public class CTCSubElementPackager extends ISOBaseValidatingPackager {
for ( int i = 0; i < fld.length; i++ ) {
ISOMsg f = (ISOMsg) tab.get (new Integer(i));
if ( f != null ) {
- sb.append ( ISOUtil.zeropad( ((Integer)f.getKey()).toString(), 2 ) + new String( fld[i].pack( f ) ) );
+ sb.append (ISOUtil.zeropad( ((Integer)f.getKey()).toString(), 2 ) );
+ sb.append(new String( fld[i].pack( f ) ) );
}
}
return sb.toString().getBytes();
--
1.7.7.5 (Apple Git-26)
From 433072849e1fe68c8c57ac0972a6bb6184a24b4a Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 12:08:59 +0200
Subject: [PATCH 08/12] minor code change - Use of java.lang.String
constructor is usually useless
---
.../main/java/org/jpos/q2/CLICommandInterface.java | 2 +-
jpos/src/main/java/org/jpos/tlv/TLVMsg.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jpos/src/main/java/org/jpos/q2/CLICommandInterface.java b/jpos/src/main/java/org/jpos/q2/CLICommandInterface.java
index c347d40..09c9450 100644
--- a/jpos/src/main/java/org/jpos/q2/CLICommandInterface.java
+++ b/jpos/src/main/java/org/jpos/q2/CLICommandInterface.java
@@ -118,7 +118,7 @@ public class CLICommandInterface
String[] args = new String[st.countTokens()];
for (int i = 0; st.hasMoreTokens(); i++)
{
- args[i] = new String(st.nextToken());
+ args[i] = st.nextToken();
}
return args;
}
diff --git a/jpos/src/main/java/org/jpos/tlv/TLVMsg.java b/jpos/src/main/java/org/jpos/tlv/TLVMsg.java
index 1fa9058..b4232ed 100644
--- a/jpos/src/main/java/org/jpos/tlv/TLVMsg.java
+++ b/jpos/src/main/java/org/jpos/tlv/TLVMsg.java
@@ -153,7 +153,7 @@ public class TLVMsg {
* @return value
*/
public String getStringValue() {
- return new String(ISOUtil.hexString(value));
+ return ISOUtil.hexString(value);
}
}
--
1.7.7.5 (Apple Git-26)
From 3a055faec8f73d5cd73c283428008a54c2a0d2b3 Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 12:52:43 +0200
Subject: [PATCH 09/12] minor code change - change from obsolete Hashtable
collection to HashMap with synchronization where
applicable
---
.../java/org/jpos/iso/validator/MSGTEST02.java | 2 +-
.../main/java/org/jpos/util/DailyLogListener.java | 6 +-
.../main/java/org/jpos/util/FilterLogListener.java | 2 +-
.../src/main/java/org/jpos/util/NameRegistrar.java | 91 +++++++++++++------
4 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/jpos/src/main/java/org/jpos/iso/validator/MSGTEST02.java b/jpos/src/main/java/org/jpos/iso/validator/MSGTEST02.java
index 6b848cd..1d14316 100644
--- a/jpos/src/main/java/org/jpos/iso/validator/MSGTEST02.java
+++ b/jpos/src/main/java/org/jpos/iso/validator/MSGTEST02.java
@@ -45,7 +45,7 @@ public class MSGTEST02 extends ISOBaseValidator {
private String makeStrFromArray( int[] validFields ){
if ( validFields == null ) return null;
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < validFields.length; i++){
result.append( validFields[i] );
result.append( ", " );
diff --git a/jpos/src/main/java/org/jpos/util/DailyLogListener.java b/jpos/src/main/java/org/jpos/util/DailyLogListener.java
index 9ebbc37..ff89b83 100644
--- a/jpos/src/main/java/org/jpos/util/DailyLogListener.java
+++ b/jpos/src/main/java/org/jpos/util/DailyLogListener.java
@@ -27,7 +27,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.GZIPOutputStream;
@@ -35,7 +35,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
/**
- * Rotates log daily and compress the prevoius log.
+ * Rotates log daily and compress the previous log.
* @author <a href="mailto:[email protected]">Andr&eacute;s Alcarraz</a>
* @since jPOS 1.5.1
*/
@@ -50,7 +50,7 @@ public class DailyLogListener extends RotateLogListener{
private static final int DEF_COMPRESSION = NONE;
private static final int DEF_BUFFER_SIZE = 128*1024;//128 KB
private static final String[] DEF_COMPRESSED_SUFFIX= {"",".gz",".zip"};
- private static final Map<String,Integer> COMPRESSION_FORMATS = new Hashtable<String,Integer>();
+ private static final Map<String,Integer> COMPRESSION_FORMATS = new HashMap<String,Integer>(3);
static {
COMPRESSION_FORMATS.put("none", NONE);
COMPRESSION_FORMATS.put("gzip", GZIP);
diff --git a/jpos/src/main/java/org/jpos/util/FilterLogListener.java b/jpos/src/main/java/org/jpos/util/FilterLogListener.java
index 026e0d8..1580874 100644
--- a/jpos/src/main/java/org/jpos/util/FilterLogListener.java
+++ b/jpos/src/main/java/org/jpos/util/FilterLogListener.java
@@ -41,7 +41,7 @@ public class FilterLogListener implements LogListener,Configurable
private static Hashtable levels;
static{
- levels = new Hashtable();
+ levels = new Hashtable(6);
levels.put(Log.TRACE, 1);
levels.put(Log.DEBUG, 2);
levels.put(Log.INFO, 3);
diff --git a/jpos/src/main/java/org/jpos/util/NameRegistrar.java b/jpos/src/main/java/org/jpos/util/NameRegistrar.java
index 5c108d2..f6c60b4 100644
--- a/jpos/src/main/java/org/jpos/util/NameRegistrar.java
+++ b/jpos/src/main/java/org/jpos/util/NameRegistrar.java
@@ -15,29 +15,35 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package org.jpos.util;
import java.io.PrintStream;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Allow runtime binding of jPOS's components (ISOChannels, Logger, MUXes, etc)
+ *
* @author <a href="mailto:[email protected]">Alejandro P. Revilla</a>
* @version $Revision$ $Date$
*/
public class NameRegistrar implements Loggeable {
+
private static NameRegistrar instance = new NameRegistrar();
private Map registrar;
+ private static ReadWriteLock LOCK = new ReentrantReadWriteLock();
public static class NotFoundException extends Exception {
private static final long serialVersionUID = 8744022794646381475L;
+
public NotFoundException() {
super();
}
+
public NotFoundException(String detail) {
super(detail);
}
@@ -45,74 +51,101 @@ public class NameRegistrar implements Loggeable {
private NameRegistrar() {
super();
- registrar = new Hashtable();
+ registrar = new HashMap();
}
+
public static Map getMap() {
return getInstance().registrar;
}
+
/**
* @return singleton instance
*/
public static NameRegistrar getInstance() {
return instance;
}
+
/**
* register object
+ *
* @param key - key with which the specified value is to be associated.
* @param value - value to be associated with the specified key
*/
- public static void register (String key, Object value) {
+ public static void register(String key, Object value) {
Map map = getMap();
- synchronized (map) {
- map.put (key, value);
+ LOCK.writeLock().lock();
+ try {
+ map.put(key, value);
+ } finally {
+ LOCK.writeLock().unlock();
}
}
+
/**
* @param key key whose mapping is to be removed from registrar.
*/
- public static void unregister (String key) {
+ public static void unregister(String key) {
Map map = getMap();
- synchronized (map) {
- map.remove (key);
+ LOCK.writeLock().lock();
+ try {
+ map.remove(key);
+ } finally {
+ LOCK.writeLock().unlock();
}
}
+
/**
* @param key key whose associated value is to be returned.
* @throws NotFoundException if key not present in registrar
*/
- public static Object get (String key) throws NotFoundException {
- Object obj = getMap().get(key);
- if (obj == null)
- throw new NotFoundException (key);
- return obj;
+ public static Object get(String key) throws NotFoundException {
+ LOCK.readLock().lock();
+ try {
+ Object obj = getMap().get(key);
+ if (obj == null) {
+ throw new NotFoundException(key);
+ }
+ return obj;
+ } finally {
+ LOCK.readLock().unlock();
+ }
}
+
/**
- * @param key key whose associated value is to be returned, null if not present.
+ * @param key key whose associated value is to be returned, null if not
+ * present.
*/
- public static Object getIfExists (String key) {
- return getMap().get(key);
+ public static Object getIfExists(String key) {
+ LOCK.readLock().lock();
+ try {
+ return getMap().get(key);
+ } finally {
+ LOCK.readLock().unlock();
+ }
}
- public void dump (PrintStream p, String indent) {
- dump(p,indent,false);
+ public void dump(PrintStream p, String indent) {
+ dump(p, indent, false);
}
- public void dump (PrintStream p, String indent, boolean detail) {
+
+ public void dump(PrintStream p, String indent, boolean detail) {
String inner = indent + " ";
- p.println (indent + "--- name-registrar ---");
- synchronized (registrar) {
+ p.println(indent + "--- name-registrar ---");
+ LOCK.readLock().lock();
+ try {
Iterator iter = registrar.entrySet().iterator();
while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next ();
+ Map.Entry entry = (Map.Entry) iter.next();
Object obj = entry.getValue();
- p.println (inner +
- entry.getKey().toString() + ": " +
- obj.getClass().getName()
- );
+ p.println(inner
+ + entry.getKey().toString() + ": "
+ + obj.getClass().getName());
if (detail && obj instanceof Loggeable) {
- ((Loggeable)obj).dump(p, inner+" ");
+ ((Loggeable) obj).dump(p, inner + " ");
}
}
+ } finally {
+ LOCK.readLock().unlock();
}
}
}
-
--
1.7.7.5 (Apple Git-26)
From b3de156bcccdc5b78b124d44cc6d4ce02746ee29 Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 15:17:34 +0200
Subject: [PATCH 10/12] rework unit test for NameRegistrar
---
.../src/main/java/org/jpos/util/NameRegistrar.java | 14 +-
.../test/java/org/jpos/util/NameRegistrarTest.java | 155 +++++++-------------
2 files changed, 58 insertions(+), 111 deletions(-)
diff --git a/jpos/src/main/java/org/jpos/util/NameRegistrar.java b/jpos/src/main/java/org/jpos/util/NameRegistrar.java
index f6c60b4..99317ec 100644
--- a/jpos/src/main/java/org/jpos/util/NameRegistrar.java
+++ b/jpos/src/main/java/org/jpos/util/NameRegistrar.java
@@ -19,7 +19,6 @@ package org.jpos.util;
import java.io.PrintStream;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -33,7 +32,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class NameRegistrar implements Loggeable {
private static NameRegistrar instance = new NameRegistrar();
- private Map registrar;
+ private Map<String,Object> registrar = new HashMap<String,Object>();
private static ReadWriteLock LOCK = new ReentrantReadWriteLock();
public static class NotFoundException extends Exception {
@@ -51,10 +50,9 @@ public class NameRegistrar implements Loggeable {
private NameRegistrar() {
super();
- registrar = new HashMap();
}
- public static Map getMap() {
+ public static Map<String,Object> getMap() {
return getInstance().registrar;
}
@@ -72,7 +70,7 @@ public class NameRegistrar implements Loggeable {
* @param value - value to be associated with the specified key
*/
public static void register(String key, Object value) {
- Map map = getMap();
+ Map<String,Object> map = getMap();
LOCK.writeLock().lock();
try {
map.put(key, value);
@@ -85,7 +83,7 @@ public class NameRegistrar implements Loggeable {
* @param key key whose mapping is to be removed from registrar.
*/
public static void unregister(String key) {
- Map map = getMap();
+ Map<String,Object> map = getMap();
LOCK.writeLock().lock();
try {
map.remove(key);
@@ -133,9 +131,7 @@ public class NameRegistrar implements Loggeable {
p.println(indent + "--- name-registrar ---");
LOCK.readLock().lock();
try {
- Iterator iter = registrar.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Map.Entry<String,Object> entry : registrar.entrySet()) {
Object obj = entry.getValue();
p.println(inner
+ entry.getKey().toString() + ": "
diff --git a/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java b/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
index 0ff506a..3b56c3b 100644
--- a/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
+++ b/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
@@ -18,146 +18,97 @@
package org.jpos.util;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThat;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
+import org.junit.Before;
import org.junit.Test;
public class NameRegistrarTest {
- @Test
- public void testDump() throws Throwable {
- NameRegistrar.getInstance().dump(new PrintStream(new ByteArrayOutputStream()), "testNameRegistrarIndent");
- assertTrue("Test completed without Exception", true);
- // dependencies on static and environment state led to removal of 1
- // assertion
- }
+ private static final boolean WITH_DETAIL = true;
- @Test
- public void testDump1() throws Throwable {
- NameRegistrar.getInstance().dump(new PrintStream(new ByteArrayOutputStream()), "testNameRegistrarIndent", false);
- assertTrue("Test completed without Exception", true);
- // dependencies on static and environment state led to removal of 1
- // assertion
+ @Before
+ public void setup() {
+ NameRegistrar.register("test1", "testValue1");
+ NameRegistrar.register("test2", "testValue2");
}
@Test
- public void testDump2() throws Throwable {
- NameRegistrar.getInstance().dump(new PrintStream(new ByteArrayOutputStream()), "testNameRegistrarIndent", true);
- assertTrue("Test completed without Exception", true);
- // dependencies on static and environment state led to removal of 1
- // assertion
- }
+ public void testDumpWithoutDetailAndIndent() throws Throwable {
+ String expected = "testNameRegistrarIndent--- name-registrar ---\n"
+ + "testNameRegistrarIndent test1: java.lang.String\n"
+ + "testNameRegistrarIndent test2: java.lang.String\n";
- @Test
- public void testDumpThrowsNullPointerException() throws Throwable {
- try {
- NameRegistrar.getInstance().dump(null, "testNameRegistrarIndent");
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertTrue("Test completed without Exception", true);
- // dependencies on static and environment state led to removal of 3
- // assertions
- }
- }
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ NameRegistrar.getInstance().dump(new PrintStream(out),
+ "testNameRegistrarIndent");
- @Test
- public void testDumpThrowsNullPointerException1() throws Throwable {
- try {
- NameRegistrar.getInstance().dump(null, "testNameRegistrarIndent", true);
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertTrue("Test completed without Exception", true);
- // dependencies on static and environment state led to removal of 3
- // assertions
- }
+ String result = out.toString();
+ assertThat(result, is(expected));
}
@Test
- public void testGetInstance() throws Throwable {
- NameRegistrar result = NameRegistrar.getInstance();
- assertNotNull("result", result);
- }
+ public void testDumpWithDetailAndIndent() throws Throwable {
+ String expected = "+--- name-registrar ---\n"
+ + "+ test1: java.lang.String\n"
+ + "+ test2: java.lang.String\n";
- @Test
- public void testGetMap() throws Throwable {
- NameRegistrar.getMap();
- assertTrue("Test completed without Exception", true);
- // dependencies on static and environment state led to removal of 3
- // assertions
- }
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ NameRegistrar.getInstance()
+ .dump(new PrintStream(out), "+", WITH_DETAIL);
- @Test
- public void testGetThrowsNotFoundException() throws Throwable {
- try {
- NameRegistrar.get("2C");
- fail("Expected NotFoundException to be thrown");
- } catch (NameRegistrar.NotFoundException ex) {
- assertEquals("ex.getMessage()", "2C", ex.getMessage());
- }
+ String result = out.toString();
+ assertThat(result, is(expected));
}
@Test
- public void testGetThrowsNullPointerException() throws Throwable {
- try {
- NameRegistrar.get(null);
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ public void testGetInstance() throws Throwable {
+ NameRegistrar result = NameRegistrar.getInstance();
+ assertThat(result, is(sameInstance(NameRegistrar.getInstance())));
}
@Test
- public void testNotFoundExceptionConstructor() throws Throwable {
- new NameRegistrar.NotFoundException();
- assertTrue("Test completed without Exception", true);
+ public void testGet() throws Exception {
+ String value = (String) NameRegistrar.get("test1");
+ assertThat(value, is("testValue1"));
}
- @Test
- public void testNotFoundExceptionConstructor1() throws Throwable {
- NameRegistrar.NotFoundException notFoundException = new NameRegistrar.NotFoundException("testNotFoundExceptionDetail");
- assertEquals("notFoundException.getMessage()", "testNotFoundExceptionDetail", notFoundException.getMessage());
+ @Test(expected = NameRegistrar.NotFoundException.class)
+ public void testGetThrowsNotFoundException() throws Throwable {
+ NameRegistrar.get("NonexistentKey");
}
@Test
- public void testRegister() throws Throwable {
- NameRegistrar.register("testNameRegistrarKey", "");
- assertTrue("Test completed without Exception", true);
- // dependencies on static and environment state led to removal of 1
- // assertion
+ public void testGetIfExists() throws Throwable {
+ String value = (String) NameRegistrar.getIfExists("test2");
+ assertThat(value, is("testValue2"));
}
@Test
- public void testRegisterThrowsNullPointerException() throws Throwable {
- try {
- NameRegistrar.register(null, Integer.valueOf(1));
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ public void testGetIfExistsWithNotFoundKey() throws Exception {
+ String value = (String) NameRegistrar.getIfExists("NonexistentKey");
+ assertThat(value, is(nullValue()));
}
- @Test
- public void testUnregister() throws Throwable {
- NameRegistrar.unregister("testNameRegistrarKey");
- assertTrue("Test completed without Exception", true);
- // dependencies on static and environment state led to removal of 1
- // assertion
+ @Test(expected = NameRegistrar.NotFoundException.class)
+ public void testUnregister() throws Exception {
+ NameRegistrar.unregister("test1");
+ NameRegistrar.get("test1");
}
@Test
- public void testUnregisterThrowsNullPointerException() throws Throwable {
- try {
- NameRegistrar.unregister(null);
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ public void testNotFoundExceptionConstructor1() throws Throwable {
+ NameRegistrar.NotFoundException notFoundException = new NameRegistrar.NotFoundException(
+ "testNotFoundExceptionDetail");
+ assertEquals("notFoundException.getMessage()",
+ "testNotFoundExceptionDetail", notFoundException.getMessage());
}
+
}
--
1.7.7.5 (Apple Git-26)
From 8f2d34cf1192d8a6f6dd57c09cd333549f424c38 Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 16:25:31 +0200
Subject: [PATCH 11/12] Fixes for unit tests following introduction of HashMap
which allows null keys
---
.../src/main/java/org/jpos/util/NameRegistrar.java | 14 +-
jpos/src/main/java/org/jpos/util/TPS.java | 2 +
.../org/jpos/iso/filter/StatefulFilterTest.java | 1099 ++++++++++---------
.../test/java/org/jpos/q2/iso/TaskAdaptorTest.java | 10 -
.../test/java/org/jpos/q2/qbean/SpaceLetTest.java | 9 -
.../org/jpos/q2/security/KeyStoreAdaptorTest.java | 23 +-
.../java/org/jpos/q2/security/SMAdaptorTest.java | 21 -
.../test/java/org/jpos/space/SpaceFactoryTest.java | 63 +-
.../test/java/org/jpos/space/SpaceProxyTest.java | 11 +-
.../test/java/org/jpos/util/NameRegistrarTest.java | 50 +-
10 files changed, 649 insertions(+), 653 deletions(-)
diff --git a/jpos/src/main/java/org/jpos/util/NameRegistrar.java b/jpos/src/main/java/org/jpos/util/NameRegistrar.java
index 99317ec..0e8e3cb 100644
--- a/jpos/src/main/java/org/jpos/util/NameRegistrar.java
+++ b/jpos/src/main/java/org/jpos/util/NameRegistrar.java
@@ -32,7 +32,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class NameRegistrar implements Loggeable {
private static NameRegistrar instance = new NameRegistrar();
- private Map<String,Object> registrar = new HashMap<String,Object>();
+ private Map<String,Object> registrar;
private static ReadWriteLock LOCK = new ReentrantReadWriteLock();
public static class NotFoundException extends Exception {
@@ -50,6 +50,7 @@ public class NameRegistrar implements Loggeable {
private NameRegistrar() {
super();
+ registrar = new HashMap<String,Object>();
}
public static Map<String,Object> getMap() {
@@ -133,9 +134,14 @@ public class NameRegistrar implements Loggeable {
try {
for (Map.Entry<String,Object> entry : registrar.entrySet()) {
Object obj = entry.getValue();
- p.println(inner
- + entry.getKey().toString() + ": "
- + obj.getClass().getName());
+ String key = entry.getKey();
+ if (key == null) {
+ key = "null";
+ }
+ String objectClassName = (obj == null) ? "<NULL>" : obj.getClass().getName();
+ p.println(inner
+ + key.toString() + ": "
+ + objectClassName);
if (detail && obj instanceof Loggeable) {
((Loggeable) obj).dump(p, inner + " ");
}
diff --git a/jpos/src/main/java/org/jpos/util/TPS.java b/jpos/src/main/java/org/jpos/util/TPS.java
index 15996dd..d926809 100644
--- a/jpos/src/main/java/org/jpos/util/TPS.java
+++ b/jpos/src/main/java/org/jpos/util/TPS.java
@@ -76,6 +76,8 @@ public class TPS implements Loggeable {
*/
public TPS(final long period, boolean autoupdate) {
super();
+ count = new AtomicInteger(0);
+ start = new AtomicLong(0L);
this.period = period;
this.autoupdate = autoupdate;
start.set(System.nanoTime() / FROM_NANOS);
diff --git a/jpos/src/test/java/org/jpos/iso/filter/StatefulFilterTest.java b/jpos/src/test/java/org/jpos/iso/filter/StatefulFilterTest.java
index e11dcc5..06f08db 100644
--- a/jpos/src/test/java/org/jpos/iso/filter/StatefulFilterTest.java
+++ b/jpos/src/test/java/org/jpos/iso/filter/StatefulFilterTest.java
@@ -49,6 +49,7 @@ import org.jpos.iso.packager.GenericValidatingPackager;
import org.jpos.iso.packager.PostPackager;
import org.jpos.iso.packager.XMLPackager;
import org.jpos.space.Space;
+import org.jpos.space.SpaceError;
import org.jpos.util.LogEvent;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -62,685 +63,741 @@ public class StatefulFilterTest {
@Test
public void testConstructor() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- assertEquals("m_statefulFilter.getSavedFields().length", 0, statefulFilter.getSavedFields().length);
- assertEquals("m_statefulFilter.getIgnoredFields().length", 0, statefulFilter.getIgnoredFields().length);
- assertEquals("m_statefulFilter.getKey().length", 2, statefulFilter.getKey().length);
- assertEquals("m_statefulFilter.getTimeout()", 60000L, statefulFilter.getTimeout());
- assertEquals("m_statefulFilter.getMatchDirection()", 1, statefulFilter.getMatchDirection());
+ StatefulFilter statefulFilter = new StatefulFilter();
+ assertEquals("m_statefulFilter.getSavedFields().length", 0,
+ statefulFilter.getSavedFields().length);
+ assertEquals("m_statefulFilter.getIgnoredFields().length", 0,
+ statefulFilter.getIgnoredFields().length);
+ assertEquals("m_statefulFilter.getKey().length", 2,
+ statefulFilter.getKey().length);
+ assertEquals("m_statefulFilter.getTimeout()", 60000L,
+ statefulFilter.getTimeout());
+ assertEquals("m_statefulFilter.getMatchDirection()", 1,
+ statefulFilter.getMatchDirection());
}
@Test
public void testFilter() throws Throwable {
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- statefulFilter.setMatchDirection(61);
- statefulFilter.setIgnoredFields((int[]) null);
- ISOMsg m = new ISOMsg("testStatefulFilterMti");
- m.setDirection(61);
- ISOMsg result = statefulFilter.filter(null, m, null);
- assertSame("result", m, result);
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ statefulFilter.setMatchDirection(61);
+ statefulFilter.setIgnoredFields((int[]) null);
+ ISOMsg m = new ISOMsg("testStatefulFilterMti");
+ m.setDirection(61);
+ ISOMsg result = statefulFilter.filter(null, m, null);
+ assertSame("result", m, result);
}
@Test
public void testFilter1() throws Throwable {
- ISOMsg m = new ISOMsg("testStatefulFilterMti");
- m.setDirection(1);
- ISOMsg result = new StatefulFilter().filter(new NACChannel(), m, new LogEvent());
- assertSame("result", m, result);
+ ISOMsg m = new ISOMsg("testStatefulFilterMti");
+ m.setDirection(1);
+ ISOMsg result = new StatefulFilter().filter(new NACChannel(), m,
+ new LogEvent());
+ assertSame("result", m, result);
}
@Test
public void testFilter2() throws Throwable {
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- ISOChannel iSOChannel = new PADChannel();
- LogEvent evt = new LogEvent("testStatefulFilterTag");
- ISOMsg m = mock(ISOMsg.class);
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ ISOChannel iSOChannel = new PADChannel();
+ LogEvent evt = new LogEvent("testStatefulFilterTag");
+ ISOMsg m = mock(ISOMsg.class);
- given(m.getDirection()).willReturn(58);
+ given(m.getDirection()).willReturn(58);
- ISOMsg result = statefulFilter.filter(iSOChannel, m, evt);
- assertSame("result", m, result);
+ ISOMsg result = statefulFilter.filter(iSOChannel, m, evt);
+ assertSame("result", m, result);
}
@Test
public void testFilter3() throws Throwable {
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- statefulFilter.setMatchDirection(58);
- statefulFilter.setSavedFields((int[]) null);
- statefulFilter.setIgnoredFields((int[]) null);
- ISOMsg m = new ISOMsg("testStatefulFilterMti");
- m.setDirection(58);
- ISOMsg result = statefulFilter.filter(new PostChannel("testStatefulFilterHost", 100, new XMLPackager()), m, new LogEvent(
- "testStatefulFilterTag", new CTCSubFieldPackager()));
- assertSame("result", m, result);
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ statefulFilter.setMatchDirection(58);
+ statefulFilter.setSavedFields((int[]) null);
+ statefulFilter.setIgnoredFields((int[]) null);
+ ISOMsg m = new ISOMsg("testStatefulFilterMti");
+ m.setDirection(58);
+ ISOMsg result = statefulFilter
+ .filter(new PostChannel("testStatefulFilterHost", 100,
+ new XMLPackager()), m, new LogEvent(
+ "testStatefulFilterTag", new CTCSubFieldPackager()));
+ assertSame("result", m, result);
}
@Test
public void testFilter4() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setConfiguration(new SimpleConfiguration());
- statefulFilter.setSavedFields((int[]) null);
- ISOMsg m = new ISOMsg("testStatefulFilterMti");
- m.setDirection(1);
- ISOMsg result = statefulFilter.filter(new LogChannel(), m, new LogEvent("testStatefulFilterTag", new Object()));
- assertSame("result", m, result);
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setConfiguration(new SimpleConfiguration());
+ statefulFilter.setSavedFields((int[]) null);
+ ISOMsg m = new ISOMsg("testStatefulFilterMti");
+ m.setDirection(1);
+ ISOMsg result = statefulFilter.filter(new LogChannel(), m,
+ new LogEvent("testStatefulFilterTag", new Object()));
+ assertSame("result", m, result);
}
@Test
public void testFilter5() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- BASE24TCPChannel iSOChannel = mock(BASE24TCPChannel.class);
- LogEvent evt = mock(LogEvent.class);
- ISOMsg m = mock(ISOMsg.class);
- given(m.getString(11)).willReturn(null);
- given(m.getString(41)).willReturn(null);
- given(m.getDirection()).willReturn(0);
- ISOMsg result = statefulFilter.filter(iSOChannel, m, evt);
- assertSame("result", m, result);
+ StatefulFilter statefulFilter = new StatefulFilter();
+ BASE24TCPChannel iSOChannel = mock(BASE24TCPChannel.class);
+ LogEvent evt = mock(LogEvent.class);
+ ISOMsg m = mock(ISOMsg.class);
+ given(m.getString(11)).willReturn(null);
+ given(m.getString(41)).willReturn(null);
+ given(m.getDirection()).willReturn(0);
+ ISOMsg result = statefulFilter.filter(iSOChannel, m, evt);
+ assertSame("result", m, result);
}
@Test
public void testFilter6() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setMatchDirection(58);
- statefulFilter.setSavedFields((int[]) null);
- statefulFilter.setIgnoredFields((int[]) null);
- ISOMsg m = new ISOMsg("testStatefulFilterMti");
- m.setDirection(58);
- ISOMsg result = statefulFilter.filter(new PostChannel("testStatefulFilterHost", 100, new XMLPackager()), m, new LogEvent(
- "testStatefulFilterTag", new CTCSubFieldPackager()));
- assertEquals("result.getDirection()", 58, result.getDirection());
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setMatchDirection(58);
+ statefulFilter.setSavedFields((int[]) null);
+ statefulFilter.setIgnoredFields((int[]) null);
+ ISOMsg m = new ISOMsg("testStatefulFilterMti");
+ m.setDirection(58);
+ ISOMsg result = statefulFilter
+ .filter(new PostChannel("testStatefulFilterHost", 100,
+ new XMLPackager()), m, new LogEvent(
+ "testStatefulFilterTag", new CTCSubFieldPackager()));
+ assertEquals("result.getDirection()", 58, result.getDirection());
}
@Test
public void testFilter7() throws Throwable {
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- statefulFilter.setMatchDirection(0);
- statefulFilter.setSavedFields((int[]) null);
- ISOMsg m = new ISOMsg("testStatefulFilterMti");
- ISOMsg result = statefulFilter.filter(new PADChannel(new XMLPackager()), m, new LogEvent(new Base1SubFieldPackager(),
- "testStatefulFilterTag"));
- assertSame("result", m, result);
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ statefulFilter.setMatchDirection(0);
+ statefulFilter.setSavedFields((int[]) null);
+ ISOMsg m = new ISOMsg("testStatefulFilterMti");
+ ISOMsg result = statefulFilter.filter(
+ new PADChannel(new XMLPackager()), m, new LogEvent(
+ new Base1SubFieldPackager(), "testStatefulFilterTag"));
+ assertSame("result", m, result);
}
@Test
public void testFilterThrowsNullPointerException() throws Throwable {
- ISOMsg m = new ISOMsg(100);
- m.setDirection(100);
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- statefulFilter.setSpace((Space) null);
- statefulFilter.setMatchDirection(100);
- try {
- statefulFilter.filter(new PostChannel("testStatefulFilterHost", 100, new GenericSubFieldPackager()), m, new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ ISOMsg m = new ISOMsg(100);
+ m.setDirection(100);
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ statefulFilter.setSpace((Space) null);
+ statefulFilter.setMatchDirection(100);
+ try {
+ statefulFilter.filter(new PostChannel("testStatefulFilterHost",
+ 100, new GenericSubFieldPackager()), m, new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException1() throws Throwable {
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- statefulFilter.setSpace((Space) null);
- statefulFilter.setMatchDirection(0);
- statefulFilter.setIgnoredFields((int[]) null);
- try {
- statefulFilter.filter(new CSChannel("testStatefulFilterHost", 100, new PostPackager()), new ISOMsg(
- "testStatefulFilterMti"), new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ statefulFilter.setSpace((Space) null);
+ statefulFilter.setMatchDirection(0);
+ statefulFilter.setIgnoredFields((int[]) null);
+ try {
+ statefulFilter.filter(new CSChannel("testStatefulFilterHost", 100,
+ new PostPackager()), new ISOMsg("testStatefulFilterMti"),
+ new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException10() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setSpace((Space) null);
- statefulFilter.setMatchDirection(0);
- statefulFilter.setSavedFields((int[]) null);
- statefulFilter.setIgnoredFields((int[]) null);
- try {
- statefulFilter.filter(new CSChannel("testStatefulFilterHost", 100, new PostPackager()), new ISOMsg(
- "testStatefulFilterMti"), new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setSpace((Space) null);
+ statefulFilter.setMatchDirection(0);
+ statefulFilter.setSavedFields((int[]) null);
+ statefulFilter.setIgnoredFields((int[]) null);
+ try {
+ statefulFilter.filter(new CSChannel("testStatefulFilterHost", 100,
+ new PostPackager()), new ISOMsg("testStatefulFilterMti"),
+ new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException2() throws Throwable {
- int[] key = new int[1];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- try {
- statefulFilter.filter(new BASE24TCPChannel(new GenericValidatingPackager()), null, new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ int[] key = new int[1];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ try {
+ statefulFilter.filter(new BASE24TCPChannel(
+ new GenericValidatingPackager()), null, new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException3() throws Throwable {
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- statefulFilter.setSpace((Space) null);
- try {
- statefulFilter.filter(new CSChannel("testStatefulFilterHost", 100, new GenericPackager()), new ISOMsg(
- "testStatefulFilterMti"), new LogEvent("testStatefulFilterTag", "testString"));
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ statefulFilter.setSpace((Space) null);
+ try {
+ statefulFilter.filter(new CSChannel("testStatefulFilterHost", 100,
+ new GenericPackager()),
+ new ISOMsg("testStatefulFilterMti"), new LogEvent(
+ "testStatefulFilterTag", "testString"));
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException4() throws Throwable {
- ISOMsg m = new ISOMsg(100);
- m.setDirection(100);
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setSpace((Space) null);
- statefulFilter.setMatchDirection(100);
- statefulFilter.setSavedFields((int[]) null);
- try {
- statefulFilter.filter(new PostChannel("testStatefulFilterHost", 100, new GenericSubFieldPackager()), m, new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ ISOMsg m = new ISOMsg(100);
+ m.setDirection(100);
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setSpace((Space) null);
+ statefulFilter.setMatchDirection(100);
+ statefulFilter.setSavedFields((int[]) null);
+ try {
+ statefulFilter.filter(new PostChannel("testStatefulFilterHost",
+ 100, new GenericSubFieldPackager()), m, new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException5() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setSpace((Space) null);
- try {
- statefulFilter.filter(new GZIPChannel(), new ISOMsg("testStatefulFilterMti"), new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setSpace((Space) null);
+ try {
+ statefulFilter.filter(new GZIPChannel(), new ISOMsg(
+ "testStatefulFilterMti"), new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException6() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKeyPrefix(null);
- try {
- statefulFilter.filter(new PostChannel(new CTCSubFieldPackager()), new ISOMsg("testStatefulFilterMti"), new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKeyPrefix(null);
+ try {
+ statefulFilter.filter(new PostChannel(new CTCSubFieldPackager()),
+ new ISOMsg("testStatefulFilterMti"), new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException7() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey((int[]) null);
- try {
- statefulFilter.filter(new BASE24TCPChannel(new EuroSubFieldPackager()), new ISOMsg(), new LogEvent(new PostPackager(),
- "testStatefulFilterTag"));
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey((int[]) null);
+ try {
+ statefulFilter.filter(new BASE24TCPChannel(
+ new EuroSubFieldPackager()), new ISOMsg(), new LogEvent(
+ new PostPackager(), "testStatefulFilterTag"));
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException8() throws Throwable {
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- statefulFilter.setSpace((Space) null);
- statefulFilter.setMatchDirection(0);
- statefulFilter.setSavedFields((int[]) null);
- statefulFilter.setIgnoredFields((int[]) null);
- try {
- statefulFilter.filter(new CSChannel("testStatefulFilterHost", 100, new PostPackager()), new ISOMsg(
- "testStatefulFilterMti"), new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ statefulFilter.setSpace((Space) null);
+ statefulFilter.setMatchDirection(0);
+ statefulFilter.setSavedFields((int[]) null);
+ statefulFilter.setIgnoredFields((int[]) null);
+ try {
+ statefulFilter.filter(new CSChannel("testStatefulFilterHost", 100,
+ new PostPackager()), new ISOMsg("testStatefulFilterMti"),
+ new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsNullPointerException9() throws Throwable {
- ISOMsg m = new ISOMsg(100);
- m.setDirection(100);
- int[] key = new int[0];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- statefulFilter.setSpace((Space) null);
- statefulFilter.setMatchDirection(100);
- statefulFilter.setSavedFields((int[]) null);
- try {
- statefulFilter.filter(new PostChannel("testStatefulFilterHost", 100, new GenericSubFieldPackager()), m, new LogEvent());
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ ISOMsg m = new ISOMsg(100);
+ m.setDirection(100);
+ int[] key = new int[0];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ statefulFilter.setSpace((Space) null);
+ statefulFilter.setMatchDirection(100);
+ statefulFilter.setSavedFields((int[]) null);
+ try {
+ statefulFilter.filter(new PostChannel("testStatefulFilterHost",
+ 100, new GenericSubFieldPackager()), m, new LogEvent());
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testFilterThrowsVetoException() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setSpace("testStatefulFilterUri");
- int[] key = new int[0];
- statefulFilter.setVetoUnmatched(true);
- statefulFilter.setKey(key);
- try {
- statefulFilter.filter(new BASE24TCPChannel(), new ISOMsg("testStatefulFilterMti"), new LogEvent());
- fail("Expected VetoException to be thrown");
- } catch (ISOFilter.VetoException ex) {
- assertEquals("ex.getMessage()", "unmatched iso message", ex.getMessage());
- assertNull("ex.getNested()", ex.getNested());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setSpace("testStatefulFilterUri");
+ int[] key = new int[0];
+ statefulFilter.setVetoUnmatched(true);
+ statefulFilter.setKey(key);
+ try {
+ statefulFilter.filter(new BASE24TCPChannel(), new ISOMsg(
+ "testStatefulFilterMti"), new LogEvent());
+ fail("Expected VetoException to be thrown");
+ } catch (ISOFilter.VetoException ex) {
+ assertEquals("ex.getMessage()", "unmatched iso message",
+ ex.getMessage());
+ assertNull("ex.getNested()", ex.getNested());
+ }
}
@Test
public void testFilterThrowsVetoException1() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setVetoUnmatched(true);
- ISOMsg m = new ISOMsg("testStatefulFilterMti");
- m.setDirection(100);
- try {
- statefulFilter.filter(null, m, null);
- fail("Expected VetoException to be thrown");
- } catch (ISOFilter.VetoException ex) {
- assertEquals("ex.getMessage()", "unmatched iso message", ex.getMessage());
- assertNull("ex.getNested()", ex.getNested());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setVetoUnmatched(true);
+ ISOMsg m = new ISOMsg("testStatefulFilterMti");
+ m.setDirection(100);
+ try {
+ statefulFilter.filter(null, m, null);
+ fail("Expected VetoException to be thrown");
+ } catch (ISOFilter.VetoException ex) {
+ assertEquals("ex.getMessage()", "unmatched iso message",
+ ex.getMessage());
+ assertNull("ex.getNested()", ex.getNested());
+ }
}
@Test
public void testGetIgnoredField() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] ignoredFields = new int[1];
- ignoredFields[0] = -19;
- statefulFilter.setIgnoredFields(ignoredFields);
- int result = statefulFilter.getIgnoredField(0);
- assertEquals("result", -19, result);
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] ignoredFields = new int[1];
+ ignoredFields[0] = -19;
+ statefulFilter.setIgnoredFields(ignoredFields);
+ int result = statefulFilter.getIgnoredField(0);
+ assertEquals("result", -19, result);
}
@Test
- public void testGetIgnoredFieldThrowsArrayIndexOutOfBoundsException() throws Throwable {
- try {
- new StatefulFilter().getIgnoredField(100);
- fail("Expected ArrayIndexOutOfBoundsException to be thrown");
- } catch (ArrayIndexOutOfBoundsException ex) {
- assertEquals("ex.getMessage()", "100", ex.getMessage());
- }
+ public void testGetIgnoredFieldThrowsArrayIndexOutOfBoundsException()
+ throws Throwable {
+ try {
+ new StatefulFilter().getIgnoredField(100);
+ fail("Expected ArrayIndexOutOfBoundsException to be thrown");
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ assertEquals("ex.getMessage()", "100", ex.getMessage());
+ }
}
@Test
- public void testGetIgnoredFieldThrowsNullPointerException() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setIgnoredFields((int[]) null);
- try {
- statefulFilter.getIgnoredField(100);
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ public void testGetIgnoredFieldThrowsNullPointerException()
+ throws Throwable {
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setIgnoredFields((int[]) null);
+ try {
+ statefulFilter.getIgnoredField(100);
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
@Test
public void testGetKey() throws Throwable {
- int[] key = new int[1];
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKey(key);
- int[] key2 = new int[3];
- statefulFilter.setKey(key2);
- statefulFilter.setIgnoredFields((int[]) null);
- statefulFilter.setOverwriteOriginalFields(true);
- int[] key3 = new int[3];
- statefulFilter.setKey(key3);
- int result = statefulFilter.getKey(0);
- assertEquals("result", 0, result);
+ int[] key = new int[1];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKey(key);
+ int[] key2 = new int[3];
+ statefulFilter.setKey(key2);
+ statefulFilter.setIgnoredFields((int[]) null);
+ statefulFilter.setOverwriteOriginalFields(true);
+ int[] key3 = new int[3];
+ statefulFilter.setKey(key3);
+ int result = statefulFilter.getKey(0);
+ assertEquals("result", 0, result);
}
@Test
public void testGetKey1() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] ignoredFields = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields);
- int[] ignoredFields2 = new int[2];
- statefulFilter.setIgnoredFields(ignoredFields2);
- int[] key = new int[0];
- statefulFilter.setKey(key);
- int[] ignoredFields3 = new int[1];
- int[] key2 = new int[0];
- statefulFilter.setKey(key2);
- int[] ignoredFields4 = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields4);
- statefulFilter.setIgnoredFields(ignoredFields3);
- int[] key3 = new int[4];
- key3[1] = 19;
- StatefulFilter statefulFilter2 = new StatefulFilter();
- statefulFilter2.setOverwriteOriginalFields(true);
- int[] key4 = new int[3];
- statefulFilter2.setKey(key4);
- int[] ignoredFields5 = new int[0];
- statefulFilter2.setIgnoredFields(ignoredFields5);
- statefulFilter2.setKey(key3);
- int result = statefulFilter2.getKey(1);
- assertEquals("result", 19, result);
- }
-
- @Test
- public void testGetKeyThrowsArrayIndexOutOfBoundsException() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- StatefulFilter statefulFilter2 = new StatefulFilter();
- statefulFilter2.setOverwriteOriginalFields(true);
- int[] key = new int[3];
- statefulFilter2.setKey(key);
- int[] ignoredFields = new int[0];
- statefulFilter2.setIgnoredFields(ignoredFields);
- statefulFilter.setIgnoredFields(ignoredFields);
- statefulFilter.setOverwriteOriginalFields(false);
- int[] key2 = new int[0];
- statefulFilter.setKey(key2);
- try {
- statefulFilter.getKey(100);
- fail("Expected ArrayIndexOutOfBoundsException to be thrown");
- } catch (ArrayIndexOutOfBoundsException ex) {
- assertEquals("ex.getMessage()", "100", ex.getMessage());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] ignoredFields = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields);
+ int[] ignoredFields2 = new int[2];
+ statefulFilter.setIgnoredFields(ignoredFields2);
+ int[] key = new int[0];
+ statefulFilter.setKey(key);
+ int[] ignoredFields3 = new int[1];
+ int[] key2 = new int[0];
+ statefulFilter.setKey(key2);
+ int[] ignoredFields4 = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields4);
+ statefulFilter.setIgnoredFields(ignoredFields3);
+ int[] key3 = new int[4];
+ key3[1] = 19;
+ StatefulFilter statefulFilter2 = new StatefulFilter();
+ statefulFilter2.setOverwriteOriginalFields(true);
+ int[] key4 = new int[3];
+ statefulFilter2.setKey(key4);
+ int[] ignoredFields5 = new int[0];
+ statefulFilter2.setIgnoredFields(ignoredFields5);
+ statefulFilter2.setKey(key3);
+ int result = statefulFilter2.getKey(1);
+ assertEquals("result", 19, result);
+ }
+
+ @Test
+ public void testGetKeyThrowsArrayIndexOutOfBoundsException()
+ throws Throwable {
+ StatefulFilter statefulFilter = new StatefulFilter();
+ StatefulFilter statefulFilter2 = new StatefulFilter();
+ statefulFilter2.setOverwriteOriginalFields(true);
+ int[] key = new int[3];
+ statefulFilter2.setKey(key);
+ int[] ignoredFields = new int[0];
+ statefulFilter2.setIgnoredFields(ignoredFields);
+ statefulFilter.setIgnoredFields(ignoredFields);
+ statefulFilter.setOverwriteOriginalFields(false);
+ int[] key2 = new int[0];
+ statefulFilter.setKey(key2);
+ try {
+ statefulFilter.getKey(100);
+ fail("Expected ArrayIndexOutOfBoundsException to be thrown");
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ assertEquals("ex.getMessage()", "100", ex.getMessage());
+ }
}
@Test
public void testGetSavedField() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] savedFields = new int[3];
- statefulFilter.setSavedFields(savedFields);
- int result = statefulFilter.getSavedField(0);
- assertEquals("result", 0, result);
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] savedFields = new int[3];
+ statefulFilter.setSavedFields(savedFields);
+ int result = statefulFilter.getSavedField(0);
+ assertEquals("result", 0, result);
}
@Test
public void testGetSavedField1() throws Throwable {
- int[] savedFields = new int[3];
- savedFields[0] = -4;
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setSavedFields(savedFields);
- int result = statefulFilter.getSavedField(0);
- assertEquals("result", -4, result);
- }
-
- @Test
- public void testGetSavedFieldThrowsArrayIndexOutOfBoundsException() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] ignoredFields = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields);
- StatefulFilter statefulFilter2 = new StatefulFilter();
- int[] ignoredFields2 = new int[2];
- statefulFilter.setIgnoredFields(ignoredFields2);
- int[] key = new int[0];
- statefulFilter.setKey(key);
- int[] ignoredFields3 = new int[1];
- int[] key2 = new int[0];
- statefulFilter.setKey(key2);
- int[] ignoredFields4 = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields4);
- statefulFilter.setIgnoredFields(ignoredFields3);
- StatefulFilter statefulFilter3 = new StatefulFilter();
- statefulFilter3.setOverwriteOriginalFields(true);
- int[] key3 = new int[3];
- statefulFilter3.setKey(key3);
- int[] ignoredFields5 = new int[0];
- statefulFilter3.setIgnoredFields(ignoredFields5);
- statefulFilter2.setIgnoredFields(ignoredFields5);
- int[] ignoredFields6 = new int[0];
- statefulFilter2.setIgnoredFields(ignoredFields6);
- statefulFilter2.setConfiguration(new SimpleConfiguration());
- statefulFilter2.setOverwriteOriginalFields(false);
- int[] key4 = new int[0];
- statefulFilter2.setKey(key4);
- try {
- statefulFilter2.getSavedField(100);
- fail("Expected ArrayIndexOutOfBoundsException to be thrown");
- } catch (ArrayIndexOutOfBoundsException ex) {
- assertEquals("ex.getMessage()", "100", ex.getMessage());
- }
+ int[] savedFields = new int[3];
+ savedFields[0] = -4;
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setSavedFields(savedFields);
+ int result = statefulFilter.getSavedField(0);
+ assertEquals("result", -4, result);
+ }
+
+ @Test
+ public void testGetSavedFieldThrowsArrayIndexOutOfBoundsException()
+ throws Throwable {
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] ignoredFields = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields);
+ StatefulFilter statefulFilter2 = new StatefulFilter();
+ int[] ignoredFields2 = new int[2];
+ statefulFilter.setIgnoredFields(ignoredFields2);
+ int[] key = new int[0];
+ statefulFilter.setKey(key);
+ int[] ignoredFields3 = new int[1];
+ int[] key2 = new int[0];
+ statefulFilter.setKey(key2);
+ int[] ignoredFields4 = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields4);
+ statefulFilter.setIgnoredFields(ignoredFields3);
+ StatefulFilter statefulFilter3 = new StatefulFilter();
+ statefulFilter3.setOverwriteOriginalFields(true);
+ int[] key3 = new int[3];
+ statefulFilter3.setKey(key3);
+ int[] ignoredFields5 = new int[0];
+ statefulFilter3.setIgnoredFields(ignoredFields5);
+ statefulFilter2.setIgnoredFields(ignoredFields5);
+ int[] ignoredFields6 = new int[0];
+ statefulFilter2.setIgnoredFields(ignoredFields6);
+ statefulFilter2.setConfiguration(new SimpleConfiguration());
+ statefulFilter2.setOverwriteOriginalFields(false);
+ int[] key4 = new int[0];
+ statefulFilter2.setKey(key4);
+ try {
+ statefulFilter2.getSavedField(100);
+ fail("Expected ArrayIndexOutOfBoundsException to be thrown");
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ assertEquals("ex.getMessage()", "100", ex.getMessage());
+ }
}
@Test
public void testSetConfiguration() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] ignoredFields = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields);
- statefulFilter.setConfiguration(new SimpleConfiguration());
- assertTrue("m_statefulFilter.isOverwriteOriginalFields()", statefulFilter.isOverwriteOriginalFields());
- assertEquals("m_statefulFilter.getSavedFields().length", 0, statefulFilter.getSavedFields().length);
- assertEquals("m_statefulFilter.getIgnoredFields().length", 0, statefulFilter.getIgnoredFields().length);
- assertEquals("m_statefulFilter.getKey().length", 2, statefulFilter.getKey().length);
- assertFalse("m_statefulFilter.isVetoUnmatched()", statefulFilter.isVetoUnmatched());
- assertEquals("m_statefulFilter.getMatchDirection()", 1, statefulFilter.getMatchDirection());
- assertEquals("m_statefulFilter.getTimeout()", 60000L, statefulFilter.getTimeout());
- }
-
- @Test
- public void testSetConfigurationThrowsNullPointerException() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- Configuration cfg = new SubConfiguration();
- try {
- statefulFilter.setConfiguration(cfg);
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- assertFalse("m_statefulFilter.isOverwriteOriginalFields()", statefulFilter.isOverwriteOriginalFields());
- assertEquals("m_statefulFilter.getSavedFields().length", 0, statefulFilter.getSavedFields().length);
- assertEquals("m_statefulFilter.getIgnoredFields().length", 0, statefulFilter.getIgnoredFields().length);
- assertEquals("m_statefulFilter.getKey().length", 2, statefulFilter.getKey().length);
- assertFalse("m_statefulFilter.isVetoUnmatched()", statefulFilter.isVetoUnmatched());
- assertEquals("m_statefulFilter.getMatchDirection()", 1, statefulFilter.getMatchDirection());
- assertEquals("m_statefulFilter.getTimeout()", 60000L, statefulFilter.getTimeout());
- }
- }
-
- @Test
- public void testSetIgnoredFieldThrowsArrayIndexOutOfBoundsException() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- StatefulFilter statefulFilter2 = new StatefulFilter();
- statefulFilter2.setOverwriteOriginalFields(true);
- int[] key = new int[3];
- statefulFilter2.setKey(key);
- int[] ignoredFields = new int[0];
- statefulFilter2.setIgnoredFields(ignoredFields);
- statefulFilter.setIgnoredFields(ignoredFields);
- statefulFilter.setOverwriteOriginalFields(false);
- int[] key2 = new int[0];
- statefulFilter.setKey(key2);
- try {
- statefulFilter.setIgnoredField(100, 1000);
- fail("Expected ArrayIndexOutOfBoundsException to be thrown");
- } catch (ArrayIndexOutOfBoundsException ex) {
- assertEquals("ex.getMessage()", "100", ex.getMessage());
- assertSame("m_statefulFilter.getIgnoredFields()", ignoredFields, statefulFilter.getIgnoredFields());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] ignoredFields = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields);
+ statefulFilter.setConfiguration(new SimpleConfiguration());
+ assertTrue("m_statefulFilter.isOverwriteOriginalFields()",
+ statefulFilter.isOverwriteOriginalFields());
+ assertEquals("m_statefulFilter.getSavedFields().length", 0,
+ statefulFilter.getSavedFields().length);
+ assertEquals("m_statefulFilter.getIgnoredFields().length", 0,
+ statefulFilter.getIgnoredFields().length);
+ assertEquals("m_statefulFilter.getKey().length", 2,
+ statefulFilter.getKey().length);
+ assertFalse("m_statefulFilter.isVetoUnmatched()",
+ statefulFilter.isVetoUnmatched());
+ assertEquals("m_statefulFilter.getMatchDirection()", 1,
+ statefulFilter.getMatchDirection());
+ assertEquals("m_statefulFilter.getTimeout()", 60000L,
+ statefulFilter.getTimeout());
+ }
+
+ @Test
+ public void testSetConfigurationThrowsNullPointerException()
+ throws Throwable {
+ StatefulFilter statefulFilter = new StatefulFilter();
+ Configuration cfg = new SubConfiguration();
+ try {
+ statefulFilter.setConfiguration(cfg);
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ assertFalse("m_statefulFilter.isOverwriteOriginalFields()",
+ statefulFilter.isOverwriteOriginalFields());
+ assertEquals("m_statefulFilter.getSavedFields().length", 0,
+ statefulFilter.getSavedFields().length);
+ assertEquals("m_statefulFilter.getIgnoredFields().length", 0,
+ statefulFilter.getIgnoredFields().length);
+ assertEquals("m_statefulFilter.getKey().length", 2,
+ statefulFilter.getKey().length);
+ assertFalse("m_statefulFilter.isVetoUnmatched()",
+ statefulFilter.isVetoUnmatched());
+ assertEquals("m_statefulFilter.getMatchDirection()", 1,
+ statefulFilter.getMatchDirection());
+ assertEquals("m_statefulFilter.getTimeout()", 60000L,
+ statefulFilter.getTimeout());
+ }
+ }
+
+ @Test
+ public void testSetIgnoredFieldThrowsArrayIndexOutOfBoundsException()
+ throws Throwable {
+ StatefulFilter statefulFilter = new StatefulFilter();
+ StatefulFilter statefulFilter2 = new StatefulFilter();
+ statefulFilter2.setOverwriteOriginalFields(true);
+ int[] key = new int[3];
+ statefulFilter2.setKey(key);
+ int[] ignoredFields = new int[0];
+ statefulFilter2.setIgnoredFields(ignoredFields);
+ statefulFilter.setIgnoredFields(ignoredFields);
+ statefulFilter.setOverwriteOriginalFields(false);
+ int[] key2 = new int[0];
+ statefulFilter.setKey(key2);
+ try {
+ statefulFilter.setIgnoredField(100, 1000);
+ fail("Expected ArrayIndexOutOfBoundsException to be thrown");
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ assertEquals("ex.getMessage()", "100", ex.getMessage());
+ assertSame("m_statefulFilter.getIgnoredFields()", ignoredFields,
+ statefulFilter.getIgnoredFields());
+ }
}
@Test
public void testSetKey() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setOverwriteOriginalFields(true);
- int[] key = new int[3];
- statefulFilter.setKey(key);
- assertSame("m_statefulFilter.getKey()", key, statefulFilter.getKey());
- assertEquals("m_statefulFilter.getKey()[0]", 0, statefulFilter.getKey()[0]);
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setOverwriteOriginalFields(true);
+ int[] key = new int[3];
+ statefulFilter.setKey(key);
+ assertSame("m_statefulFilter.getKey()", key, statefulFilter.getKey());
+ assertEquals("m_statefulFilter.getKey()[0]", 0,
+ statefulFilter.getKey()[0]);
}
@Test
public void testSetKey1() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setOverwriteOriginalFields(true);
- int[] key = new int[3];
- statefulFilter.setKey(key);
- int[] ignoredFields = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields);
- StatefulFilter statefulFilter2 = new StatefulFilter();
- statefulFilter2.setOverwriteOriginalFields(false);
- int[] key2 = new int[2];
- statefulFilter2.setKey(key2);
- int[] ignoredFields2 = new int[2];
- statefulFilter2.setIgnoredFields(ignoredFields2);
- StatefulFilter statefulFilter3 = new StatefulFilter();
- int[] key3 = new int[2];
- statefulFilter3.setKey(key3);
- statefulFilter3.setOverwriteOriginalFields(true);
- int[] ignoredFields3 = new int[1];
- statefulFilter3.setIgnoredFields(ignoredFields3);
- statefulFilter3.setKey(0, 100);
- assertEquals("m_statefulFilter3.getKey()[0]", 100, statefulFilter3.getKey()[0]);
- assertSame("m_statefulFilter3.getKey()", key3, statefulFilter3.getKey());
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setOverwriteOriginalFields(true);
+ int[] key = new int[3];
+ statefulFilter.setKey(key);
+ int[] ignoredFields = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields);
+ StatefulFilter statefulFilter2 = new StatefulFilter();
+ statefulFilter2.setOverwriteOriginalFields(false);
+ int[] key2 = new int[2];
+ statefulFilter2.setKey(key2);
+ int[] ignoredFields2 = new int[2];
+ statefulFilter2.setIgnoredFields(ignoredFields2);
+ StatefulFilter statefulFilter3 = new StatefulFilter();
+ int[] key3 = new int[2];
+ statefulFilter3.setKey(key3);
+ statefulFilter3.setOverwriteOriginalFields(true);
+ int[] ignoredFields3 = new int[1];
+ statefulFilter3.setIgnoredFields(ignoredFields3);
+ statefulFilter3.setKey(0, 100);
+ assertEquals("m_statefulFilter3.getKey()[0]", 100,
+ statefulFilter3.getKey()[0]);
+ assertSame("m_statefulFilter3.getKey()", key3, statefulFilter3.getKey());
}
@Test
public void testSetKeyPrefix() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setKeyPrefix("testString");
- assertEquals("m_statefulFilter.getKeyPrefix()", "testString", statefulFilter.getKeyPrefix());
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setKeyPrefix("testString");
+ assertEquals("m_statefulFilter.getKeyPrefix()", "testString",
+ statefulFilter.getKeyPrefix());
}
@Test
- public void testSetKeyThrowsArrayIndexOutOfBoundsException() throws Throwable {
- int[] key = new int[1];
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] ignoredFields = new int[2];
- statefulFilter.setIgnoredFields(ignoredFields);
- int[] key2 = new int[2];
- statefulFilter.setKey(key2);
- statefulFilter.setKey(key);
- try {
- statefulFilter.setKey(100, 1000);
- fail("Expected ArrayIndexOutOfBoundsException to be thrown");
- } catch (ArrayIndexOutOfBoundsException ex) {
- assertEquals("ex.getMessage()", "100", ex.getMessage());
- assertSame("m_statefulFilter.getKey()", key, statefulFilter.getKey());
- }
+ public void testSetKeyThrowsArrayIndexOutOfBoundsException()
+ throws Throwable {
+ int[] key = new int[1];
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] ignoredFields = new int[2];
+ statefulFilter.setIgnoredFields(ignoredFields);
+ int[] key2 = new int[2];
+ statefulFilter.setKey(key2);
+ statefulFilter.setKey(key);
+ try {
+ statefulFilter.setKey(100, 1000);
+ fail("Expected ArrayIndexOutOfBoundsException to be thrown");
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ assertEquals("ex.getMessage()", "100", ex.getMessage());
+ assertSame("m_statefulFilter.getKey()", key,
+ statefulFilter.getKey());
+ }
}
@Test
public void testSetKeyThrowsNullPointerException() throws Throwable {
- StatefulFilter statefulFilter2 = setupStatefulFilterState();
- try {
- statefulFilter2.setKey(100, 1000);
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- assertNull("m_statefulFilter2.getKey()", statefulFilter2.getKey());
- }
+ StatefulFilter statefulFilter2 = setupStatefulFilterState();
+ try {
+ statefulFilter2.setKey(100, 1000);
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ assertNull("m_statefulFilter2.getKey()", statefulFilter2.getKey());
+ }
}
@Test
public void testSetMatchDirection() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setMatchDirection(100);
- assertEquals("m_statefulFilter.getMatchDirection()", 100, statefulFilter.getMatchDirection());
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setMatchDirection(100);
+ assertEquals("m_statefulFilter.getMatchDirection()", 100,
+ statefulFilter.getMatchDirection());
}
@Test
public void testSetOverwriteOriginalFields() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setSpace("testStatefulFilterUri");
- statefulFilter.setOverwriteOriginalFields(true);
- assertTrue("m_statefulFilter.isOverwriteOriginalFields()", statefulFilter.isOverwriteOriginalFields());
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setSpace("testStatefulFilterUri");
+ statefulFilter.setOverwriteOriginalFields(true);
+ assertTrue("m_statefulFilter.isOverwriteOriginalFields()",
+ statefulFilter.isOverwriteOriginalFields());
}
@Test
public void testSetSavedFields() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] savedFields = new int[3];
- statefulFilter.setSavedFields(savedFields);
- assertSame("m_statefulFilter.getSavedFields()", savedFields, statefulFilter.getSavedFields());
- }
-
- @Test
- public void testSetSavedFieldThrowsArrayIndexOutOfBoundsException() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] savedFields = new int[0];
- statefulFilter.setSavedFields(savedFields);
- try {
- statefulFilter.setSavedField(100, 1000);
- fail("Expected ArrayIndexOutOfBoundsException to be thrown");
- } catch (ArrayIndexOutOfBoundsException ex) {
- assertEquals("ex.getMessage()", "100", ex.getMessage());
- assertSame("m_statefulFilter.getSavedFields()", savedFields, statefulFilter.getSavedFields());
- }
- }
-
- @Test
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] savedFields = new int[3];
+ statefulFilter.setSavedFields(savedFields);
+ assertSame("m_statefulFilter.getSavedFields()", savedFields,
+ statefulFilter.getSavedFields());
+ }
+
+ @Test
+ public void testSetSavedFieldThrowsArrayIndexOutOfBoundsException()
+ throws Throwable {
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] savedFields = new int[0];
+ statefulFilter.setSavedFields(savedFields);
+ try {
+ statefulFilter.setSavedField(100, 1000);
+ fail("Expected ArrayIndexOutOfBoundsException to be thrown");
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ assertEquals("ex.getMessage()", "100", ex.getMessage());
+ assertSame("m_statefulFilter.getSavedFields()", savedFields,
+ statefulFilter.getSavedFields());
+ }
+ }
+
+ @Test(expected = SpaceError.class)
public void testSetSpaceThrowsNullPointerException() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- try {
- statefulFilter.setSpace("Invalid space: ");
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setSpace("Invalid space: ");
+
}
@Test
public void testSetTimeout() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- statefulFilter.setTimeout(100L);
- assertEquals("m_statefulFilter.getTimeout()", 100L, statefulFilter.getTimeout());
+ StatefulFilter statefulFilter = new StatefulFilter();
+ statefulFilter.setTimeout(100L);
+ assertEquals("m_statefulFilter.getTimeout()", 100L,
+ statefulFilter.getTimeout());
}
@Test
public void testSetVetoUnmatched() throws Throwable {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] ignoredFields = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields);
- statefulFilter.setVetoUnmatched(true);
- assertTrue("m_statefulFilter.isVetoUnmatched()", statefulFilter.isVetoUnmatched());
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] ignoredFields = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields);
+ statefulFilter.setVetoUnmatched(true);
+ assertTrue("m_statefulFilter.isVetoUnmatched()",
+ statefulFilter.isVetoUnmatched());
}
private StatefulFilter setupStatefulFilterState() {
- StatefulFilter statefulFilter = new StatefulFilter();
- int[] ignoredFields = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields);
- m_statefulFilter2 = new StatefulFilter();
- int[] ignoredFields2 = new int[2];
- statefulFilter.setIgnoredFields(ignoredFields2);
- int[] key = new int[0];
- statefulFilter.setKey(key);
- int[] ignoredFields3 = new int[1];
- int[] key2 = new int[0];
- statefulFilter.setKey(key2);
- int[] ignoredFields4 = new int[0];
- statefulFilter.setIgnoredFields(ignoredFields4);
- statefulFilter.setIgnoredFields(ignoredFields3);
- m_statefulFilter3 = new StatefulFilter();
- m_statefulFilter3.setOverwriteOriginalFields(true);
- int[] key3 = new int[3];
- m_statefulFilter3.setKey(key3);
- int[] ignoredFields5 = new int[0];
- m_statefulFilter3.setIgnoredFields(ignoredFields5);
- m_statefulFilter2.setIgnoredFields(ignoredFields5);
- int[] ignoredFields6 = new int[0];
- m_statefulFilter2.setIgnoredFields(ignoredFields6);
- m_statefulFilter2.setOverwriteOriginalFields(false);
- int[] key4 = new int[0];
- m_statefulFilter2.setKey(key4);
- m_statefulFilter2.setKey((int[]) null);
- return m_statefulFilter2;
+ StatefulFilter statefulFilter = new StatefulFilter();
+ int[] ignoredFields = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields);
+ m_statefulFilter2 = new StatefulFilter();
+ int[] ignoredFields2 = new int[2];
+ statefulFilter.setIgnoredFields(ignoredFields2);
+ int[] key = new int[0];
+ statefulFilter.setKey(key);
+ int[] ignoredFields3 = new int[1];
+ int[] key2 = new int[0];
+ statefulFilter.setKey(key2);
+ int[] ignoredFields4 = new int[0];
+ statefulFilter.setIgnoredFields(ignoredFields4);
+ statefulFilter.setIgnoredFields(ignoredFields3);
+ m_statefulFilter3 = new StatefulFilter();
+ m_statefulFilter3.setOverwriteOriginalFields(true);
+ int[] key3 = new int[3];
+ m_statefulFilter3.setKey(key3);
+ int[] ignoredFields5 = new int[0];
+ m_statefulFilter3.setIgnoredFields(ignoredFields5);
+ m_statefulFilter2.setIgnoredFields(ignoredFields5);
+ int[] ignoredFields6 = new int[0];
+ m_statefulFilter2.setIgnoredFields(ignoredFields6);
+ m_statefulFilter2.setOverwriteOriginalFields(false);
+ int[] key4 = new int[0];
+ m_statefulFilter2.setKey(key4);
+ m_statefulFilter2.setKey((int[]) null);
+ return m_statefulFilter2;
}
}
diff --git a/jpos/src/test/java/org/jpos/q2/iso/TaskAdaptorTest.java b/jpos/src/test/java/org/jpos/q2/iso/TaskAdaptorTest.java
index 64c951b..fafe1e9 100644
--- a/jpos/src/test/java/org/jpos/q2/iso/TaskAdaptorTest.java
+++ b/jpos/src/test/java/org/jpos/q2/iso/TaskAdaptorTest.java
@@ -98,14 +98,4 @@ public class TaskAdaptorTest {
assertEquals("taskAdaptor.getName()", "testTaskAdaptorName", taskAdaptor.getName());
}
- @Test
- public void testStopServiceThrowsNullPointerException() throws Throwable {
- TaskAdaptor taskAdaptor = new TaskAdaptor();
- try {
- taskAdaptor.stopService();
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
- }
}
diff --git a/jpos/src/test/java/org/jpos/q2/qbean/SpaceLetTest.java b/jpos/src/test/java/org/jpos/q2/qbean/SpaceLetTest.java
index 6e42cc0..ba65bd5 100644
--- a/jpos/src/test/java/org/jpos/q2/qbean/SpaceLetTest.java
+++ b/jpos/src/test/java/org/jpos/q2/qbean/SpaceLetTest.java
@@ -155,13 +155,4 @@ public class SpaceLetTest {
}
}
- @Test
- public void testStopServiceThrowsNullPointerException() throws Throwable {
- try {
- new SpaceLet().stopService();
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- // expected
- }
- }
}
diff --git a/jpos/src/test/java/org/jpos/q2/security/KeyStoreAdaptorTest.java b/jpos/src/test/java/org/jpos/q2/security/KeyStoreAdaptorTest.java
index cae9809..c07cdf5 100644
--- a/jpos/src/test/java/org/jpos/q2/security/KeyStoreAdaptorTest.java
+++ b/jpos/src/test/java/org/jpos/q2/security/KeyStoreAdaptorTest.java
@@ -86,17 +86,7 @@ public class KeyStoreAdaptorTest {
assertEquals("keyStoreAdaptor.clazz", "testKeyStoreAdaptorClazz", keyStoreAdaptor.clazz);
}
- @Test
- public void testStartServiceThrowsNullPointerException() throws Throwable {
- KeyStoreAdaptor keyStoreAdaptor = new KeyStoreAdaptor();
- try {
- keyStoreAdaptor.startService();
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
- }
-
+
@Test
public void testStopService() throws Throwable {
KeyStoreAdaptor keyStoreAdaptor = new KeyStoreAdaptor();
@@ -105,14 +95,5 @@ public class KeyStoreAdaptorTest {
assertEquals("keyStoreAdaptor.getName()", "testKeyStoreAdaptorName", keyStoreAdaptor.getName());
}
- @Test
- public void testStopServiceThrowsNullPointerException() throws Throwable {
- KeyStoreAdaptor keyStoreAdaptor = new KeyStoreAdaptor();
- try {
- keyStoreAdaptor.stopService();
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
- }
+
}
diff --git a/jpos/src/test/java/org/jpos/q2/security/SMAdaptorTest.java b/jpos/src/test/java/org/jpos/q2/security/SMAdaptorTest.java
index 673576d..a41090e 100644
--- a/jpos/src/test/java/org/jpos/q2/security/SMAdaptorTest.java
+++ b/jpos/src/test/java/org/jpos/q2/security/SMAdaptorTest.java
@@ -94,17 +94,6 @@ public class SMAdaptorTest {
}
@Test
- public void testStartServiceThrowsNullPointerException() throws Throwable {
- SMAdaptor sMAdaptor = new SMAdaptor();
- try {
- sMAdaptor.startService();
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
- }
-
- @Test
public void testStopService() throws Throwable {
SMAdaptor sMAdaptor = new SMAdaptor();
sMAdaptor.setName("testSMAdaptorName");
@@ -112,14 +101,4 @@ public class SMAdaptorTest {
assertEquals("sMAdaptor.getName()", "testSMAdaptorName", sMAdaptor.getName());
}
- @Test
- public void testStopServiceThrowsNullPointerException() throws Throwable {
- SMAdaptor sMAdaptor = new SMAdaptor();
- try {
- sMAdaptor.stopService();
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
- }
}
diff --git a/jpos/src/test/java/org/jpos/space/SpaceFactoryTest.java b/jpos/src/test/java/org/jpos/space/SpaceFactoryTest.java
index 5062e5f..00b1280 100644
--- a/jpos/src/test/java/org/jpos/space/SpaceFactoryTest.java
+++ b/jpos/src/test/java/org/jpos/space/SpaceFactoryTest.java
@@ -29,58 +29,43 @@ public class SpaceFactoryTest {
@Test
public void testConstructor() throws Throwable {
- new SpaceFactory();
- assertTrue("Test completed without Exception", true);
+ new SpaceFactory();
+ assertTrue("Test completed without Exception", true);
}
@Test
public void testGetSpace2() throws Throwable {
- TSpace result = (TSpace) SpaceFactory.getSpace("testString");
- assertTrue("result.isEmpty()", result.isEmpty());
+ TSpace result = (TSpace) SpaceFactory.getSpace("testString");
+ assertTrue("result.isEmpty()", result.isEmpty());
}
- // @Test public void testGetSpace4() throws Throwable {
- // TSpace result = (TSpace) SpaceFactory.getSpace("");
- // assertTrue("result.isEmpty()", result.isEmpty());
- // }
- //
- // @Test public void testGetSpace5() throws Throwable {
- // TSpace result = (TSpace) SpaceFactory.getSpace(null);
- // assertTrue("result.isEmpty()", result.isEmpty());
- // }
- //
- //
- // @Test public void testGetSpace7() throws Throwable {
- // TSpace result = (TSpace) SpaceFactory.getSpace();
- // assertTrue("result.isEmpty()", result.isEmpty());
- // }
-
public void testGetSpaceThrowsNullPointerException1() throws Throwable {
- try {
- SpaceFactory.getSpace("testSpaceFactoryScheme", "testSpaceFactoryName", "testSpaceFactoryParam");
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ try {
+ SpaceFactory.getSpace("testSpaceFactoryScheme",
+ "testSpaceFactoryName", "testSpaceFactoryParam");
+ fail("Expected NullPointerException to be thrown");
+ } catch (NullPointerException ex) {
+ assertNull("ex.getMessage()", ex.getMessage());
+ }
}
- @Test
+ @Test(expected = SpaceError.class)
public void testGetSpaceThrowsNullPointerException2() throws Throwable {
- try {
- SpaceFactory.getSpace("testSpaceFactoryScheme", "testSpaceFactoryName", null);
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
+ SpaceFactory.getSpace("testSpaceFactoryScheme", "testSpaceFactoryName",
+ null);
}
@Test
public void testGetSpaceThrowsSpaceError() throws Throwable {
- try {
- SpaceFactory.getSpace("spacelet", "testSpaceFactoryName", "testSpaceFactoryParam");
- fail("Expected SpaceError to be thrown");
- } catch (SpaceError ex) {
- assertEquals("ex.getMessage()", "spacelet:testSpaceFactoryName:testSpaceFactoryParam not found.", ex.getMessage());
- }
+ try {
+ SpaceFactory.getSpace("spacelet", "testSpaceFactoryName",
+ "testSpaceFactoryParam");
+ fail("Expected SpaceError to be thrown");
+ } catch (SpaceError ex) {
+ assertEquals(
+ "ex.getMessage()",
+ "spacelet:testSpaceFactoryName:testSpaceFactoryParam not found.",
+ ex.getMessage());
+ }
}
}
diff --git a/jpos/src/test/java/org/jpos/space/SpaceProxyTest.java b/jpos/src/test/java/org/jpos/space/SpaceProxyTest.java
index ede286c..4dc0bb0 100644
--- a/jpos/src/test/java/org/jpos/space/SpaceProxyTest.java
+++ b/jpos/src/test/java/org/jpos/space/SpaceProxyTest.java
@@ -18,20 +18,15 @@
package org.jpos.space;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
import static org.junit.Assert.fail;
import org.junit.Test;
public class SpaceProxyTest {
- @Test
- public void testConstructorThrowsNullPointerException() throws Throwable {
- try {
+ @Test(expected=SpaceError.class)
+ public void testConstructor() throws Throwable {
new SpaceProxy("Inval*d space: ");
- fail("Expected NullPointerException to be thrown");
- } catch (NullPointerException ex) {
- assertNull("ex.getMessage()", ex.getMessage());
- }
}
}
diff --git a/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java b/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
index 3b56c3b..c40c055 100644
--- a/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
+++ b/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
@@ -18,6 +18,8 @@
package org.jpos.util;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
@@ -27,45 +29,47 @@ import static org.junit.Assert.assertThat;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
-import org.junit.Before;
+import org.junit.*;
import org.junit.Test;
public class NameRegistrarTest {
private static final boolean WITH_DETAIL = true;
- @Before
- public void setup() {
+ @BeforeClass
+ public static void onSetup() {
NameRegistrar.register("test1", "testValue1");
NameRegistrar.register("test2", "testValue2");
}
- @Test
- public void testDumpWithoutDetailAndIndent() throws Throwable {
- String expected = "testNameRegistrarIndent--- name-registrar ---\n"
- + "testNameRegistrarIndent test1: java.lang.String\n"
- + "testNameRegistrarIndent test2: java.lang.String\n";
+ @AfterClass
+ public static void tearDown() {
+ NameRegistrar.unregister("test1");
+ NameRegistrar.unregister("test2");
+ }
+ @Test
+ public void testDumpWithoutDetail() throws Throwable {
ByteArrayOutputStream out = new ByteArrayOutputStream();
NameRegistrar.getInstance().dump(new PrintStream(out),
- "testNameRegistrarIndent");
+ "€");
- String result = out.toString();
- assertThat(result, is(expected));
+ assertThat(
+ out.toString(),
+ allOf(containsString("€--- name-registrar ---\n"),
+ containsString("test1"), containsString("test2")));
}
@Test
public void testDumpWithDetailAndIndent() throws Throwable {
- String expected = "+--- name-registrar ---\n"
- + "+ test1: java.lang.String\n"
- + "+ test2: java.lang.String\n";
-
ByteArrayOutputStream out = new ByteArrayOutputStream();
NameRegistrar.getInstance()
.dump(new PrintStream(out), "+", WITH_DETAIL);
- String result = out.toString();
- assertThat(result, is(expected));
+ assertThat(
+ out.toString(),
+ allOf(containsString("+--- name-registrar ---\n"),
+ containsString("test1"), containsString("test2")));
}
@Test
@@ -99,16 +103,22 @@ public class NameRegistrarTest {
@Test(expected = NameRegistrar.NotFoundException.class)
public void testUnregister() throws Exception {
- NameRegistrar.unregister("test1");
- NameRegistrar.get("test1");
+ NameRegistrar.register("test3", "someTest3Value");
+ assertThat((String) NameRegistrar.get("test3"), is("someTest3Value"));
+ NameRegistrar.unregister("test3");
+ NameRegistrar.get("test3");
}
@Test
+ public void testUnregisterUnknownKeyDoesNotThrowException() throws Exception {
+ NameRegistrar.unregister("unknownKey");
+ }
+
+ @Test
public void testNotFoundExceptionConstructor1() throws Throwable {
NameRegistrar.NotFoundException notFoundException = new NameRegistrar.NotFoundException(
"testNotFoundExceptionDetail");
assertEquals("notFoundException.getMessage()",
"testNotFoundExceptionDetail", notFoundException.getMessage());
}
-
}
--
1.7.7.5 (Apple Git-26)
From 0cf1540a1edc918c08f48c253e1da25c307444b9 Mon Sep 17 00:00:00 2001
From: Christopher Barham <[email protected]>
Date: Fri, 25 May 2012 16:36:21 +0200
Subject: [PATCH 12/12] Fixes for unit tests following introduction of HashMap
which allows null keys
---
.../test/java/org/jpos/util/NameRegistrarTest.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java b/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
index c40c055..6caeb08 100644
--- a/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
+++ b/jpos/src/test/java/org/jpos/util/NameRegistrarTest.java
@@ -52,16 +52,16 @@ public class NameRegistrarTest {
public void testDumpWithoutDetail() throws Throwable {
ByteArrayOutputStream out = new ByteArrayOutputStream();
NameRegistrar.getInstance().dump(new PrintStream(out),
- "€");
+ ">");
assertThat(
out.toString(),
- allOf(containsString("€--- name-registrar ---\n"),
+ allOf(containsString(">--- name-registrar ---\n"),
containsString("test1"), containsString("test2")));
}
@Test
- public void testDumpWithDetailAndIndent() throws Throwable {
+ public void testDumpWithDetail() throws Throwable {
ByteArrayOutputStream out = new ByteArrayOutputStream();
NameRegistrar.getInstance()
.dump(new PrintStream(out), "+", WITH_DETAIL);
--
1.7.7.5 (Apple Git-26)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment