arch-jedi/nx01
1
0
Fork 0
Code Issues Pull requests Actions Packages Releases Activity

Added test for importing white space into white space

Browse source
This commit is contained in:
Willem Cazander 2025-01-25 14:43:52 +01:00
parent 7aec371c22
commit a91383f9c4
2 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java
View file

@ -36,7 +36,6 @@ import org.x4o.fc18.cake2.FourCornerX18CakePointSequence;
import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
import org.x4o.fc18.cake2.zero33.dec1.FCDotCMD5401Dash2D; import org.x4o.fc18.cake2.zero33.dec1.FCDotCMD5401Dash2D;
import org.x4o.fc18.cake2.zero33.dec1.FCDotDEC2701DashPX0; import org.x4o.fc18.cake2.zero33.dec1.FCDotDEC2701DashPX0;
import org.x4o.fc18.cake2.zero33.dec1.FCDotINC0801DashP8;
/// Imports unicode as four corner BASIC text from the "FC.CDC1604-P6" code page. /// Imports unicode as four corner BASIC text from the "FC.CDC1604-P6" code page.
/// ///
@ -149,20 +148,16 @@ public class FourCornerUnicodeImport {
} }
private boolean handleDataGramWordSpacerTypes(ImportState ctx) { private boolean handleDataGramWordSpacerTypes(ImportState ctx) {
if (' ' == ctx.codePoint) { if (convertWhitespaces) {
ctx.reset(); if (!WHITE_SPACES.contains(ctx.codePoint)) {
ctx.output.add(FCDotCMD5401Dash2D.CMD_F4TXT0001_SP); return false;
return true; }
} } else if (' ' != ctx.codePoint) {
if (convertWhitespaces == false) {
return false; return false;
} }
if (WHITE_SPACES.contains(ctx.codePoint)) { ctx.reset();
ctx.reset(); ctx.output.add(FCDotCMD5401Dash2D.CMD_F4TXT0001_SP);
ctx.output.add(FCDotCMD5401Dash2D.CMD_F4TXT0001_SP); return true;
return true;
}
return false;
} }
private void sendTypeWriterNewLine(ImportState ctx) { private void sendTypeWriterNewLine(ImportState ctx) {

20
nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java
View file

@ -256,4 +256,24 @@ public class FourCornerUnicodeImportTest {
String out = FourCornerUnicodeDisplay.text().renderFromX06(cdc); String out = FourCornerUnicodeDisplay.text().renderFromX06(cdc);
Assertions.assertEquals("A\nB\nC\nD\nE\nF\n\n\n", out); Assertions.assertEquals("A\nB\nC\nD\nE\nF\n\n\n", out);
} }
@Test
public void testWhiteSpace() throws Exception {
String space16 = "\u3000\u205F\u202F\u200A\u2009\u2008\u2007\u2006\u2005\u2004\u2003\u2002\u2001\u2000\u00A0\u0020";
List<FourCornerX06BaklavaPointSequence> cdc = FourCornerUnicodeImport.lossy().convertToX06(space16);
Iterator<FourCornerX06BaklavaPointSequence> cdi = cdc.iterator();
Assertions.assertNotNull(cdc);
Assertions.assertTrue(cdi.hasNext());
Assertions.assertFalse(cdc.isEmpty());
Assertions.assertEquals(16, cdc.size());
while (cdi.hasNext()) {
Assertions.assertEquals(FCDotCMD5401Dash2D.CMD_F4TXT0001_SP, cdi.next());
}
String out = FourCornerUnicodeDisplay.text().renderFromX06(cdc);
Assertions.assertEquals(" ", out);
Assertions.assertThrows(IllegalArgumentException.class, () -> {
FourCornerUnicodeImport.strict().convertToX06(space16);
});
}
} }