Skip to content

Commit

Permalink
missing import
Browse files Browse the repository at this point in the history
  • Loading branch information
@barspi
barspi committed Feb 23, 2023
1 parent 95c8b29 commit f70b850
Showing 1 changed file with 34 additions and 36 deletions.
70 changes: 34 additions & 36 deletions jpos/src/test/java/org/jpos/iso/ISOMsgTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@

package org.jpos.iso;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.*;

import org.junit.jupiter.api.Test;

Expand All @@ -42,81 +40,81 @@ public void testGetBytes() throws Exception {
assertEquals ("Field 63.2.3", m.getString ("63.2.3"));
assertEquals ("CAFEBABE", new String(m.getBytes("63.2.4")));
}

@Test
public void testFPath() throws Exception {
ISOMsg m = new ISOMsg("0100");

String mynull = null;

assertFalse(m.hasField("63"));
assertFalse(m.hasField(63));
assertFalse(m.hasField("63.2"));
assertFalse(m.hasField("63.2.3"));

m.set("63.2.3","value3");
m.set("63.2.4","value4");

/*
* Check null processing on set matches existing processing (setting to null same as unset).
*
*
* Please note m.set(fPathString,null) is amiguous and cannot be distinguished from
* m.set(fieldNumberString, byte[]), so take care.
*/
m.set("63.2.5",mynull); // null
m.set("63.2.6",m.getString("99")); // null as well
assertFalse(m.hasField("63.2.5"));
assertFalse(m.hasField("63.2.6"));

assertEquals(true,m.hasField("63.2.3"));
assertEquals("value3", m.getString("63.2.3"));
assertEquals(true,m.hasField("63.2.4"));
assertEquals("value4", m.getString("63.2.4"));

assertFalse(m.hasField("63.2.999"));
assertFalse(m.hasField("63.2.4.999"));

m.unset("63.2.3");

assertFalse(m.hasField("63.2.3"));

assertEquals(true,m.hasField("63.2"));
m.unset("63.2.4"); // Removal of last remaining field triggers removal of immediate parent.
assertFalse(m.hasField("63.2"));

m.unset("63.2.4.999"); // No problem removing non-existant fields.

assertFalse(m.hasField("99"));
assertFalse(m.hasField(99));
m.set("99.99","value99");
m.set("99.98",mynull);

assertEquals(true, m.hasField("99.99"));
assertEquals("value99", m.getString("99.99"));

assertFalse(m.hasField("100"));
assertFalse(m.hasField(100));
m.set("100.100",mynull);
assertFalse(m.hasField("100.100"));
assertFalse(m.hasField("100")); // Not added unnecessarily
assertFalse(m.hasField(100)); // Still not added unnecessarily


}

@Test
public void testFPathISOComponent() throws Exception {
ISOMsg m = new ISOMsg("0100");

ISOField f100 = new ISOField(100,"value100");

assertFalse(m.hasField("100"));
assertFalse(m.hasField(100));
m.set(f100);
assertTrue(m.hasField("100"));
assertTrue(m.hasField(100));
assertEquals(f100,m.getComponent("100"));

assertFalse(m.hasField("101"));
assertFalse(m.hasField(101));
m.set("101.101","value101");
Expand All @@ -133,12 +131,12 @@ public void testFPathISOComponent() throws Exception {
ISOMsg f102 = new ISOMsg(102);
f102.set("1","value1");
f102.set("2","value2");

assertFalse(m.hasField("102"));
m.set(f102);
assertTrue(m.hasField("102.1"));
assertTrue(m.hasField("102.2"));

ISOMsg copy = new ISOMsg();
copy.set("101",m.getComponent("101"));
assertTrue(copy.hasField("101"));
Expand All @@ -147,7 +145,7 @@ public void testFPathISOComponent() throws Exception {
assertTrue(copy.hasField("101.102"));
assertEquals("value101",copy.getString("101.101"));
assertEquals("value102",copy.getString("101.102"));

copy.set("102.1", m.getComponent("102.1"));
assertTrue(copy.hasField("102"));
assertTrue(copy.hasField(102));
Expand All @@ -156,7 +154,7 @@ public void testFPathISOComponent() throws Exception {
assertFalse(copy.hasField("102.2"));
assertNull(copy.getString("102.2"));
}

@Test
public void testFPathISOComponent_2() throws Exception {
ISOAmount comp = new ISOAmount();
Expand Down Expand Up @@ -212,18 +210,18 @@ public void testFPathISOComponent_2() throws Exception {
@Test
public void testFPathISOEcho() throws Exception {
ISOMsg m = new ISOMsg("0100");

ISOField f100 = new ISOField(100,"value100");
m.set(f100);

m.set("101.101","value101");
m.set("101.102","value102");

ISOMsg f102 = new ISOMsg(102);
f102.set("1","value1");
f102.set("2","value2");
m.set(f102);

ISOMsg f103 = new ISOMsg(103);
f103.set("97","value1");
f103.set("98","value2");
Expand All @@ -237,15 +235,15 @@ public void testFPathISOEcho() throws Exception {
m.set(14,"14");
m.set(15,"15");
m.set(16,"16");

String[] echoList = new String[] {"10","11","16","14","101.102","103","911.911","999"};

ISOMsg copyMsg = new ISOMsg();

for (String fpath : echoList) {
copyMsg.set(fpath, m.getComponent(fpath));
}

/*
* Check fields in echoMsg
*/
Expand All @@ -264,8 +262,8 @@ public void testFPathISOEcho() throws Exception {
assertEquals(true,copyMsg.hasField(103)); // Whole of 103 copied
assertEquals(true,copyMsg.hasField("103.97")); // Whole of 103 copied
assertEquals(true,copyMsg.hasField("103.98")); // Whole of 103 copied


/*
* Check fields echod but *not* present in m are not somehow present in copyMsg
*/
Expand All @@ -274,7 +272,7 @@ public void testFPathISOEcho() throws Exception {
assertFalse(copyMsg.hasField("911.911"));
assertFalse(copyMsg.hasField("999"));
assertFalse(copyMsg.hasField(999));

/*
* Check fields present in m but not required to be copied are not present in copyMsg
*/
Expand Down

0 comments on commit f70b850

Please sign in to comment.