diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/ZcodeAcceptanceTestCapabilityResult.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/AcceptanceTestCapabilityResult.java similarity index 60% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/ZcodeAcceptanceTestCapabilityResult.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/AcceptanceTestCapabilityResult.java index 345585c7e..ac9060427 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/ZcodeAcceptanceTestCapabilityResult.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/AcceptanceTestCapabilityResult.java @@ -1,6 +1,6 @@ package net.zscript.zscript_acceptance_tests; -public class ZcodeAcceptanceTestCapabilityResult { +public class AcceptanceTestCapabilityResult { private static byte[] supportedCodes = null; private static int generalCapabilities = -1; private static int maxBigFieldLength = -1; @@ -12,46 +12,46 @@ public class ZcodeAcceptanceTestCapabilityResult { private static boolean hasBeenRead = false; public static void addSupportedCodes(byte[] supportedCodes) { - if (ZcodeAcceptanceTestCapabilityResult.supportedCodes == null) { - ZcodeAcceptanceTestCapabilityResult.supportedCodes = supportedCodes; + if (AcceptanceTestCapabilityResult.supportedCodes == null) { + AcceptanceTestCapabilityResult.supportedCodes = supportedCodes; } else { - byte[] tmp = ZcodeAcceptanceTestCapabilityResult.supportedCodes; - ZcodeAcceptanceTestCapabilityResult.supportedCodes = new byte[tmp.length + supportedCodes.length]; - System.arraycopy(tmp, 0, ZcodeAcceptanceTestCapabilityResult.supportedCodes, 0, tmp.length); - System.arraycopy(supportedCodes, 0, ZcodeAcceptanceTestCapabilityResult.supportedCodes, tmp.length, supportedCodes.length); + byte[] tmp = AcceptanceTestCapabilityResult.supportedCodes; + AcceptanceTestCapabilityResult.supportedCodes = new byte[tmp.length + supportedCodes.length]; + System.arraycopy(tmp, 0, AcceptanceTestCapabilityResult.supportedCodes, 0, tmp.length); + System.arraycopy(supportedCodes, 0, AcceptanceTestCapabilityResult.supportedCodes, tmp.length, supportedCodes.length); } } public static void setGeneralCapabilities(int generalCapabilities) { - ZcodeAcceptanceTestCapabilityResult.generalCapabilities = generalCapabilities; + AcceptanceTestCapabilityResult.generalCapabilities = generalCapabilities; } public static void setMaxBigFieldLength(int maxBigFieldLength) { - ZcodeAcceptanceTestCapabilityResult.maxBigFieldLength = maxBigFieldLength; + AcceptanceTestCapabilityResult.maxBigFieldLength = maxBigFieldLength; } public static void setMaxFieldNum(int maxFieldNum) { - ZcodeAcceptanceTestCapabilityResult.maxFieldNum = maxFieldNum; + AcceptanceTestCapabilityResult.maxFieldNum = maxFieldNum; } public static void setMaxFieldSize(int maxFieldSize) { - ZcodeAcceptanceTestCapabilityResult.maxFieldSize = maxFieldSize; + AcceptanceTestCapabilityResult.maxFieldSize = maxFieldSize; } public static void setFieldSizeUnit(int fieldSizeUnit) { - ZcodeAcceptanceTestCapabilityResult.fieldSizeUnit = fieldSizeUnit; + AcceptanceTestCapabilityResult.fieldSizeUnit = fieldSizeUnit; } public static void setMaxPageNum(int maxPageNum) { - ZcodeAcceptanceTestCapabilityResult.maxPageNum = maxPageNum; + AcceptanceTestCapabilityResult.maxPageNum = maxPageNum; } public static void setPersistentMemorySize(long persistentMemorySize) { - ZcodeAcceptanceTestCapabilityResult.persistentMemorySize = persistentMemorySize; + AcceptanceTestCapabilityResult.persistentMemorySize = persistentMemorySize; } public static void setHasBeenRead() { - ZcodeAcceptanceTestCapabilityResult.hasBeenRead = true; + AcceptanceTestCapabilityResult.hasBeenRead = true; } public static byte[] getSupportedCodes() { diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/AcceptanceTestConnectionManager.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/AcceptanceTestConnectionManager.java new file mode 100644 index 000000000..a250991ca --- /dev/null +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/AcceptanceTestConnectionManager.java @@ -0,0 +1,18 @@ +package net.zscript.zscript_acceptance_tests; + +import java.util.ArrayList; +import java.util.List; + +import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestConnection; + +public class AcceptanceTestConnectionManager { + private static List connections = new ArrayList<>(); + + public static void registerConnection(AcceptanceTestConnection con) { + connections.add(con); + } + + public static List getConnections() { + return connections; + } +} diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/ZcodeAcceptanceTestConnectionManager.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/ZcodeAcceptanceTestConnectionManager.java deleted file mode 100644 index 853952eef..000000000 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/ZcodeAcceptanceTestConnectionManager.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.zscript.zscript_acceptance_tests; - -import java.util.ArrayList; -import java.util.List; - -import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestConnection; - -public class ZcodeAcceptanceTestConnectionManager { - private static List connections = new ArrayList<>(); - - public static void registerConnection(ZcodeAcceptanceTestConnection con) { - connections.add(con); - } - - public static List getConnections() { - return connections; - } -} diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssert.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssert.java similarity index 80% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssert.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssert.java index a3f23a3a4..3de9cd1d0 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssert.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssert.java @@ -12,24 +12,24 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -public class ZcodeAcceptanceTestAssert extends ZcodeAcceptanceTestMessageAssert { - private final ZcodeAcceptanceTestConnection connection; +public class AcceptanceTestAssert extends AcceptanceTestMessageAssert { + private final AcceptanceTestConnection connection; private final byte[] toSend; private final AcceptanceFuture future = new AcceptanceFuture(); private int otherMessagesInFlight; - public ZcodeAcceptanceTestAssert(ZcodeAcceptanceTestConnection connection, byte[] toSend, int otherMessagesInFlight) { + public AcceptanceTestAssert(AcceptanceTestConnection connection, byte[] toSend, int otherMessagesInFlight) { this.connection = connection; this.otherMessagesInFlight = otherMessagesInFlight; this.toSend = toSend; } - public static ZcodeAcceptanceTestAssert assertThatCommand(ZcodeAcceptanceTestConnection connection, byte[] toSend, int otherMessagesInFlight) { - return new ZcodeAcceptanceTestAssert(connection, toSend, otherMessagesInFlight); + public static AcceptanceTestAssert assertThatCommand(AcceptanceTestConnection connection, byte[] toSend, int otherMessagesInFlight) { + return new AcceptanceTestAssert(connection, toSend, otherMessagesInFlight); } - public static ZcodeAcceptanceTestAssert assertThatCommand(ZcodeAcceptanceTestConnection connection, String toSend) { - return new ZcodeAcceptanceTestAssert(connection, toSend.getBytes(StandardCharsets.UTF_8), 0); + public static AcceptanceTestAssert assertThatCommand(AcceptanceTestConnection connection, String toSend) { + return new AcceptanceTestAssert(connection, toSend.getBytes(StandardCharsets.UTF_8), 0); } @Override @@ -42,20 +42,20 @@ public Future send() { private void acceptResponse(byte[] resp) { try { PushbackInputStream in = new PushbackInputStream(new ByteArrayInputStream(resp)); - ZcodeAcceptanceTestResponseSequence seq = new ZcodeAcceptanceTestResponseSequence(); + AcceptanceTestResponseSequence seq = new AcceptanceTestResponseSequence(); int c = in.read(); String current = ""; while (c != -1) { in.unread(c); - ZcodeAcceptanceTestResponse parsedResp = new ZcodeAcceptanceTestResponse(); + AcceptanceTestResponse parsedResp = new AcceptanceTestResponse(); current = parsedResp.parseCommand(in, seq, current); - if (parsedResp.getStatus() != ZcodeAcceptanceTestResponseStatus.SKIP_COMMAND) { + if (parsedResp.getStatus() != AcceptanceTestResponseStatus.SKIP_COMMAND) { seq.addResponse(parsedResp); } c = in.read(); } List charsDone = new ArrayList<>(); - for (ZcodeAcceptanceTestCondition condition : conditions) { + for (AcceptanceTestCondition condition : conditions) { condition.test(seq, charsDone); } future.complete(); diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssertIntermediateEach.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssertIntermediateEach.java new file mode 100644 index 000000000..a075e0e2c --- /dev/null +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssertIntermediateEach.java @@ -0,0 +1,25 @@ +package net.zscript.zscript_acceptance_tests.acceptancetest_asserts; + +import java.util.concurrent.Future; + +public class AcceptanceTestAssertIntermediateEach extends AcceptanceTestMessageAssert { + private final AcceptanceTestMessageAssert parent; + + public AcceptanceTestAssertIntermediateEach(AcceptanceTestMessageAssert parent) { + this.parent = parent; + } + + @Override + public Future send() { + return parent.send(); + } + + public AcceptanceTestCondition getAsCondition() { + return (seq, prev) -> { + for (AcceptanceTestCondition condition : conditions) { + condition.test(seq, prev); + } + }; + } + +} diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssertIntermediateOr.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssertIntermediateOr.java similarity index 74% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssertIntermediateOr.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssertIntermediateOr.java index b53d7c792..d9024374b 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssertIntermediateOr.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestAssertIntermediateOr.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.concurrent.Future; -public class ZcodeAcceptanceTestAssertIntermediateOr extends ZcodeAcceptanceTestMessageAssert { - private final ZcodeAcceptanceTestMessageAssert parent; +public class AcceptanceTestAssertIntermediateOr extends AcceptanceTestMessageAssert { + private final AcceptanceTestMessageAssert parent; - public ZcodeAcceptanceTestAssertIntermediateOr(ZcodeAcceptanceTestMessageAssert parent) { + public AcceptanceTestAssertIntermediateOr(AcceptanceTestMessageAssert parent) { this.parent = parent; } @@ -17,14 +17,14 @@ public Future send() { return parent.send(); } - public ZcodeAcceptanceTestCondition getAsCondition() { + public AcceptanceTestCondition getAsCondition() { return (seq, prev) -> { List errors = new ArrayList<>(); boolean worked = false; - for (ZcodeAcceptanceTestCondition condition : conditions) { - ZcodeAcceptanceTestResponseSequence seqclone = new ZcodeAcceptanceTestResponseSequence(); - for (ZcodeAcceptanceTestResponse resp : seq.getResps()) { - ZcodeAcceptanceTestResponse respClone = new ZcodeAcceptanceTestResponse(); + for (AcceptanceTestCondition condition : conditions) { + AcceptanceTestResponseSequence seqclone = new AcceptanceTestResponseSequence(); + for (AcceptanceTestResponse resp : seq.getResps()) { + AcceptanceTestResponse respClone = new AcceptanceTestResponse(); List data = resp.getBigField().getField(); for (byte b : data) { respClone.getBigField().addByte(b); diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestBigField.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestBigField.java similarity index 97% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestBigField.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestBigField.java index bc64d2d35..edabd3d90 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestBigField.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestBigField.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; -public class ZcodeAcceptanceTestBigField { +public class AcceptanceTestBigField { private final List field = new ArrayList<>(); private boolean isString = false; diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestCondition.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestCondition.java new file mode 100644 index 000000000..acae1961d --- /dev/null +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestCondition.java @@ -0,0 +1,7 @@ +package net.zscript.zscript_acceptance_tests.acceptancetest_asserts; + +import java.util.List; + +public interface AcceptanceTestCondition { + public void test(AcceptanceTestResponseSequence seq, List prevUsed); +} diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestConnection.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestConnection.java similarity index 83% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestConnection.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestConnection.java index ddc051b79..3911331bc 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestConnection.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestConnection.java @@ -2,7 +2,7 @@ import java.util.function.Consumer; -public interface ZcodeAcceptanceTestConnection { +public interface AcceptanceTestConnection { public void send(byte[] message); public void registerListener(Consumer handler); diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestFieldMap.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestFieldMap.java similarity index 98% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestFieldMap.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestFieldMap.java index b54eeb3c4..4cc36bac1 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestFieldMap.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestFieldMap.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Map.Entry; -public class ZcodeAcceptanceTestFieldMap { +public class AcceptanceTestFieldMap { private final Map fields = new HashMap<>(); public void addField(char c, byte b) { diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestMessageAssert.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestMessageAssert.java similarity index 86% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestMessageAssert.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestMessageAssert.java index 976f60bad..809a040be 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestMessageAssert.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestMessageAssert.java @@ -8,16 +8,16 @@ import java.util.concurrent.Future; import java.util.function.Consumer; -public abstract class ZcodeAcceptanceTestMessageAssert { - final List conditions = new ArrayList<>(); +public abstract class AcceptanceTestMessageAssert { + final List conditions = new ArrayList<>(); - public ZcodeAcceptanceTestMessageAssert worked() { - return hasStatus(ZcodeAcceptanceTestResponseStatus.OK); + public AcceptanceTestMessageAssert worked() { + return hasStatus(AcceptanceTestResponseStatus.OK); } - public ZcodeAcceptanceTestMessageAssert printSequence() { + public AcceptanceTestMessageAssert printSequence() { conditions.add((seq, prev) -> { - for (ZcodeAcceptanceTestResponse resp : seq.getResps()) { + for (AcceptanceTestResponse resp : seq.getResps()) { System.out.println(resp.getFields().asString() + resp.getBigField().asString()); } System.out.println(); @@ -25,33 +25,33 @@ public ZcodeAcceptanceTestMessageAssert printSequence() { return this; } - public ZcodeAcceptanceTestMessageAssert printCommand() { + public AcceptanceTestMessageAssert printCommand() { conditions.add((seq, prev) -> { System.out.println(seq.peekFirst().getFields().asString() + seq.peekFirst().getBigField().asString()); }); return this; } - public ZcodeAcceptanceTestMessageAssert anyOf(Consumer options) { - ZcodeAcceptanceTestAssertIntermediateOr or = new ZcodeAcceptanceTestAssertIntermediateOr(this); + public AcceptanceTestMessageAssert anyOf(Consumer options) { + AcceptanceTestAssertIntermediateOr or = new AcceptanceTestAssertIntermediateOr(this); options.accept(or); conditions.add(or.getAsCondition()); return this; } - public ZcodeAcceptanceTestMessageAssert eachOf(Consumer options) { - ZcodeAcceptanceTestAssertIntermediateEach and = new ZcodeAcceptanceTestAssertIntermediateEach(this); + public AcceptanceTestMessageAssert eachOf(Consumer options) { + AcceptanceTestAssertIntermediateEach and = new AcceptanceTestAssertIntermediateEach(this); options.accept(and); conditions.add(and.getAsCondition()); return this; } - public ZcodeAcceptanceTestMessageAssert hasStatus(ZcodeAcceptanceTestResponseStatus r) { + public AcceptanceTestMessageAssert hasStatus(AcceptanceTestResponseStatus r) { conditions.add((seq, prev) -> { prev.add('S'); - ZcodeAcceptanceTestFieldMap fields = seq.peekFirst().getFields(); - ZcodeAcceptanceTestBigField bigField = seq.peekFirst().getBigField(); + AcceptanceTestFieldMap fields = seq.peekFirst().getFields(); + AcceptanceTestBigField bigField = seq.peekFirst().getBigField(); if (fields.getFieldLength('S') != 1) { if (fields.getFieldLength('S') < 1) { @@ -67,8 +67,8 @@ public ZcodeAcceptanceTestMessageAssert hasStatus(ZcodeAcceptanceTestResponseSta byte b = fields.getField('S')[0]; if (b != r.getValue()) { String str = fields.asString() + bigField.asString(); - ZcodeAcceptanceTestResponseStatus actual = null; - for (ZcodeAcceptanceTestResponseStatus v : ZcodeAcceptanceTestResponseStatus.values()) { + AcceptanceTestResponseStatus actual = null; + for (AcceptanceTestResponseStatus v : AcceptanceTestResponseStatus.values()) { if (v.getValue() == b) { actual = v; break; @@ -85,7 +85,7 @@ public ZcodeAcceptanceTestMessageAssert hasStatus(ZcodeAcceptanceTestResponseSta return this; } - public ZcodeAcceptanceTestMessageAssert isNotification() { + public AcceptanceTestMessageAssert isNotification() { conditions.add((seq, prev) -> { if (!seq.isNotification()) { String str = seq.peekFirst().getFields().asString() + seq.peekFirst().getBigField().asString(); @@ -95,7 +95,7 @@ public ZcodeAcceptanceTestMessageAssert isNotification() { return this; } - public ZcodeAcceptanceTestMessageAssert isBroadcast() { + public AcceptanceTestMessageAssert isBroadcast() { conditions.add((seq, prev) -> { if (!seq.isBroadcast()) { String str = seq.peekFirst().getFields().asString() + seq.peekFirst().getBigField().asString(); @@ -105,7 +105,7 @@ public ZcodeAcceptanceTestMessageAssert isBroadcast() { return this; } - public ZcodeAcceptanceTestMessageAssert isNotNotification() { + public AcceptanceTestMessageAssert isNotNotification() { conditions.add((seq, prev) -> { if (seq.isNotification()) { String str = seq.peekFirst().getFields().asString() + seq.peekFirst().getBigField().asString(); @@ -115,7 +115,7 @@ public ZcodeAcceptanceTestMessageAssert isNotNotification() { return this; } - public ZcodeAcceptanceTestMessageAssert isNotBroadcast() { + public AcceptanceTestMessageAssert isNotBroadcast() { conditions.add((seq, prev) -> { if (seq.isBroadcast()) { String str = seq.peekFirst().getFields().asString() + seq.peekFirst().getBigField().asString(); @@ -125,7 +125,7 @@ public ZcodeAcceptanceTestMessageAssert isNotBroadcast() { return this; } - public ZcodeAcceptanceTestMessageAssert hasField(char f) { + public AcceptanceTestMessageAssert hasField(char f) { conditions.add((seq, prev) -> { prev.add(f); if (seq.peekFirst().getFields().getFieldLength(f) == 0) { @@ -136,7 +136,7 @@ public ZcodeAcceptanceTestMessageAssert hasField(char f) { return this; } - public ZcodeAcceptanceTestMessageAssert getField(char f, Consumer target) { + public AcceptanceTestMessageAssert getField(char f, Consumer target) { conditions.add((seq, prev) -> { prev.add(f); if (seq.peekFirst().getFields().getFieldLength(f) != 0) { @@ -146,7 +146,7 @@ public ZcodeAcceptanceTestMessageAssert getField(char f, Consumer target return this; } - public ZcodeAcceptanceTestMessageAssert hasField(char f, int value) { + public AcceptanceTestMessageAssert hasField(char f, int value) { conditions.add((seq, prev) -> { prev.add(f); if (seq.peekFirst().getFields().getFieldLength(f) != 1) { @@ -170,7 +170,7 @@ public ZcodeAcceptanceTestMessageAssert hasField(char f, int value) { return this; } - public ZcodeAcceptanceTestMessageAssert hasField(char f, byte[] value) { + public AcceptanceTestMessageAssert hasField(char f, byte[] value) { conditions.add((seq, prev) -> { prev.add(f); if (seq.peekFirst().getFields().getFieldLength(f) == 0) { @@ -181,7 +181,7 @@ public ZcodeAcceptanceTestMessageAssert hasField(char f, byte[] value) { if (!Arrays.equals(value, actual)) { String str = seq.peekFirst().getFields().asString() + seq.peekFirst().getBigField().asString(); String str1 = seq.peekFirst().getFields().asString(f); - ZcodeAcceptanceTestFieldMap map = new ZcodeAcceptanceTestFieldMap(); + AcceptanceTestFieldMap map = new AcceptanceTestFieldMap(); for (byte b : value) { map.addField(f, b); } @@ -191,7 +191,7 @@ public ZcodeAcceptanceTestMessageAssert hasField(char f, byte[] value) { return this; } - public ZcodeAcceptanceTestMessageAssert hasField(char f, String value) { + public AcceptanceTestMessageAssert hasField(char f, String value) { int startOffset = 0; while (startOffset < value.length() && value.charAt(startOffset) == '0') startOffset++; @@ -223,7 +223,7 @@ public ZcodeAcceptanceTestMessageAssert hasField(char f, String value) { return hasField(f, data); } - public ZcodeAcceptanceTestMessageAssert hasBigField() { + public AcceptanceTestMessageAssert hasBigField() { conditions.add((seq, prev) -> { if (seq.peekFirst().getBigField().getField().isEmpty()) { throw new AssertionError( @@ -238,7 +238,7 @@ public ZcodeAcceptanceTestMessageAssert hasBigField() { return this; } - public ZcodeAcceptanceTestMessageAssert getBigField(Consumer target) { + public AcceptanceTestMessageAssert getBigField(Consumer target) { conditions.add((seq, prev) -> { if (seq.peekFirst().getBigField().getField().size() != 0) { byte[] array = new byte[seq.peekFirst().getBigField().getField().size()]; @@ -257,7 +257,7 @@ public ZcodeAcceptanceTestMessageAssert getBigField(Consumer target) { return this; } - public ZcodeAcceptanceTestMessageAssert hasBigField(byte[] value) { + public AcceptanceTestMessageAssert hasBigField(byte[] value) { conditions.add((seq, prev) -> { if (seq.peekFirst().getBigField().isString()) { prev.add('"'); @@ -269,7 +269,7 @@ public ZcodeAcceptanceTestMessageAssert hasBigField(byte[] value) { return this; } - public ZcodeAcceptanceTestMessageAssert hasBigDataField() { + public AcceptanceTestMessageAssert hasBigDataField() { conditions.add((seq, prev) -> { if (seq.peekFirst().getBigField().getField().isEmpty()) { throw new AssertionError( @@ -284,7 +284,7 @@ public ZcodeAcceptanceTestMessageAssert hasBigDataField() { return this; } - public ZcodeAcceptanceTestMessageAssert hasBigDataField(String value) { + public AcceptanceTestMessageAssert hasBigDataField(String value) { if (value.length() % 2 != 0) { throw new IllegalArgumentException("Big data fields must have even lengths"); } @@ -312,7 +312,7 @@ public ZcodeAcceptanceTestMessageAssert hasBigDataField(String value) { return this; } - public ZcodeAcceptanceTestMessageAssert hasBigDataField(byte[] value) { + public AcceptanceTestMessageAssert hasBigDataField(byte[] value) { conditions.add((seq, prev) -> { if (seq.peekFirst().getBigField().isString() && !seq.peekFirst().getBigField().getField().isEmpty()) { String failStr = ""; @@ -332,7 +332,7 @@ public ZcodeAcceptanceTestMessageAssert hasBigDataField(byte[] value) { return this; } - public ZcodeAcceptanceTestMessageAssert hasBigStringField() { + public AcceptanceTestMessageAssert hasBigStringField() { conditions.add((seq, prev) -> { if (seq.peekFirst().getBigField().getField().isEmpty()) { throw new AssertionError( @@ -347,7 +347,7 @@ public ZcodeAcceptanceTestMessageAssert hasBigStringField() { return this; } - public ZcodeAcceptanceTestMessageAssert hasBigStringField(String value) { + public AcceptanceTestMessageAssert hasBigStringField(String value) { byte[] data = value.getBytes(StandardCharsets.UTF_8); conditions.add((seq, prev) -> { if (!seq.peekFirst().getBigField().isString() && !seq.peekFirst().getBigField().getField().isEmpty()) { @@ -360,7 +360,7 @@ public ZcodeAcceptanceTestMessageAssert hasBigStringField(String value) { return this; } - public ZcodeAcceptanceTestMessageAssert hasBigStringField(byte[] value) { + public AcceptanceTestMessageAssert hasBigStringField(byte[] value) { conditions.add((seq, prev) -> { if (!seq.peekFirst().getBigField().isString() && !seq.peekFirst().getBigField().getField().isEmpty()) { String str = StandardCharsets.UTF_8.decode(ByteBuffer.wrap(value)).toString(); @@ -373,10 +373,10 @@ public ZcodeAcceptanceTestMessageAssert hasBigStringField(byte[] value) { return this; } - private ZcodeAcceptanceTestCondition getBigFieldCondition(byte[] value) { + private AcceptanceTestCondition getBigFieldCondition(byte[] value) { return (seq, prev) -> { if (seq.peekFirst().getBigField().getField().isEmpty()) { - ZcodeAcceptanceTestBigField expectedField = new ZcodeAcceptanceTestBigField(); + AcceptanceTestBigField expectedField = new AcceptanceTestBigField(); for (byte b : value) { expectedField.addByte(b); } @@ -386,7 +386,7 @@ private ZcodeAcceptanceTestCondition getBigFieldCondition(byte[] value) { } List dataReceived = seq.peekFirst().getBigField().getField(); if (dataReceived.size() != value.length) { - ZcodeAcceptanceTestBigField expectedField = new ZcodeAcceptanceTestBigField(); + AcceptanceTestBigField expectedField = new AcceptanceTestBigField(); for (byte b : value) { expectedField.addByte(b); } @@ -411,7 +411,7 @@ private ZcodeAcceptanceTestCondition getBigFieldCondition(byte[] value) { } } if (!matches) { - ZcodeAcceptanceTestBigField expectedField = new ZcodeAcceptanceTestBigField(); + AcceptanceTestBigField expectedField = new AcceptanceTestBigField(); for (byte b : value) { expectedField.addByte(b); } @@ -422,7 +422,7 @@ private ZcodeAcceptanceTestCondition getBigFieldCondition(byte[] value) { }; } - public ZcodeAcceptanceTestMessageAssert hasNoBigField() { + public AcceptanceTestMessageAssert hasNoBigField() { conditions.add((seq, prev) -> { if (!seq.peekFirst().getBigField().getField().isEmpty()) { throw new AssertionError("\nResponse received contained big field, when none should have been present.\nBig Field:\n" + seq.peekFirst().getBigField().asString() @@ -432,7 +432,7 @@ public ZcodeAcceptanceTestMessageAssert hasNoBigField() { return this; } - public ZcodeAcceptanceTestMessageAssert isLastInSequence() { + public AcceptanceTestMessageAssert isLastInSequence() { conditions.add((seq, prev) -> { if (seq.peekFirst().getEnd() != '\n') { throw new AssertionError("\nResponse received was terminated with" + seq.peekFirst().getEnd() + "when \\n expected.\nReceived:\n" @@ -442,7 +442,7 @@ public ZcodeAcceptanceTestMessageAssert isLastInSequence() { return this; } - public ZcodeAcceptanceTestMessageAssert sequenceContinues() { + public AcceptanceTestMessageAssert sequenceContinues() { conditions.add((seq, prev) -> { if (seq.peekFirst().getEnd() == '\n') { throw new AssertionError("\nResponse received was terminated with \\n when & expected."); @@ -453,7 +453,7 @@ public ZcodeAcceptanceTestMessageAssert sequenceContinues() { return this; } - public ZcodeAcceptanceTestMessageAssert sequenceHasError() { + public AcceptanceTestMessageAssert sequenceHasError() { conditions.add((seq, prev) -> { if (seq.peekFirst().getEnd() != '|') { if (seq.peekFirst().getEnd() == '\n') { @@ -468,7 +468,7 @@ public ZcodeAcceptanceTestMessageAssert sequenceHasError() { return this; } - public ZcodeAcceptanceTestMessageAssert next() { + public AcceptanceTestMessageAssert next() { conditions.add((seq, prev) -> { prev.clear(); seq.pollFirst(); @@ -479,7 +479,7 @@ public ZcodeAcceptanceTestMessageAssert next() { return this; } - public ZcodeAcceptanceTestMessageAssert hasNoOtherFields() { + public AcceptanceTestMessageAssert hasNoOtherFields() { conditions.add((seq, prev) -> { for (char i = 'A'; i <= 'Z'; i++) { if (seq.peekFirst().getFields().hasField(i) && !prev.contains(i)) { diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponse.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponse.java similarity index 90% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponse.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponse.java index 199a4b406..f5e30baa5 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponse.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponse.java @@ -3,21 +3,21 @@ import java.io.IOException; import java.io.PushbackInputStream; -public class ZcodeAcceptanceTestResponse { - private final ZcodeAcceptanceTestFieldMap map = new ZcodeAcceptanceTestFieldMap(); - private final ZcodeAcceptanceTestBigField big = new ZcodeAcceptanceTestBigField(); - private ZcodeAcceptanceTestResponseStatus status = ZcodeAcceptanceTestResponseStatus.OK; +public class AcceptanceTestResponse { + private final AcceptanceTestFieldMap map = new AcceptanceTestFieldMap(); + private final AcceptanceTestBigField big = new AcceptanceTestBigField(); + private AcceptanceTestResponseStatus status = AcceptanceTestResponseStatus.OK; private char end; - public ZcodeAcceptanceTestFieldMap getFields() { + public AcceptanceTestFieldMap getFields() { return map; } - public ZcodeAcceptanceTestBigField getBigField() { + public AcceptanceTestBigField getBigField() { return big; } - public ZcodeAcceptanceTestResponseStatus getStatus() { + public AcceptanceTestResponseStatus getStatus() { return status; } @@ -57,7 +57,7 @@ private String parseHexField(PushbackInputStream in, char f, String current) thr return current; } - public String parseCommand(PushbackInputStream in, ZcodeAcceptanceTestResponseSequence sequence, String current) { + public String parseCommand(PushbackInputStream in, AcceptanceTestResponseSequence sequence, String current) { try { int c = in.read(); while (c == ' ' || c == '\t' || c == '\r') { @@ -65,7 +65,7 @@ public String parseCommand(PushbackInputStream in, ZcodeAcceptanceTestResponseSe } if (c == '#') { if (sequence.isEmpty()) { - status = ZcodeAcceptanceTestResponseStatus.SKIP_COMMAND; + status = AcceptanceTestResponseStatus.SKIP_COMMAND; while (c != -1 && c != '\n') { c = in.read(); } diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponseSequence.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponseSequence.java similarity index 66% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponseSequence.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponseSequence.java index f615ad829..94bd9a5d3 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponseSequence.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponseSequence.java @@ -3,8 +3,8 @@ import java.util.LinkedList; import java.util.Queue; -public class ZcodeAcceptanceTestResponseSequence { - private final Queue resps = new LinkedList<>(); +public class AcceptanceTestResponseSequence { + private final Queue resps = new LinkedList<>(); private boolean isBroadcast = false; private boolean isNotification = false; @@ -16,19 +16,19 @@ public boolean isEmpty() { return resps.isEmpty(); } - public void addResponse(ZcodeAcceptanceTestResponse resp) { + public void addResponse(AcceptanceTestResponse resp) { resps.add(resp); } - public ZcodeAcceptanceTestResponse peekFirst() { + public AcceptanceTestResponse peekFirst() { return resps.peek(); } - public ZcodeAcceptanceTestResponse pollFirst() { + public AcceptanceTestResponse pollFirst() { return resps.poll(); } - public Queue getResps() { + public Queue getResps() { return resps; } diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponseStatus.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponseStatus.java similarity index 80% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponseStatus.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponseStatus.java index c0058449e..f60710cd4 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestResponseStatus.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/AcceptanceTestResponseStatus.java @@ -1,6 +1,6 @@ package net.zscript.zscript_acceptance_tests.acceptancetest_asserts; -public enum ZcodeAcceptanceTestResponseStatus { +public enum AcceptanceTestResponseStatus { OK(0), RESP_TOO_LONG(1), UNKNOWN_ERROR(2), @@ -16,7 +16,7 @@ public enum ZcodeAcceptanceTestResponseStatus { private final int value; - private ZcodeAcceptanceTestResponseStatus(int value) { + private AcceptanceTestResponseStatus(int value) { this.value = value; } diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssertIntermediateEach.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssertIntermediateEach.java deleted file mode 100644 index d9a5aed1f..000000000 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestAssertIntermediateEach.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.zscript.zscript_acceptance_tests.acceptancetest_asserts; - -import java.util.concurrent.Future; - -public class ZcodeAcceptanceTestAssertIntermediateEach extends ZcodeAcceptanceTestMessageAssert { - private final ZcodeAcceptanceTestMessageAssert parent; - - public ZcodeAcceptanceTestAssertIntermediateEach(ZcodeAcceptanceTestMessageAssert parent) { - this.parent = parent; - } - - @Override - public Future send() { - return parent.send(); - } - - public ZcodeAcceptanceTestCondition getAsCondition() { - return (seq, prev) -> { - for (ZcodeAcceptanceTestCondition condition : conditions) { - condition.test(seq, prev); - } - }; - } - -} diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestCondition.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestCondition.java deleted file mode 100644 index 3ffa4ee72..000000000 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/acceptancetest_asserts/ZcodeAcceptanceTestCondition.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.zscript.zscript_acceptance_tests.acceptancetest_asserts; - -import java.util.List; - -public interface ZcodeAcceptanceTestCondition { - public void test(ZcodeAcceptanceTestResponseSequence seq, List prevUsed); -} diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/CoreZcodeSteps.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/CoreZscriptSteps.java similarity index 61% rename from acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/CoreZcodeSteps.java rename to acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/CoreZscriptSteps.java index d0ebf3690..29944cead 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/CoreZcodeSteps.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/CoreZscriptSteps.java @@ -1,6 +1,6 @@ package net.zscript.zscript_acceptance_tests.core_zscript; -import static net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestAssert.assertThatCommand; +import static net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestAssert.assertThatCommand; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assumptions.assumeThat; @@ -14,46 +14,46 @@ import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; import io.cucumber.java.en.When; -import net.zscript.zscript_acceptance_tests.ZcodeAcceptanceTestCapabilityResult; -import net.zscript.zscript_acceptance_tests.ZcodeAcceptanceTestConnectionManager; -import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestMessageAssert; -import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestResponseStatus; +import net.zscript.zscript_acceptance_tests.AcceptanceTestCapabilityResult; +import net.zscript.zscript_acceptance_tests.AcceptanceTestConnectionManager; +import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestMessageAssert; +import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestResponseStatus; -public class CoreZcodeSteps { - public static ZcodeAcceptanceTestMessageAssert testAssert = null; - public static Function testExpectedFields = a -> a; +public class CoreZscriptSteps { + public static AcceptanceTestMessageAssert testAssert = null; + public static Function testExpectedFields = a -> a; @Given("a connection is established to the target") public void a_connection_is_established_to_the_target() { - assumeThat(ZcodeAcceptanceTestConnectionManager.getConnections()).as("A connection to the target must be provided").isNotEmpty(); - ZcodeAcceptanceTestConnectionManager.getConnections().get(0).clearListeners(); + assumeThat(AcceptanceTestConnectionManager.getConnections()).as("A connection to the target must be provided").isNotEmpty(); + AcceptanceTestConnectionManager.getConnections().get(0).clearListeners(); } @Given("the targets capabilities are known") public void the_targets_capabilities_are_known() { - assumeThat(ZcodeAcceptanceTestCapabilityResult.hasBeenRead()).as("Capabilities have been read").isTrue(); + assumeThat(AcceptanceTestCapabilityResult.hasBeenRead()).as("Capabilities have been read").isTrue(); } @Given("the target supports multi-byte fields") public void the_target_supports_multi_byte_fields() { - Assume.assumeFalse("target only supports single byte fields", ZcodeAcceptanceTestCapabilityResult.getMaxFieldSize() == 1); + Assume.assumeFalse("target only supports single byte fields", AcceptanceTestCapabilityResult.getMaxFieldSize() == 1); } @Given("the target has limited field size") public void the_target_has_limited_field_size() { Assume.assumeFalse("target has no limits on field size/number", - ZcodeAcceptanceTestCapabilityResult.getMaxFieldNum() == -1 && ZcodeAcceptanceTestCapabilityResult.getMaxFieldSize() == -1); + AcceptanceTestCapabilityResult.getMaxFieldNum() == -1 && AcceptanceTestCapabilityResult.getMaxFieldSize() == -1); } @Given("the target has limited big-field size") public void the_target_has_limited_big_field_size() { - Assume.assumeFalse("target has no limits on big-field size", ZcodeAcceptanceTestCapabilityResult.getMaxBigFieldLength() == -1); + Assume.assumeFalse("target has no limits on big-field size", AcceptanceTestCapabilityResult.getMaxBigFieldLength() == -1); } @Given("the target has at least one peripheral command") public void the_target_has_at_least_one_peripheral_command() { boolean hasFound = false; - for (byte b : ZcodeAcceptanceTestCapabilityResult.getSupportedCodes()) { + for (byte b : AcceptanceTestCapabilityResult.getSupportedCodes()) { if (Byte.toUnsignedInt(b) >= 0x10) { hasFound = true; break; @@ -65,7 +65,7 @@ public void the_target_has_at_least_one_peripheral_command() { @Given("the target has at least one harmless peripheral command") public void the_target_has_at_least_one_harmless_peripheral_command() { boolean hasFound = false; - for (byte b : ZcodeAcceptanceTestCapabilityResult.getSupportedCodes()) { + for (byte b : AcceptanceTestCapabilityResult.getSupportedCodes()) { if (Byte.toUnsignedInt(b) == 0x20 || Byte.toUnsignedInt(b) == 0x40 || Byte.toUnsignedInt(b) == 0x13 || Byte.toUnsignedInt(b) == 0x28) { hasFound = true; break; @@ -76,39 +76,39 @@ public void the_target_has_at_least_one_harmless_peripheral_command() { @When("the target is sent an identify command") public void the_target_is_sent_an_identify_command() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z0\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z0\n"); testExpectedFields = a -> a.hasBigStringField().hasField('V').worked(); } @When("the target is sent an echo command with various fields") public void the_target_is_sent_an_echo_command_with_various_fields() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A29FL3+0001\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A29FL3+0001\n"); testExpectedFields = a -> a.hasBigDataField("0001").hasField('A', 0x29).hasField('F', 0x00).hasField('L', 0x3).worked(); } @When("the target is sent an echo command with multi-byte fields") public void the_target_is_sent_an_echo_command_with_multi_byte_fields() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A2900G023\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A2900G023\n"); testExpectedFields = a -> a.hasField('A', "2900").hasField('G', 0x23).worked(); } @When("the target is sent an echo command with an override for status") public void the_target_is_sent_an_echo_command_with_status_override() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1Sff\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1Sff\n"); testExpectedFields = a -> a.hasField('S', "ff"); } @When("the target is sent a string field containing command separators") public void the_target_is_sent_a_string_field_containing_command_separators() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1\"&\\\"\\a\\\"|\"\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1\"&\\\"\\a\\\"|\"\n"); testExpectedFields = a -> a.worked().hasBigStringField("&\"a\"|"); } @When("the target is sent a peripheral command") public void the_target_is_sent_a_peripheral_command() { - for (byte b : ZcodeAcceptanceTestCapabilityResult.getSupportedCodes()) { + for (byte b : AcceptanceTestCapabilityResult.getSupportedCodes()) { if (Byte.toUnsignedInt(b) >= 0x10) { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z" + Integer.toHexString(Byte.toUnsignedInt(b)) + "\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z" + Integer.toHexString(Byte.toUnsignedInt(b)) + "\n"); break; } } @@ -117,7 +117,7 @@ public void the_target_is_sent_a_peripheral_command() { @When("the target is sent an activate command") public void the_target_is_sent_an_activate_command() throws Throwable { try { - assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z3\n").worked().hasField('A', 0).hasNoOtherFields().send().get(2, TimeUnit.SECONDS); + assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z3\n").worked().hasField('A', 0).hasNoOtherFields().send().get(2, TimeUnit.SECONDS); } catch (ExecutionException e) { throw e.getCause(); } @@ -125,9 +125,9 @@ public void the_target_is_sent_an_activate_command() throws Throwable { @When("the target is sent a harmless peripheral command") public void the_target_is_sent_a_harmless_peripheral_command() { - for (byte b : ZcodeAcceptanceTestCapabilityResult.getSupportedCodes()) { + for (byte b : AcceptanceTestCapabilityResult.getSupportedCodes()) { if (Byte.toUnsignedInt(b) == 0x20 || Byte.toUnsignedInt(b) == 0x40 || Byte.toUnsignedInt(b) == 0x13 || Byte.toUnsignedInt(b) == 0x28) { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z" + Integer.toHexString(Byte.toUnsignedInt(b)) + "\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z" + Integer.toHexString(Byte.toUnsignedInt(b)) + "\n"); break; } } @@ -135,52 +135,52 @@ public void the_target_is_sent_a_harmless_peripheral_command() { @When("the target is sent multiple echo commands") public void the_target_is_sent_multiple_echo_commands() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1+21BC&Z1\"aaa\"\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1+21BC&Z1\"aaa\"\n"); testExpectedFields = a -> a.worked().hasField('A', "10").sequenceContinues().next().worked().hasField('B', "").hasField('C', "").hasBigDataField("21").sequenceContinues() .next().worked().hasBigStringField("aaa").isLastInSequence(); } @When("the target is sent multiple echo commands including error handlers") public void the_target_is_sent_multiple_echo_commands_inc_error_handlers() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1+21BC|Z1A2&Z1+33\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1+21BC|Z1A2&Z1+33\n"); testExpectedFields = a -> a.worked().hasField('A', "10").sequenceContinues().next().worked().hasField('B', "").hasField('C', "").hasBigDataField("21").isLastInSequence(); } @When("the target is sent multiple echo commands one of which gives S10, in a sequence") public void the_target_is_sent_multiple_echo_commands_one_of_which_gives_s10_in_a_sequence() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1S10&Z1A2&Z1+12\n"); - testExpectedFields = a -> a.worked().hasField('A', "10").sequenceContinues().next().hasStatus(ZcodeAcceptanceTestResponseStatus.CMD_FAIL).isLastInSequence(); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1S10&Z1A2&Z1+12\n"); + testExpectedFields = a -> a.worked().hasField('A', "10").sequenceContinues().next().hasStatus(AcceptanceTestResponseStatus.CMD_FAIL).isLastInSequence(); } @When("the target is sent multiple echo commands one of which gives S10, in a sequence with error handler") public void the_target_is_sent_multiple_echo_commands_one_of_which_gives_s10_in_a_sequence_with_error_handler() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1S10+21BC&Z1|Z1A2&Z1+44\n"); - testExpectedFields = a -> a.worked().hasField('A', "10").sequenceContinues().next().hasStatus(ZcodeAcceptanceTestResponseStatus.CMD_FAIL).sequenceHasError().next().worked() + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1S10+21BC&Z1|Z1A2&Z1+44\n"); + testExpectedFields = a -> a.worked().hasField('A', "10").sequenceContinues().next().hasStatus(AcceptanceTestResponseStatus.CMD_FAIL).sequenceHasError().next().worked() .hasField('A', "2").sequenceContinues().next().worked().hasBigDataField("44").isLastInSequence(); } @When("the target is sent multiple echo commands one of which gives S5, in a sequence with error handler") public void the_target_is_sent_multiple_echo_commands_one_of_which_gives_s5_in_a_sequence_with_error_handler() { - testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1S5+21BC&Z1|Z1A2&Z1+44\n"); + testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A10&Z1S5+21BC&Z1|Z1A2&Z1+44\n"); testExpectedFields = a -> a.worked().hasField('A', "10").sequenceContinues().next().hasField('S', 5).isLastInSequence(); } @Then("the target must support all required functionality") public void the_target_must_support_all_required_functionality() { - assertThat(ZcodeAcceptanceTestCapabilityResult.getSupportedCodes()).describedAs("Target must support required commands (Identify, Echo, Capabilities, and Activate)") + assertThat(AcceptanceTestCapabilityResult.getSupportedCodes()).describedAs("Target must support required commands (Identify, Echo, Capabilities, and Activate)") .contains(0x0, 0x1, 0x2, 0x3); - assertThat(ZcodeAcceptanceTestCapabilityResult.getGeneralCapabilities()).describedAs("Target must give a binary capabilities field (C)").isNotNegative(); - assertThat(ZcodeAcceptanceTestCapabilityResult.getMaxBigFieldLength()).describedAs("Target must support a big field of length >= 4") + assertThat(AcceptanceTestCapabilityResult.getGeneralCapabilities()).describedAs("Target must give a binary capabilities field (C)").isNotNegative(); + assertThat(AcceptanceTestCapabilityResult.getMaxBigFieldLength()).describedAs("Target must support a big field of length >= 4") .satisfiesAnyOf(v -> assertThat(v).isNegative(), v -> assertThat(v).isGreaterThanOrEqualTo(4)); - assertThat(ZcodeAcceptanceTestCapabilityResult.getMaxFieldNum()).describedAs("Target must support a field number >= 5").satisfiesAnyOf(v -> assertThat(v).isNegative(), + assertThat(AcceptanceTestCapabilityResult.getMaxFieldNum()).describedAs("Target must support a field number >= 5").satisfiesAnyOf(v -> assertThat(v).isNegative(), v -> assertThat(v).isGreaterThanOrEqualTo(5)); - assertThat(ZcodeAcceptanceTestCapabilityResult.getMaxFieldSize()).describedAs("Target must support a fields of length >= 4").satisfiesAnyOf(v -> assertThat(v).isNegative(), + assertThat(AcceptanceTestCapabilityResult.getMaxFieldSize()).describedAs("Target must support a fields of length >= 4").satisfiesAnyOf(v -> assertThat(v).isNegative(), v -> assertThat(v).isGreaterThanOrEqualTo(1)); - if (ZcodeAcceptanceTestCapabilityResult.getPersistentMemorySize() != -1) { - assertThat(ZcodeAcceptanceTestCapabilityResult.getSupportedCodes()).describedAs("If the target has persistent memory, it must support read/write commands") + if (AcceptanceTestCapabilityResult.getPersistentMemorySize() != -1) { + assertThat(AcceptanceTestCapabilityResult.getSupportedCodes()).describedAs("If the target has persistent memory, it must support read/write commands") .contains(0x10, 0x11); } - ZcodeAcceptanceTestCapabilityResult.setHasBeenRead(); + AcceptanceTestCapabilityResult.setHasBeenRead(); } @Then("the target must respond with the expected fields") @@ -194,7 +194,7 @@ public void the_target_must_respond_with_the_expected_fields() throws Throwable @Then("the target must respond with a(n) {word} status") public void the_target_must_respond_with_status(String status) throws Throwable { - ZcodeAcceptanceTestResponseStatus stat = ZcodeAcceptanceTestResponseStatus.valueOf(status); + AcceptanceTestResponseStatus stat = AcceptanceTestResponseStatus.valueOf(status); try { testAssert.hasStatus(stat).send().get(2, TimeUnit.SECONDS); } catch (ExecutionException e) { diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/GeneralParseErrorSteps.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/GeneralParseErrorSteps.java index e54458cbc..6e6c8c9ae 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/GeneralParseErrorSteps.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/GeneralParseErrorSteps.java @@ -1,6 +1,6 @@ package net.zscript.zscript_acceptance_tests.core_zscript; -import static net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestAssert.assertThatCommand; +import static net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestAssert.assertThatCommand; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.concurrent.ExecutionException; @@ -9,88 +9,88 @@ import io.cucumber.java.en.Then; import io.cucumber.java.en.When; -import net.zscript.zscript_acceptance_tests.ZcodeAcceptanceTestConnectionManager; -import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestResponseStatus; +import net.zscript.zscript_acceptance_tests.AcceptanceTestConnectionManager; +import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestResponseStatus; public class GeneralParseErrorSteps { @When("the target is sent an echo command with the same field twice") public void the_target_is_sent_an_echo_command_with_the_same_field_twice() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A10B30A\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A10B30A\n"); } @When("the target is sent a command with no Z field") public void the_target_is_sent_a_command_with_no_z_field() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "A10B30\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "A10B30\n"); } @When("the target is sent a command with an unrecognised Z field") public void the_target_is_sent_a_command_with_an_unrecognised_z_field() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z110304\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z110304\n"); } @When("the target is sent a command with two big fields") public void the_target_is_sent_a_command_with_two_big_fields() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1+84\"d\"\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1+84\"d\"\n"); } @When("the target is sent a command with an unterminated big string") public void the_target_is_sent_a_command_with_an_unterminated_big_string() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1\"d\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1\"d\n"); } @When("the target is sent a command with an odd digit big field") public void the_target_is_sent_a_command_with_an_odd_digit_big_field() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1+84d\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1+84d\n"); } @When("the target is sent a command with an escaped quote in a string") public void the_target_is_sent_a_command_with_an_escaped_quote_in_a_string() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1\"\\\"d\"\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1\"\\\"d\"\n"); } @When("the target is sent a command with a non hex character in the wrong place") public void the_target_is_sent_a_command_with_a_non_hex_character_in_the_wrong_place() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A0g\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A0g\n"); } @When("the target is sent debug info") public void the_target_is_sent_debug_info() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "#Z1A2\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "#Z1A2\n"); } @When("the target is sent a broadcast command") public void the_target_is_sent_a_broadcast_command() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "*Z1A5\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "*Z1A5\n"); } @When("the target is sent a broadcast command mid sequence") public void the_target_is_sent_a_broadcast_command_mid_sequence() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A1&*Z1H2\n"); - CoreZcodeSteps.testExpectedFields = a -> a.worked().hasField('A', 1).next().hasStatus(ZcodeAcceptanceTestResponseStatus.PARSE_ERROR).isLastInSequence(); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A1&*Z1H2\n"); + CoreZscriptSteps.testExpectedFields = a -> a.worked().hasField('A', 1).next().hasStatus(AcceptanceTestResponseStatus.PARSE_ERROR).isLastInSequence(); } @When("the target is sent debug info mid sequence") public void the_target_is_sent_debug_info_mid_sequence() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A2&#Z1H2\n"); - CoreZcodeSteps.testExpectedFields = a -> a.worked().hasField('A', 2).next().hasStatus(ZcodeAcceptanceTestResponseStatus.PARSE_ERROR).isLastInSequence(); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A2&#Z1H2\n"); + CoreZscriptSteps.testExpectedFields = a -> a.worked().hasField('A', 2).next().hasStatus(AcceptanceTestResponseStatus.PARSE_ERROR).isLastInSequence(); } @When("the target is set to parallel mid sequence") public void the_target_is_set_to_parallel_mid_sequence() { - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1A3&%Z1H2\n"); - CoreZcodeSteps.testExpectedFields = a -> a.worked().hasField('A', 3).next().hasStatus(ZcodeAcceptanceTestResponseStatus.PARSE_ERROR).isLastInSequence(); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1A3&%Z1H2\n"); + CoreZscriptSteps.testExpectedFields = a -> a.worked().hasField('A', 3).next().hasStatus(AcceptanceTestResponseStatus.PARSE_ERROR).isLastInSequence(); } @Then("the target must not respond") public void the_target_must_not_respond() { - assertThrows(TimeoutException.class, () -> CoreZcodeSteps.testAssert.send().get(1, TimeUnit.SECONDS)); + assertThrows(TimeoutException.class, () -> CoreZscriptSteps.testAssert.send().get(1, TimeUnit.SECONDS)); } @Then("the target must respond with a broadcast response") public void the_target_must_respond_with_a_broadcast_response() throws Throwable { try { - CoreZcodeSteps.testAssert.isBroadcast().send().get(2, TimeUnit.SECONDS); + CoreZscriptSteps.testAssert.isBroadcast().send().get(2, TimeUnit.SECONDS); } catch (ExecutionException e) { throw e.getCause(); } @@ -98,9 +98,9 @@ public void the_target_must_respond_with_a_broadcast_response() throws Throwable @Then("the target must respond with a(n) {word} status after expected fields") public void the_target_must_respond_with_status_after(String status) throws Throwable { - ZcodeAcceptanceTestResponseStatus stat = ZcodeAcceptanceTestResponseStatus.valueOf(status); + AcceptanceTestResponseStatus stat = AcceptanceTestResponseStatus.valueOf(status); try { - CoreZcodeSteps.testExpectedFields.apply(CoreZcodeSteps.testAssert).hasStatus(stat).send().get(2, TimeUnit.SECONDS); + CoreZscriptSteps.testExpectedFields.apply(CoreZscriptSteps.testAssert).hasStatus(stat).send().get(2, TimeUnit.SECONDS); } catch (ExecutionException e) { throw e.getCause(); } diff --git a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/LargeCommandCreationSteps.java b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/LargeCommandCreationSteps.java index d8bbb6deb..99c10887a 100644 --- a/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/LargeCommandCreationSteps.java +++ b/acceptance-tests/src/main/java/net/zscript/zscript_acceptance_tests/core_zscript/LargeCommandCreationSteps.java @@ -1,6 +1,6 @@ package net.zscript.zscript_acceptance_tests.core_zscript; -import static net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestAssert.assertThatCommand; +import static net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestAssert.assertThatCommand; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -12,14 +12,14 @@ import java.util.concurrent.TimeoutException; import io.cucumber.java.en.When; -import net.zscript.zscript_acceptance_tests.ZcodeAcceptanceTestCapabilityResult; -import net.zscript.zscript_acceptance_tests.ZcodeAcceptanceTestConnectionManager; +import net.zscript.zscript_acceptance_tests.AcceptanceTestCapabilityResult; +import net.zscript.zscript_acceptance_tests.AcceptanceTestConnectionManager; public class LargeCommandCreationSteps { @When("the target is sent an echo command with as much data as possible") public void the_target_is_sent_an_echo_command_with_as_much_data_as_possible() { - int bigl = ZcodeAcceptanceTestCapabilityResult.getMaxBigFieldLength(); + int bigl = AcceptanceTestCapabilityResult.getMaxBigFieldLength(); if (bigl == -1) { bigl = 1024; } @@ -47,17 +47,17 @@ public void the_target_is_sent_an_echo_command_with_as_much_data_as_possible() { bigl += arrOffset + 1; Map fields = new HashMap<>(); - int maxFieldCount = ZcodeAcceptanceTestCapabilityResult.getMaxFieldNum() - 1; + int maxFieldCount = AcceptanceTestCapabilityResult.getMaxFieldNum() - 1; if (maxFieldCount == -1) { maxFieldCount = 255; } - if (ZcodeAcceptanceTestCapabilityResult.getMaxFieldSize() != -1) { + if (AcceptanceTestCapabilityResult.getMaxFieldSize() != -1) { int b = 0; for (char c = 'A'; c < Math.min('Z', 'A' + maxFieldCount); c++) { String current = ""; - for (int j = 0; j < ZcodeAcceptanceTestCapabilityResult.getMaxFieldSize(); j++) { + for (int j = 0; j < AcceptanceTestCapabilityResult.getMaxFieldSize(); j++) { String s = Integer.toHexString(Byte.toUnsignedInt((byte) (b++))); if (s.length() == 1) { current += '0'; @@ -72,7 +72,7 @@ public void the_target_is_sent_an_echo_command_with_as_much_data_as_possible() { int pos = 0; for (char c = 'A'; c < 'Y' && pos + l < maxFieldCount; c++) { String current = ""; - for (int j = 0; j < l * ZcodeAcceptanceTestCapabilityResult.getFieldSizeUnit(); j++) { + for (int j = 0; j < l * AcceptanceTestCapabilityResult.getFieldSizeUnit(); j++) { String s = Integer.toHexString(Byte.toUnsignedInt((byte) (b++))); if (s.length() == 1) { current += '0'; @@ -85,7 +85,7 @@ public void the_target_is_sent_an_echo_command_with_as_much_data_as_possible() { } if (pos < maxFieldCount) { String current = ""; - for (int j = 0; j + pos < (maxFieldCount) * ZcodeAcceptanceTestCapabilityResult.getFieldSizeUnit(); j++) { + for (int j = 0; j + pos < (maxFieldCount) * AcceptanceTestCapabilityResult.getFieldSizeUnit(); j++) { String s = Integer.toHexString(Byte.toUnsignedInt((byte) (b++))); if (s.length() == 1) { current += '0'; @@ -108,8 +108,8 @@ public void the_target_is_sent_an_echo_command_with_as_much_data_as_possible() { System.arraycopy(bigArr, 0, full, 3 + fieldArr.length, bigl); full[fieldArr.length + bigl + 2] = '"'; full[fieldArr.length + bigl + 3] = '\n'; - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), full, 0); - CoreZcodeSteps.testExpectedFields = a -> { + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), full, 0); + CoreZscriptSteps.testExpectedFields = a -> { a.worked().hasBigStringField(bigArrActual); for (Entry e : fields.entrySet()) { a.hasField(e.getKey(), e.getValue()); @@ -121,24 +121,24 @@ public void the_target_is_sent_an_echo_command_with_as_much_data_as_possible() { @When("the target is sent a capability request command") public void the_target_is_sent_a_capability_request_command() throws InterruptedException, ExecutionException, TimeoutException { - assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z2\n").worked().hasField('M').getField('M', b -> { - ZcodeAcceptanceTestCapabilityResult.setMaxPageNum(Byte.toUnsignedInt(b[0])); + assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z2\n").worked().hasField('M').getField('M', b -> { + AcceptanceTestCapabilityResult.setMaxPageNum(Byte.toUnsignedInt(b[0])); }).send().get(2, TimeUnit.SECONDS); String command = ""; - for (int i = 0; i < ZcodeAcceptanceTestCapabilityResult.getMaxPageNum(); i++) { + for (int i = 0; i < AcceptanceTestCapabilityResult.getMaxPageNum(); i++) { command += "Z2P" + i + "&"; } command += "\n"; - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), command); - CoreZcodeSteps.testExpectedFields = a -> { - for (int i = 0; i < ZcodeAcceptanceTestCapabilityResult.getMaxPageNum(); i++) { + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), command); + CoreZscriptSteps.testExpectedFields = a -> { + for (int i = 0; i < AcceptanceTestCapabilityResult.getMaxPageNum(); i++) { a = a.worked().hasBigField().getBigField(b -> { - ZcodeAcceptanceTestCapabilityResult.addSupportedCodes(b); - }).hasField('M', ZcodeAcceptanceTestCapabilityResult.getMaxPageNum()).getField('C', c -> { + AcceptanceTestCapabilityResult.addSupportedCodes(b); + }).hasField('M', AcceptanceTestCapabilityResult.getMaxPageNum()).getField('C', c -> { assertThat(c).describedAs("Multi-byte page numbers not allowed").hasSize(1); - assertThat(ZcodeAcceptanceTestCapabilityResult.getGeneralCapabilities()).describedAs("Target must give consistent capabilities").isIn(-1, + assertThat(AcceptanceTestCapabilityResult.getGeneralCapabilities()).describedAs("Target must give consistent capabilities").isIn(-1, Byte.toUnsignedInt(c[0])); - ZcodeAcceptanceTestCapabilityResult.setGeneralCapabilities(Byte.toUnsignedInt(c[0])); + AcceptanceTestCapabilityResult.setGeneralCapabilities(Byte.toUnsignedInt(c[0])); }).getField('B', b -> { long size = 0; for (byte d : b) { @@ -146,16 +146,16 @@ public void the_target_is_sent_a_capability_request_command() throws Interrupted size += d; assertThat(size).describedAs("Target gave too large a maximum big field length").isLessThan(Integer.MAX_VALUE); } - assertThat(ZcodeAcceptanceTestCapabilityResult.getMaxBigFieldLength()).describedAs("Target must give consistent capabilities").isIn(-1, size); - ZcodeAcceptanceTestCapabilityResult.setMaxBigFieldLength((int) size); + assertThat(AcceptanceTestCapabilityResult.getMaxBigFieldLength()).describedAs("Target must give consistent capabilities").isIn(-1, size); + AcceptanceTestCapabilityResult.setMaxBigFieldLength((int) size); }).getField('N', n -> { assertThat(n).describedAs("Multi-byte field numbers not allowed").hasSize(1); - assertThat(ZcodeAcceptanceTestCapabilityResult.getMaxFieldNum()).describedAs("Target must give consistent capabilities").isIn(-1, Byte.toUnsignedInt(n[0])); - ZcodeAcceptanceTestCapabilityResult.setMaxFieldNum(Byte.toUnsignedInt(n[0])); + assertThat(AcceptanceTestCapabilityResult.getMaxFieldNum()).describedAs("Target must give consistent capabilities").isIn(-1, Byte.toUnsignedInt(n[0])); + AcceptanceTestCapabilityResult.setMaxFieldNum(Byte.toUnsignedInt(n[0])); }).getField('F', f -> { assertThat(f).describedAs("Multi-byte field sizes not allowed").hasSize(1); - assertThat(ZcodeAcceptanceTestCapabilityResult.getMaxFieldSize()).describedAs("Target must give consistent capabilities").isIn(-1, Byte.toUnsignedInt(f[0])); - ZcodeAcceptanceTestCapabilityResult.setMaxFieldSize(Byte.toUnsignedInt(f[0])); + assertThat(AcceptanceTestCapabilityResult.getMaxFieldSize()).describedAs("Target must give consistent capabilities").isIn(-1, Byte.toUnsignedInt(f[0])); + AcceptanceTestCapabilityResult.setMaxFieldSize(Byte.toUnsignedInt(f[0])); }).getField('P', n -> { long size = 0; for (byte d : n) { @@ -163,10 +163,10 @@ public void the_target_is_sent_a_capability_request_command() throws Interrupted size <<= 8; size += d; } - assertThat(ZcodeAcceptanceTestCapabilityResult.getPersistentMemorySize()).describedAs("Target must give consistent capabilities").isIn((long) -1, size); - ZcodeAcceptanceTestCapabilityResult.setPersistentMemorySize(size); + assertThat(AcceptanceTestCapabilityResult.getPersistentMemorySize()).describedAs("Target must give consistent capabilities").isIn((long) -1, size); + AcceptanceTestCapabilityResult.setPersistentMemorySize(size); }); - if (i < ZcodeAcceptanceTestCapabilityResult.getMaxPageNum() - 1) { + if (i < AcceptanceTestCapabilityResult.getMaxPageNum() - 1) { a = a.sequenceContinues().next(); } } @@ -177,16 +177,16 @@ public void the_target_is_sent_a_capability_request_command() throws Interrupted @When("the target is sent an echo command with too much field data") public void the_target_is_sent_an_echo_command_with_too_much_field_data() { Map fields = new HashMap<>(); - int fieldl = ZcodeAcceptanceTestCapabilityResult.getMaxFieldNum() * 2; + int fieldl = AcceptanceTestCapabilityResult.getMaxFieldNum() * 2; if (fieldl == -1) { fieldl = 255; } - if (ZcodeAcceptanceTestCapabilityResult.getMaxFieldSize() != -1) { + if (AcceptanceTestCapabilityResult.getMaxFieldSize() != -1) { int b = 0; for (int i = 0; i < 26; i++) { if (i != 18) { String current = ""; - for (int j = 0; j < ZcodeAcceptanceTestCapabilityResult.getMaxFieldSize() * 2; j++) { + for (int j = 0; j < AcceptanceTestCapabilityResult.getMaxFieldSize() * 2; j++) { String s = Integer.toHexString(Byte.toUnsignedInt((byte) (b++))); if (s.length() == 1) { current += '0'; @@ -203,7 +203,7 @@ public void the_target_is_sent_an_echo_command_with_too_much_field_data() { for (int i = 0; i < 25 && pos + l < fieldl; i++) { if (i != 18) { String current = ""; - for (int j = 0; j < l * ZcodeAcceptanceTestCapabilityResult.getFieldSizeUnit(); j++) { + for (int j = 0; j < l * AcceptanceTestCapabilityResult.getFieldSizeUnit(); j++) { String s = Integer.toHexString(Byte.toUnsignedInt((byte) (b++))); if (s.length() == 1) { current += '0'; @@ -217,7 +217,7 @@ public void the_target_is_sent_an_echo_command_with_too_much_field_data() { } if (pos < fieldl) { String current = ""; - for (int j = 0; j + pos < (fieldl) * ZcodeAcceptanceTestCapabilityResult.getFieldSizeUnit(); j++) { + for (int j = 0; j + pos < (fieldl) * AcceptanceTestCapabilityResult.getFieldSizeUnit(); j++) { String s = Integer.toHexString(Byte.toUnsignedInt((byte) (b++))); if (s.length() == 1) { current += '0'; @@ -231,12 +231,12 @@ public void the_target_is_sent_an_echo_command_with_too_much_field_data() { for (Entry e : fields.entrySet()) { fieldStr += e.getKey().charValue() + e.getValue(); } - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), "Z1" + fieldStr + "\n"); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), "Z1" + fieldStr + "\n"); } @When("the target is sent an echo command with too much big-field data") public void the_target_is_sent_an_echo_command_with_too_much_big_field_data() { - int bigl = ZcodeAcceptanceTestCapabilityResult.getMaxBigFieldLength() + 200; + int bigl = AcceptanceTestCapabilityResult.getMaxBigFieldLength() + 200; byte[] bigArr = new byte[bigl * 2]; byte[] bigArrActual = new byte[bigl]; int arrOffset = 0; @@ -266,6 +266,6 @@ public void the_target_is_sent_an_echo_command_with_too_much_big_field_data() { System.arraycopy(bigArr, 0, full, 3, bigl); full[bigl + 2] = '"'; full[bigl + 3] = '\n'; - CoreZcodeSteps.testAssert = assertThatCommand(ZcodeAcceptanceTestConnectionManager.getConnections().get(0), full, 0); + CoreZscriptSteps.testAssert = assertThatCommand(AcceptanceTestConnectionManager.getConnections().get(0), full, 0); } } diff --git a/receivers/jvm/java-receiver-acceptance-tests/src/test/java/net/zscript/javareceiver_acceptancetests/JavaReceiverCucumberStartup.java b/receivers/jvm/java-receiver-acceptance-tests/src/test/java/net/zscript/javareceiver_acceptancetests/JavaReceiverCucumberStartup.java index 98b49124a..f47fa862e 100644 --- a/receivers/jvm/java-receiver-acceptance-tests/src/test/java/net/zscript/javareceiver_acceptancetests/JavaReceiverCucumberStartup.java +++ b/receivers/jvm/java-receiver-acceptance-tests/src/test/java/net/zscript/javareceiver_acceptancetests/JavaReceiverCucumberStartup.java @@ -11,7 +11,7 @@ import net.zscript.javareceiver.commands.ZcodeCapabilitiesCommand; import net.zscript.javareceiver.commands.ZcodeEchoCommand; import net.zscript.javareceiver.parsing.ZcodeCommandChannel; -import net.zscript.zscript_acceptance_tests.ZcodeAcceptanceTestConnectionManager; +import net.zscript.zscript_acceptance_tests.AcceptanceTestConnectionManager; public class JavaReceiverCucumberStartup { private static boolean hasStarted = false; @@ -32,7 +32,7 @@ public void the_target_is_running_and_connected() { .registerCommand(new ZcodeCapabilitiesCommand(params, z)) .registerCommand(new ZcodeActivateCommand()); - ZcodeAcceptanceTestConnectionManager.registerConnection(con); + AcceptanceTestConnectionManager.registerConnection(con); execs = Executors.newSingleThreadExecutor(); execs.submit(() -> { try { diff --git a/receivers/jvm/java-receiver-acceptance-tests/src/test/java/net/zscript/javareceiver_acceptancetests/LocalTestConnection.java b/receivers/jvm/java-receiver-acceptance-tests/src/test/java/net/zscript/javareceiver_acceptancetests/LocalTestConnection.java index d38e34258..ef60bbe43 100644 --- a/receivers/jvm/java-receiver-acceptance-tests/src/test/java/net/zscript/javareceiver_acceptancetests/LocalTestConnection.java +++ b/receivers/jvm/java-receiver-acceptance-tests/src/test/java/net/zscript/javareceiver_acceptancetests/LocalTestConnection.java @@ -13,9 +13,9 @@ import net.zscript.javareceiver.instreams.ZcodeChannelInStream; import net.zscript.javareceiver.parsing.ZcodeCommandChannel; import net.zscript.javareceiver.parsing.ZcodeCommandSequence; -import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestConnection; +import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestConnection; -public class LocalTestConnection implements ZcodeAcceptanceTestConnection, ZcodeCommandChannel { +public class LocalTestConnection implements AcceptanceTestConnection, ZcodeCommandChannel { private final List> handlers = new ArrayList<>(); private final ZcodeQueueSequenceInStream queueIn = new ZcodeQueueSequenceInStream(); private final ZcodeCommandSequence seq; diff --git a/receivers/network-receiver-acceptance-tests/src/test/java/net/zscript/network_acceptancetests/NetworkAcceptanceTestConnection.java b/receivers/network-receiver-acceptance-tests/src/test/java/net/zscript/network_acceptancetests/NetworkAcceptanceTestConnection.java index 70b161901..64da01fbf 100644 --- a/receivers/network-receiver-acceptance-tests/src/test/java/net/zscript/network_acceptancetests/NetworkAcceptanceTestConnection.java +++ b/receivers/network-receiver-acceptance-tests/src/test/java/net/zscript/network_acceptancetests/NetworkAcceptanceTestConnection.java @@ -19,9 +19,9 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; -import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.ZcodeAcceptanceTestConnection; +import net.zscript.zscript_acceptance_tests.acceptancetest_asserts.AcceptanceTestConnection; -public class NetworkAcceptanceTestConnection implements ZcodeAcceptanceTestConnection { +public class NetworkAcceptanceTestConnection implements AcceptanceTestConnection { private final Lock lock = new ReentrantLock(); private final List> handlers = new ArrayList<>(); diff --git a/receivers/network-receiver-acceptance-tests/src/test/java/net/zscript/network_acceptancetests/NetworkReceiverCucumberStartup.java b/receivers/network-receiver-acceptance-tests/src/test/java/net/zscript/network_acceptancetests/NetworkReceiverCucumberStartup.java index e1177e779..87ff4d03b 100644 --- a/receivers/network-receiver-acceptance-tests/src/test/java/net/zscript/network_acceptancetests/NetworkReceiverCucumberStartup.java +++ b/receivers/network-receiver-acceptance-tests/src/test/java/net/zscript/network_acceptancetests/NetworkReceiverCucumberStartup.java @@ -16,7 +16,7 @@ import org.junit.AssumptionViolatedException; import io.cucumber.java.en.Given; -import net.zscript.zscript_acceptance_tests.ZcodeAcceptanceTestConnectionManager; +import net.zscript.zscript_acceptance_tests.AcceptanceTestConnectionManager; public class NetworkReceiverCucumberStartup { @@ -54,7 +54,7 @@ public void the_target_is_running_and_connected() { connection.clearListeners(); connection.setTarget(target); - ZcodeAcceptanceTestConnectionManager.registerConnection(connection); + AcceptanceTestConnectionManager.registerConnection(connection); } catch (InterruptedException e) { System.err.println("interrupted"); } catch (SocketException e) {