FC18: prepared salt3 for duel bank octal select option feature letters

This commit is contained in:
Willem Cazander 2025-09-06 16:43:55 +02:00
parent b964f97421
commit 53b9db8319
7 changed files with 95 additions and 55 deletions

View file

@ -57,7 +57,7 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT); // select lower case
cdc.add(FCDotCDC1604DashP6.NX10_J);
cdc.add(FCDotCDC1604DashP6.NX11_K);
cdc.add(FCDotCDC1604DashP6.NS09_SUGER1_COMPARE_RIGHT);
cdc.add(FCDotCDC1604DashP6.NS09_SALT3_COMPARE_RIGHT);
cdc.add(FCDotCDC1604DashP6.NX12_L);
cdc.add(FCDotCDC1604DashP6.NX13_M);
cdc.add(FCDotDEC2701DashPX0.ESC_STOP);
@ -114,19 +114,19 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NX08_H);
cdc.add(FCDotCDC1604DashP6.NX15_O);
cdc.add(FCDotCDC1604DashP6.NX09_I);
cdc.add(FCDotCDC1604DashP6.NS09_SUGER1_COMPARE_RIGHT); // goto right FC.PIE9D-27
cdc.add(FCDotCDC1604DashP6.NS09_SALT3_COMPARE_RIGHT); // goto right FC.PIE9D-27
cdc.add(FCDotCDC1604DashP6.NX08_H);
cdc.add(FCDotCDC1604DashP6.NX15_O);
cdc.add(FCDotCDC1604DashP6.NX09_I);
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION); // goto up FC.PIE9D-26
cdc.add(FCDotCDC1604DashP6.NS06_PEPPER3_QUESTION); // goto up FC.PIE9D-26
cdc.add(FCDotCDC1604DashP6.NX08_H);
cdc.add(FCDotCDC1604DashP6.NX15_O);
cdc.add(FCDotCDC1604DashP6.NX09_I);
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION); // goto up FC.PIE9D-25
cdc.add(FCDotCDC1604DashP6.NS06_PEPPER3_QUESTION); // goto up FC.PIE9D-25
cdc.add(FCDotCDC1604DashP6.NX08_H);
cdc.add(FCDotCDC1604DashP6.NX15_O);
cdc.add(FCDotCDC1604DashP6.NX09_I);
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION); // goto up FC.PIE9D-24
cdc.add(FCDotCDC1604DashP6.NS06_PEPPER3_QUESTION); // goto up FC.PIE9D-24
cdc.add(FCDotCDC1604DashP6.NX08_H);
cdc.add(FCDotCDC1604DashP6.NX15_O);
cdc.add(FCDotCDC1604DashP6.NX09_I);

View file

@ -22,6 +22,8 @@
*/
package org.x4o.fc18.cake2.zero33;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@ -54,26 +56,47 @@ public class FCDotCDC1604DashP6Test {
Assertions.assertFalse(duplicate, "Duplicate ascii core value detected");
}
@Test
public void testPepper3Points() throws Exception {
Assertions.assertEquals("!!!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWritePoints(0)));
Assertions.assertEquals("!!?", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWritePoints(1)));
Assertions.assertEquals("!?!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWritePoints(2)));
Assertions.assertEquals("!??", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWritePoints(3)));
Assertions.assertEquals("?!!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWritePoints(4)));
Assertions.assertEquals("?!?", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWritePoints(5)));
Assertions.assertEquals("??!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWritePoints(6)));
Assertions.assertEquals("???", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWritePoints(7)));
public void testPepper3Sequence() throws Exception {
Assertions.assertEquals("???", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 0)));
Assertions.assertEquals("??!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 1)));
Assertions.assertEquals("?!?", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 2)));
Assertions.assertEquals("?!!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 3)));
Assertions.assertEquals("!??", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 4)));
Assertions.assertEquals("!?!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 5)));
Assertions.assertEquals("!!?", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 6)));
Assertions.assertEquals("!!!", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.pepper3SequenceWrite(new ArrayList<>(), 7)));
}
@Test
public void testPepper3PointsRange() throws Exception {
public void testPepper3SequenceRange() throws Exception {
Assertions.assertThrows(IllegalArgumentException.class, () -> {
FCDotCDC1604DashP6.pepper3SequenceWritePoints(-1);
FCDotCDC1604DashP6.pepper3SequenceWrite(Collections.emptyList(), -1);
});
Assertions.assertThrows(IllegalArgumentException.class, () -> {
FCDotCDC1604DashP6.pepper3SequenceWritePoints(8);
FCDotCDC1604DashP6.pepper3SequenceWrite(Collections.emptyList(), 8);
});
}
@Test
public void testSalt3Sequence() throws Exception {
Assertions.assertEquals("<<<", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 0)));
Assertions.assertEquals("<<>", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 1)));
Assertions.assertEquals("<><", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 2)));
Assertions.assertEquals("<>>", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 3)));
Assertions.assertEquals("><<", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 4)));
Assertions.assertEquals("><>", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 5)));
Assertions.assertEquals(">><", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 6)));
Assertions.assertEquals(">>>", FourCornerUnicodeDisplay.text().renderFromInt18(FCDotCDC1604DashP6.salt3SequenceWrite(new ArrayList<>(), 7)));
}
@Test
public void testSalt3SequenceRange() throws Exception {
Assertions.assertThrows(IllegalArgumentException.class, () -> {
FCDotCDC1604DashP6.salt3SequenceWrite(Collections.emptyList(), -1);
});
Assertions.assertThrows(IllegalArgumentException.class, () -> {
FCDotCDC1604DashP6.salt3SequenceWrite(Collections.emptyList(), 8);
});
}
}

View file

@ -49,8 +49,8 @@ public class FCDotINC0801DashP8Test {
Assertions.assertEquals(FCDotCDC1604DashP6.NS02_ESC3_X2.ordinal(), seq.get(0));
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC3_X3.ordinal(), seq.get(1));
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal(), seq.get(2));
Assertions.assertEquals(FCDotCDC1604DashP6.NS06_PEPPER3_EXCLAMATION.ordinal(), seq.get(3));
Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION.ordinal(), seq.get(4));
Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION.ordinal(), seq.get(5));
Assertions.assertEquals(FCDotCDC1604DashP6.NS06_PEPPER3_QUESTION.ordinal(), seq.get(3));
Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER3_EXCLAMATION.ordinal(), seq.get(4));
Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER3_EXCLAMATION.ordinal(), seq.get(5));
}
}