Skip to content
Snippets Groups Projects
Commit 31979651 authored by René Schöne's avatar René Schöne
Browse files

fix tests after making mappings non-static

parent 2b726f1a
No related branches found
No related tags found
1 merge request!30Feature: JavaHandler
Pipeline #13670 passed
Stage: build
Stage: test
Stage: ragdoc_build
Stage: ragdoc_view
Stage: publish
Show whitespace changes
Inline Side-by-side
ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/JavaTest.java
+ 7
− 5
View file @ 31979651
......@@ -103,11 +103,6 @@ public class JavaTest {
;
communicateBoth();
handler.push(TOPIC_RECEIVE_TOKEN, ExposingASTNode.INSTANCE.stringToBytes("7"));
checker.put(TOPIC_RECEIVE_TOKEN, "7").check();
System.out.println(model.ragconnectEvaluationCounterSummary());
}
@Test
......@@ -138,6 +133,13 @@ public class JavaTest {
senderRoot.addSendManyNode(createA("5"));
checker.put(TOPIC_SEND_MANY, tuple("5")).check();
handler.push(TOPIC_RECEIVE_TOKEN, ExposingASTNode.INSTANCE.stringToBytes("7"));
checker.put(TOPIC_RECEIVE_TOKEN, "7").check();
// TODO check other receive ports
System.out.println(model.ragconnectEvaluationCounterSummary());
}
private void checkA(String expectedValue, A actual, String alias) {
......
ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
+ 51
− 48
View file @ 31979651
......@@ -335,56 +335,56 @@ public class TestUtils {
@SuppressWarnings({"unused", "rawtypes"})
public static class DefaultMappings {
static class ReadNode extends defaultOnlyRead.ast.ASTNode {
public static boolean DefaultBytesToBooleanMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._ragconnect__apply__DefaultBytesToBooleanMapping(input);
public boolean DefaultBytesToBooleanMapping(byte[] input) throws Exception {
return _ragconnect__apply__DefaultBytesToBooleanMapping(input);
}
public static int DefaultBytesToIntMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._ragconnect__apply__DefaultBytesToIntMapping(input);
public int DefaultBytesToIntMapping(byte[] input) throws Exception {
return _ragconnect__apply__DefaultBytesToIntMapping(input);
}
public static short DefaultBytesToShortMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._ragconnect__apply__DefaultBytesToShortMapping(input);
public short DefaultBytesToShortMapping(byte[] input) throws Exception {
return _ragconnect__apply__DefaultBytesToShortMapping(input);
}
public static long DefaultBytesToLongMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._ragconnect__apply__DefaultBytesToLongMapping(input);
public long DefaultBytesToLongMapping(byte[] input) throws Exception {
return _ragconnect__apply__DefaultBytesToLongMapping(input);
}
public static float DefaultBytesToFloatMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._ragconnect__apply__DefaultBytesToFloatMapping(input);
public float DefaultBytesToFloatMapping(byte[] input) throws Exception {
return _ragconnect__apply__DefaultBytesToFloatMapping(input);
}
public static double DefaultBytesToDoubleMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._ragconnect__apply__DefaultBytesToDoubleMapping(input);
public double DefaultBytesToDoubleMapping(byte[] input) throws Exception {
return _ragconnect__apply__DefaultBytesToDoubleMapping(input);
}
public static char DefaultBytesToCharMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._ragconnect__apply__DefaultBytesToCharMapping(input);
public char DefaultBytesToCharMapping(byte[] input) throws Exception {
return _ragconnect__apply__DefaultBytesToCharMapping(input);
}
public static String DefaultBytesToStringMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._ragconnect__apply__DefaultBytesToStringMapping(input);
public String DefaultBytesToStringMapping(byte[] input) throws Exception {
return _ragconnect__apply__DefaultBytesToStringMapping(input);
}
}
static class WriteNode extends defaultOnlyWrite.ast.ASTNode {
public static byte[] DefaultBooleanToBytesMapping(boolean input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._ragconnect__apply__DefaultBooleanToBytesMapping(input);
public byte[] DefaultBooleanToBytesMapping(boolean input) throws Exception {
return _ragconnect__apply__DefaultBooleanToBytesMapping(input);
}
public static byte[] DefaultIntToBytesMapping(int input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._ragconnect__apply__DefaultIntToBytesMapping(input);
public byte[] DefaultIntToBytesMapping(int input) throws Exception {
return _ragconnect__apply__DefaultIntToBytesMapping(input);
}
public static byte[] DefaultShortToBytesMapping(short input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._ragconnect__apply__DefaultShortToBytesMapping(input);
public byte[] DefaultShortToBytesMapping(short input) throws Exception {
return _ragconnect__apply__DefaultShortToBytesMapping(input);
}
public static byte[] DefaultLongToBytesMapping(long input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._ragconnect__apply__DefaultLongToBytesMapping(input);
public byte[] DefaultLongToBytesMapping(long input) throws Exception {
return _ragconnect__apply__DefaultLongToBytesMapping(input);
}
public static byte[] DefaultFloatToBytesMapping(float input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._ragconnect__apply__DefaultFloatToBytesMapping(input);
public byte[] DefaultFloatToBytesMapping(float input) throws Exception {
return _ragconnect__apply__DefaultFloatToBytesMapping(input);
}
public static byte[] DefaultDoubleToBytesMapping(double input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._ragconnect__apply__DefaultDoubleToBytesMapping(input);
public byte[] DefaultDoubleToBytesMapping(double input) throws Exception {
return _ragconnect__apply__DefaultDoubleToBytesMapping(input);
}
public static byte[] DefaultCharToBytesMapping(char input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._ragconnect__apply__DefaultCharToBytesMapping(input);
public byte[] DefaultCharToBytesMapping(char input) throws Exception {
return _ragconnect__apply__DefaultCharToBytesMapping(input);
}
public static byte[] DefaultStringToBytesMapping(String input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._ragconnect__apply__DefaultStringToBytesMapping(input);
public byte[] DefaultStringToBytesMapping(String input) throws Exception {
return _ragconnect__apply__DefaultStringToBytesMapping(input);
}
}
@FunctionalInterface
......@@ -392,9 +392,12 @@ public class TestUtils {
void accept(JsonGenerator g, String fieldName) throws E;
}
static ReadNode readNode = new ReadNode();
static WriteNode writeNode = new WriteNode();
public static boolean BytesToBool(byte[] input) {
try {
return ReadNode.DefaultBytesToBooleanMapping(input);
return readNode.DefaultBytesToBooleanMapping(input);
} catch (Exception e) {
e.printStackTrace();
return false;
......@@ -402,7 +405,7 @@ public class TestUtils {
}
public static int BytesToInt(byte[] input) {
try {
return ReadNode.DefaultBytesToIntMapping(input);
return readNode.DefaultBytesToIntMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -410,7 +413,7 @@ public class TestUtils {
}
public static short BytesToShort(byte[] input) {
try {
return ReadNode.DefaultBytesToShortMapping(input);
return readNode.DefaultBytesToShortMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -418,7 +421,7 @@ public class TestUtils {
}
public static long BytesToLong(byte[] input) {
try {
return ReadNode.DefaultBytesToLongMapping(input);
return readNode.DefaultBytesToLongMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -426,7 +429,7 @@ public class TestUtils {
}
public static float BytesToFloat(byte[] input) {
try {
return ReadNode.DefaultBytesToFloatMapping(input);
return readNode.DefaultBytesToFloatMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -434,7 +437,7 @@ public class TestUtils {
}
public static double BytesToDouble(byte[] input) {
try {
return ReadNode.DefaultBytesToDoubleMapping(input);
return readNode.DefaultBytesToDoubleMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -442,7 +445,7 @@ public class TestUtils {
}
public static char BytesToChar(byte[] input) {
try {
return ReadNode.DefaultBytesToCharMapping(input);
return readNode.DefaultBytesToCharMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -450,7 +453,7 @@ public class TestUtils {
}
public static String BytesToString(byte[] input) {
try {
return ReadNode.DefaultBytesToStringMapping(input);
return readNode.DefaultBytesToStringMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -458,7 +461,7 @@ public class TestUtils {
}
public static byte[] BoolToBytes(boolean input) {
try {
return WriteNode.DefaultBooleanToBytesMapping(input);
return writeNode.DefaultBooleanToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -466,7 +469,7 @@ public class TestUtils {
}
public static byte[] IntToBytes(int input) {
try {
return WriteNode.DefaultIntToBytesMapping(input);
return writeNode.DefaultIntToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -474,7 +477,7 @@ public class TestUtils {
}
public static byte[] ShortToBytes(short input) {
try {
return WriteNode.DefaultShortToBytesMapping(input);
return writeNode.DefaultShortToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -482,7 +485,7 @@ public class TestUtils {
}
public static byte[] LongToBytes(long input) {
try {
return WriteNode.DefaultLongToBytesMapping(input);
return writeNode.DefaultLongToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -490,7 +493,7 @@ public class TestUtils {
}
public static byte[] FloatToBytes(float input) {
try {
return WriteNode.DefaultFloatToBytesMapping(input);
return writeNode.DefaultFloatToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -498,7 +501,7 @@ public class TestUtils {
}
public static byte[] DoubleToBytes(double input) {
try {
return WriteNode.DefaultDoubleToBytesMapping(input);
return writeNode.DefaultDoubleToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -506,7 +509,7 @@ public class TestUtils {
}
public static byte[] CharToBytes(char input) {
try {
return WriteNode.DefaultCharToBytesMapping(input);
return writeNode.DefaultCharToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -514,7 +517,7 @@ public class TestUtils {
}
public static byte[] StringToBytes(String input) {
try {
return WriteNode.DefaultStringToBytesMapping(input);
return writeNode.DefaultStringToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment