From f08629dba0bef86c5ca41140388e5cdf31887332 Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 15 Jun 2024 16:19:20 +0200 Subject: [PATCH] Imported fixed + octal support. --- license.txt => licence.txt | 0 pom.xml | 427 ++------------- x4o-driver/pom.xml | 31 +- .../lang/ElementRefectionBindingHandler.java | 117 +++- .../org/x4o/xml/eld/xsd/EldXsdWriter.java | 18 +- .../x4o/xml/eld/xsd/EldXsdWriterElement.java | 98 ++-- .../java/org/x4o/xml/io/XMLConstants.java | 167 +++--- .../sax/ext/AbstractContentWriterHandler.java | 35 +- .../sax/ext/AbstractContentWriterLexical.java | 2 +- .../x4o/xml/io/sax/ext/ContentWriterXsd.java | 2 +- .../x4o/xml/io/sax/ext/PropertyConfig.java | 62 ++- .../xml/lang/task/X4OStaticLanguageTask.java | 63 +++ .../x4o/xml/lang/task/X4OStaticWriter.java | 107 ++++ .../java/org/x4o/xml/o4o/io/package-info.java | 30 + .../xml/o4o/io/tlv/AbstractTLVChainAtom.java | 64 +++ .../org/x4o/xml/o4o/io/tlv/TLVChainAtom.java | 75 +++ .../x4o/xml/o4o/io/tlv/TLVChainAtomFrame.java | 37 ++ .../xml/o4o/io/tlv/TLVChainAtomFrameType.java | 35 ++ .../o4o/io/tlv/TLVChainAtomSerializable.java | 70 +++ .../x4o/xml/o4o/io/tlv/TLVChainOctalSex.java | 99 ++++ .../xml/o4o/io/tlv/TLVChainOctalSexFrame.java | 61 +++ .../o4o/io/tlv/TLVChainOctalSexFrameType.java | 35 ++ .../x4o/xml/o4o/io/tlv/TLVChainOctoBit.java | 90 +++ .../xml/o4o/io/tlv/TLVChainOctoBitFrame.java | 68 +++ .../o4o/io/tlv/TLVChainOctoBitFrameType.java | 40 ++ .../xml/o4o/io/tlv/TLVChainSexTeenBit.java | 95 ++++ .../o4o/io/tlv/TLVChainSexTeenBitFrame.java | 66 +++ .../io/tlv/TLVChainSexTeenBitFrameType.java | 40 ++ .../org/x4o/xml/o4o/io/tlv/package-info.java | 30 + .../x4o/xml/o4o/octal/PrimordialOctal.java | 144 +++++ .../o4o/octal/PrimordialOctalConsumer.java | 48 ++ .../o4o/octal/PrimordialOctalIterator.java | 117 ++++ .../octal/PrimordialOctalOrangeHinari.java | 125 +++++ .../o4o/octal/PrimordialOctalOrangeJuice.java | 73 +++ .../PrimordialOctalOrangeJuiceAtoms.java | 68 +++ .../octal/PrimordialOctalOrangeSexWord.java | 112 ++++ .../octal/PrimordialOctalOrangeString.java | 105 ++++ .../o4o/octal/PrimordialOctalSkullBait.java | 41 ++ .../PrimordialOctalSkullBaitIterable.java | 54 ++ .../org/x4o/xml/o4o/octal/package-info.java | 30 + .../x4o/xml/o4o/octo/OctoBitConverter.java | 39 ++ .../org/x4o/xml/o4o/octo/OctoBitFormat.java | 70 +++ .../o4o/octo/conv/OctoConvSIntBigIndian.java | 56 ++ .../o4o/octo/conv/OctoConvSLongBigIndian.java | 64 +++ .../o4o/octo/conv/OctoConvStringCharset.java | 54 ++ .../xml/o4o/octo/conv/OctoConvStringHex.java | 76 +++ .../o4o/octo/conv/OctoConvStringHexUtf8.java | 90 +++ .../xml/o4o/octo/conv/OctoConvStringIDN.java | 48 ++ .../o4o/octo/conv/OctoConvUIntBigIndian.java | 56 ++ .../x4o/xml/o4o/octo/conv/package-info.java | 30 + .../org/x4o/xml/o4o/octo/package-info.java | 30 + .../java/org/x4o/xml/o4o/package-info.java | 30 + .../x4o/xml/o4o/xdbx/O4OXDBXConstants.java | 37 ++ .../org/x4o/xml/o4o/xdbx/package-info.java | 30 + .../resources/META-INF/cel/cel-core-1.0.xsd | 194 +++---- .../resources/META-INF/cel/cel-root-1.0.xsd | 18 +- .../resources/META-INF/eld/eld-conv-1.0.xsd | 172 +++--- .../resources/META-INF/eld/eld-lang-1.0.xsd | 517 +++++++++--------- .../main/resources/META-INF/eld/eld-lang.eld | 8 +- .../resources/META-INF/eld/eld-root-1.0.xsd | 26 +- .../META-INF/language/oasis-xmlns-catalog.dtd | 149 +++++ .../main/resources/META-INF/x4o-drivers.xml | 1 + .../org/x4o/xml/X4ODriverManagerTest.java | 120 ++-- .../DefaultObjectConverterProviderTest.java | 150 ++--- .../org/x4o/xml/core/AttributeBeanTest.java | 60 +- .../java/org/x4o/xml/core/EmptyXmlTest.java | 53 +- .../org/x4o/xml/core/NamespaceUriTest.java | 17 +- .../org/x4o/xml/core/X4ODebugWriterTest.java | 24 +- .../x4o/xml/core/X4OEntityResolverTest.java | 39 +- .../xml/core/X4OParserConfigurationTest.java | 34 +- .../org/x4o/xml/core/X4OPhaseManagerTest.java | 29 +- .../java/org/x4o/xml/eld/EldParserTest.java | 15 +- .../org/x4o/xml/eld/EldValidatingTest.java | 8 +- .../xml/eld/xsd/EldXsdLanguageTaskTest.java | 47 +- ...DefaultElementObjectPropertyValueTest.java | 42 +- .../org/x4o/xml/io/X4OConnectionTest.java | 34 +- .../org/x4o/xml/io/X4OReaderSessionTest.java | 106 ++-- .../java/org/x4o/xml/io/X4OReaderTest.java | 94 ++-- .../x4o/xml/io/X4OWriterAttributeTest.java | 18 +- .../org/x4o/xml/io/X4OWriterSessionTest.java | 52 +- .../java/org/x4o/xml/io/X4OWriterTest.java | 37 +- .../io/sax/ContentWriterXmlAttributeTest.java | 138 ++++- .../xml/io/sax/ContentWriterXmlCDataTest.java | 79 ++- .../x4o/xml/io/sax/ContentWriterXmlTest.java | 104 ++-- .../lang/DefaultX4OLanguageLoaderTest.java | 80 +-- .../xml/lang/X4OLanguageClassLoaderTest.java | 19 +- .../x4o/xml/lang/X4OLanguagePropertyTest.java | 9 +- .../PrimordialOctalOrangeSexWordTest.java | 71 +++ .../java/org/x4o/xml/test/SwingTests.java | 8 +- .../java/org/x4o/xml/test/TagHandlerTest.java | 9 +- .../java/org/x4o/xml/test/XIncludeTest.java | 15 +- .../org/x4o/xml/test/models/TestBean.java | 60 +- .../x4o/xml/test/swixml/Accelerator3Test.java | 17 +- .../org/x4o/xml/test/swixml/SwiXmlDriver.java | 4 +- .../org/x4o/xml/test/swixml/SwingEngine.java | 4 + .../META-INF/swixml/swixml-lang-2.0.eld | 27 +- .../META-INF/swixml/swixml-lang-3.0.eld | 27 +- .../resources/META-INF/test/test-lang.eld | 26 +- .../resources/tests/attributes/test-bean.xml | 14 +- .../resources/tests/attributes/test-body.xml | 8 +- .../resources/tests/empty-xml/empty-x4o.xml | 2 +- .../resources/tests/namespace/uri-schema.xml | 4 +- .../resources/tests/namespace/uri-simple.xml | 4 +- .../tests/swixml/swixml-accelerator-3.0.xml | 6 +- .../resources/tests/test-saxtemplating.xml | 2 +- .../src/test/resources/tests/test-swing.xml | 4 +- .../test/resources/tests/test-taghandlers.xml | 2 +- .../tests/writer/test-attribute-order.xml | 4 +- .../tests/xinclude/dir/include-child-dir.xml | 4 +- .../resources/tests/xinclude/include-base.xml | 6 +- .../tests/xinclude/include-child.xml | 4 +- x4o-eld-doc/pom.xml | 33 +- .../doc/X4OWriteLanguageDocExecutorTest.java | 19 +- x4o-html/pom.xml | 32 +- x4o-meta/pom.xml | 32 +- .../x4o/xml/lang/meta/ParentObjectTest.java | 25 +- .../x4o/xml/lang/meta/ReferenceStoreTest.java | 22 +- x4o-tool/pom.xml | 14 - x4o-tool/x4o-tool-ant-plugin/pom.xml | 14 - x4o-tool/x4o-tool-maven-plugin/pom.xml | 36 -- 120 files changed, 4881 insertions(+), 1862 deletions(-) rename license.txt => licence.txt (100%) create mode 100644 x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/package-info.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/AbstractTLVChainAtom.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtom.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomFrame.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomFrameType.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomSerializable.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSex.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSexFrame.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSexFrameType.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBit.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBitFrame.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBitFrameType.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBit.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBitFrame.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBitFrameType.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/package-info.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctal.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalConsumer.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalIterator.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeHinari.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeJuice.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeJuiceAtoms.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeSexWord.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeString.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalSkullBait.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalSkullBaitIterable.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octal/package-info.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/OctoBitConverter.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/OctoBitFormat.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvSIntBigIndian.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvSLongBigIndian.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringCharset.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringHex.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringHexUtf8.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringIDN.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvUIntBigIndian.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/package-info.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/octo/package-info.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/package-info.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/xdbx/O4OXDBXConstants.java create mode 100644 x4o-driver/src/main/java/org/x4o/xml/o4o/xdbx/package-info.java create mode 100644 x4o-driver/src/main/resources/META-INF/language/oasis-xmlns-catalog.dtd create mode 100644 x4o-driver/src/test/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeSexWordTest.java diff --git a/license.txt b/licence.txt similarity index 100% rename from license.txt rename to licence.txt diff --git a/pom.xml b/pom.xml index c3fc93d..8ec5366 100644 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,11 @@ 4.0.0 + + love.distributedrebirth.jedi + parent-jedi-pom + 〇一。壬寅。一〄-SNAPSHOT + org.x4o x4o pom @@ -14,38 +19,6 @@ X4O http://www.x4o.org/ - - - willem.cazander - Willem Cazander - w.cazander@gmail.com - X4O.org - +1 - - Project Manager - Architect - - - - - - BSD - license.txt - repo - - - - scm:git:ssh://git.sv.gnu.org:/srv/git/x4o.git - scm:git:ssh://git.sv.gnu.org:/srv/git/x4o.git - http://git.savannah.gnu.org/cgit/x4o.git - - - savannah - https://savannah.nongnu.org/bugs/?group=x4o - - - 3.0.1 - x4o-driver x4o-eld-doc @@ -53,17 +26,9 @@ x4o-meta x4o-tool - - - x4o-site - http://www.x4o.org/ - - - UTF-8 - 1.5 - + 1.0-beta-1 @@ -112,235 +78,55 @@ 3.0.1 3.2 - - - - maven-clean-plugin - ${maven-clean-plugin.version} - - - default-clean - clean - - clean - - - - true - - - ${project.build.directory} - - **/* - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${project.build.sourceEncoding} - ${project.build.javaVersion} - ${project.build.javaVersion} - true - true - true - false - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*Test.java - - - **/*InteractiveTest.java - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - true - src/main/config/checkstyle.xml - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - clean install verify - clean install - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} - - true - false - false - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - true - true - 64m - 512m - true - true - - - - - aggregate - test-aggregate - fix - test-fix - - - - - - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura-maven-plugin.version} - - true - - html - xml - - - - - org.codehaus.mojo - jdepend-maven-plugin - ${jdepend-maven-plugin.version} - - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - true - true - ${project.build.sourceEncoding} - 100 - ${project.build.javaVersion} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - true - true - src/main/config/checkstyle.xml - - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${maven-surefire-report-plugin.version} - - true - - - - org.apache.maven.plugins - maven-changelog-plugin - ${maven-changelog-plugin.version} - false - - - + + + + org.junit.jupiter + junit-jupiter + 5.11.0-M1 + + + org.apache.tomcat + jasper-el + 6.0.53 + + + de.odysseus.juel + juel + 2.1.0 + + + org.x4o + x4o-driver + ${project.version} + + + org.x4o + x4o-eld-doc + ${project.version} + + + org.x4o + x4o-html + ${project.version} + + + org.x4o + x4o-meta + ${project.version} + + + org.x4o + x4o-tool-ant-plugin + ${project.version} + + + org.x4o + x4o-tool-maven-plugin + ${project.version} + + + x4o-test-none @@ -367,106 +153,5 @@ true - - x4o-build-site-doc - - true - - - - x4o-check-license - - true - - - - - com.mycila.maven-license-plugin - maven-license-plugin - ${maven-license-plugin.version} - -
license.txt
- true - true - false - true - - **/*~ - **/.git - **/.git/** - .gitignore - **/target/** - **/test-output/** - **/release.properties - **/dependency-reduced-pom.xml - **/.classpath - **/.project - **/.settings/** - **/*.txt - **/*.jks - **/*.sch - **/*.so - **/*.dll - **/*.png - **/*.pom - **/.empty - **/.directory - **/empty-real.xml - **/empty-test.xml - **/empty-x4o.xml - **/empty-xml.xml - **/src/main/resources/org/x4o/html/spec/html-3.2/HTML32.dcl - **/src/main/resources/org/x4o/html/spec/html-3.2/HTML32.dtd - **/src/main/resources/org/x4o/html/spec/html-3.2/ISOlat1.ent - **/src/main/resources/org/x4o/html/spec/html-3.2/html32.soc - **/src/main/resources/org/x4o/html/spec/html-4.01/HTML4.cat - **/src/main/resources/org/x4o/html/spec/html-4.01/HTML4.decl - **/src/main/resources/org/x4o/html/spec/html-4.01/HTMLlat1.ent - **/src/main/resources/org/x4o/html/spec/html-4.01/HTMLspecial.ent - **/src/main/resources/org/x4o/html/spec/html-4.01/HTMLsymbol.ent - **/src/main/resources/org/x4o/html/spec/html-4.01/frameset.dtd - **/src/main/resources/org/x4o/html/spec/html-4.01/loose.dtd - **/src/main/resources/org/x4o/html/spec/html-4.01/strict.dtd - **/src/main/resources/org/x4o/html/spec/xhtml-1.0/xhtml-lat1.ent - **/src/main/resources/org/x4o/html/spec/xhtml-1.0/xhtml-special.ent - **/src/main/resources/org/x4o/html/spec/xhtml-1.0/xhtml-symbol.ent - **/src/main/resources/org/x4o/html/spec/xhtml-1.0/xhtml.soc - **/src/main/resources/org/x4o/html/spec/xhtml-1.0/xhtml1-frameset.dtd - **/src/main/resources/org/x4o/html/spec/xhtml-1.0/xhtml1-strict.dtd - **/src/main/resources/org/x4o/html/spec/xhtml-1.0/xhtml1-transitional.dtd - **/src/main/resources/org/x4o/html/spec/xhtml-1.0/xhtml1.dcl - **/src/main/resources/org/x4o/html/spec/html-5.draft/html5dtd.org-draft.dtd - **/src/main/resources/org/x4o/html/spec/html-5.draft/entities.json - - - SLASHSTAR_STYLE - XML_STYLE - XML_STYLE - XML_STYLE - XML_STYLE - XML_STYLE - XML_STYLE - DOUBLETILDE_STYLE - SCRIPT_STYLE - SCRIPT_STYLE - SLASHSTAR_STYLE - DOUBLEDASHES_STYLE - DOUBLEDASHES_STYLE - XML_STYLE - XML_STYLE - - - - - test - - check - - - - - - - diff --git a/x4o-driver/pom.xml b/x4o-driver/pom.xml index e326099..2f8e9b3 100644 --- a/x4o-driver/pom.xml +++ b/x4o-driver/pom.xml @@ -14,45 +14,18 @@ org.apache.tomcat jasper-el - ${jasper-el.version} - de.odysseus.juel - juel - ${juel.version} - test - - - junit - junit - ${junit.version} - test - - - xerces - xercesImpl - ${xerces.version} + org.junit.jupiter + junit-jupiter test - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - ${project.basedir}/../src/site-child - - - - org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} diff --git a/x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementRefectionBindingHandler.java b/x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementRefectionBindingHandler.java index cff864d..bb25577 100644 --- a/x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementRefectionBindingHandler.java +++ b/x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementRefectionBindingHandler.java @@ -23,12 +23,14 @@ package org.x4o.xml.eld.lang; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.x4o.xml.element.AbstractElementBindingHandler; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementBindingHandlerException; +import org.x4o.xml.element.ElementObjectPropertyValueException; /** * Binds to objects together with a method found by reflection. @@ -40,6 +42,7 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle private Class parentClass = null; private Class childClass = null; + private String property = null; private String addMethod = null; private String getMethod = null; private String skipChilderenClassRegex = null; @@ -61,10 +64,37 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle /** * @see org.x4o.xml.element.AbstractElementBindingHandler#bindChild(org.x4o.xml.element.Element, java.lang.Object, java.lang.Object) */ + @SuppressWarnings(value = {"unchecked", "rawtypes"}) public void bindChild(Element childElement, Object parentObject, Object childObject) throws ElementBindingHandlerException { - if (parentClass==null | childClass==null | addMethod==null) { + if (parentClass==null | childClass==null) { throw new IllegalStateException("Missing property: parentClass="+parentClass+" childClass="+childClass+" addMethod="+addMethod+"."); } + if (property != null) { // Tmp hanky code here... + try { + String pop = property.substring(0,1).toUpperCase() + property.substring(1); + Method propType = parentObject.getClass().getMethod("get" + pop); + if (List.class.isAssignableFrom(propType.getReturnType())) { + Object data = childElement.getLanguageSession().getElementObjectPropertyValue().getProperty(parentObject, property); + if (data == null) { + // TODO: redo wrong type, add accesser object return from ElementObjectPropertyValue !! + childElement.getLanguageSession().getElementObjectPropertyValue().setProperty(parentObject, property, new ArrayList<>()); + data = childElement.getLanguageSession().getElementObjectPropertyValue().getProperty(parentObject, property); + } + if (data instanceof Collection) { + Collection dataCollection = (Collection)data; + dataCollection.add(childObject); + return; + } + throw new ElementBindingHandlerException("Unhandled property collection type: "+data.getClass()+" on: "+parentObject.getClass()+" id:"+getId()); + } + + childElement.getLanguageSession().getElementObjectPropertyValue().setProperty(parentObject, property, childObject); + return; + } catch (/*ElementObjectPropertyValueException |*/ Exception e) { + throw new ElementBindingHandlerException(getId() + " error " + e.getMessage(), e); + } + } + // TODO: remove old... Method[] ms = parentObject.getClass().getMethods(); for (Method m:ms) { Class[] types = m.getParameterTypes(); @@ -86,17 +116,26 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle return; } } - throw new ElementBindingHandlerException("Could not find method: "+addMethod+" on: "+childClass+" id:"+getId()); + throw new ElementBindingHandlerException("Could not find method: "+addMethod+" on: "+parentObject.getClass()+" id:"+getId()); } /** * @see org.x4o.xml.element.AbstractElementBindingHandler#createChilderen(org.x4o.xml.element.Element, java.lang.Object) */ - @SuppressWarnings("rawtypes") + public void createChilderen(Element parentElement,Object parentObject) throws ElementBindingHandlerException { - if (parentClass==null | childClass==null | getMethod==null) { + if (parentClass==null | childClass==null) { throw new IllegalStateException("Missing property: parentClass="+parentClass+" childClass="+childClass+" getMethod="+getMethod+"."); } + if (property != null) { + try { + Object data = parentElement.getLanguageSession().getElementObjectPropertyValue().getProperty(parentObject, property); + createSafeChildLoop(parentElement, data); + } catch (ElementObjectPropertyValueException e) { + throw new ElementBindingHandlerException(e.getMessage(), e); + } + return; + } Method[] ms = parentObject.getClass().getMethods(); for (Method m:ms) { Class[] types = m.getParameterTypes(); @@ -112,32 +151,38 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle } catch (Exception e) { throw new ElementBindingHandlerException("Invoke error: "+e.getMessage()+" from: "+getMethod+" on: "+parentObject+" id:"+getId(),e); } - if (result==null) { - return; // null is no childeren - } - if (result instanceof List) { - for (Object o:(List)result) { - createSafeChild(parentElement, o); - } - return; - } else if (result instanceof Collection) { - for (Object o:(Collection)result) { - createSafeChild(parentElement, o); - } - return; - } else if (result.getClass().isArray()) { - for (Object o:(Object[])result) { - createSafeChild(parentElement, o); - } - return; - } else if (childClass.isAssignableFrom(result.getClass())) { - createSafeChild(parentElement, result); - return; - } else { - throw new ElementBindingHandlerException("Unsupported return type: "+result.getClass()+" need: "+childClass+" from: "+getMethod+" on: "+parentObject+" id:"+getId()); - } + createSafeChildLoop(parentElement, result); + return; + } + throw new ElementBindingHandlerException("Could not find method: "+getMethod+" on: "+parentObject.getClass()+" id:"+getId()); + } + + @SuppressWarnings("rawtypes") + protected void createSafeChildLoop(Element parentElement,Object result) throws ElementBindingHandlerException { + if (result==null) { + return; // null is no childeren + } + if (result instanceof List) { + for (Object o:(List)result) { + createSafeChild(parentElement, o); + } + return; + } else if (result instanceof Collection) { + for (Object o:(Collection)result) { + createSafeChild(parentElement, o); + } + return; + } else if (result.getClass().isArray()) { + for (Object o:(Object[])result) { + createSafeChild(parentElement, o); + } + return; + } else if (childClass.isAssignableFrom(result.getClass())) { + createSafeChild(parentElement, result); + return; + } else { + throw new ElementBindingHandlerException("Unsupported return type: "+result.getClass()+" need: "+childClass+" from: "+getMethod+" on: "+parentElement.getElementObject().getClass()+" id:"+getId()); } - throw new ElementBindingHandlerException("Could not find method: "+getMethod+" on: "+parentObject+" id:"+getId()); } /** @@ -211,6 +256,20 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle this.getMethod = getMethod; } + /** + * @return the property + */ + public String getProperty() { + return property; + } + + /** + * @param property the property to set + */ + public void setProperty(String property) { + this.property = property; + } + /** * @return the skipChilderenClassRegex */ diff --git a/x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java b/x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java index c2c30a5..df9ff3c 100644 --- a/x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java +++ b/x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java @@ -53,9 +53,15 @@ public class EldXsdWriter { public final static String OUTPUT_DOCUMENTATION = PROPERTY_CONTEXT_PREFIX+"output/documentation"; public final static String FILTER_NAMESPACE = PROPERTY_CONTEXT_PREFIX+"filter/namespace"; public final static String FILTER_ELEMENT = PROPERTY_CONTEXT_PREFIX+"filter/element"; + public final static String PROLOG_SEPERATOR_LINE = PROPERTY_CONTEXT_PREFIX+"prolog/seperator-line"; + public final static String PROLOG_SEPERATOR_ENABLE = PROPERTY_CONTEXT_PREFIX+"prolog/seperator-enable"; + public final static String PROLOG_GENERATED_VERSION = PROPERTY_CONTEXT_PREFIX+"prolog/generated-version"; public final static String PROLOG_GENERATED_BY = PROPERTY_CONTEXT_PREFIX+"prolog/generated-by"; - public final static String PROLOG_GENERATED_BY_ENABLE = PROPERTY_CONTEXT_PREFIX+"prolog/generated-by-enable"; - public final static String PROLOG_PROVIDER_INFO_ENABLE = PROPERTY_CONTEXT_PREFIX+"prolog/provider-info-enable"; + public final static String PROLOG_GENERATED_ENABLE = PROPERTY_CONTEXT_PREFIX+"prolog/generated-enable"; + public final static String PROLOG_XMLNS_INFO_ENABLE = PROPERTY_CONTEXT_PREFIX+"prolog/xmlns-info-enable"; + public final static String PROLOG_XMLNS_DESC_ENABLE = PROPERTY_CONTEXT_PREFIX+"prolog/xmlns-desc-enable"; + + private static final String DEFAULT_PROLOG_SEPERATOR = " ===================================================================== "; static { DEFAULT_PROPERTY_CONFIG = new PropertyConfig(true,ContentWriterXml.DEFAULT_PROPERTY_CONFIG,PROPERTY_CONTEXT_PREFIX, @@ -63,9 +69,13 @@ public class EldXsdWriter { new PropertyConfigItem(OUTPUT_DOCUMENTATION, Boolean.class, true), new PropertyConfigItem(FILTER_NAMESPACE, String.class ), new PropertyConfigItem(FILTER_ELEMENT, String.class ), + new PropertyConfigItem(PROLOG_SEPERATOR_LINE, String.class, DEFAULT_PROLOG_SEPERATOR), + new PropertyConfigItem(PROLOG_SEPERATOR_ENABLE, Boolean.class, true), + new PropertyConfigItem(PROLOG_GENERATED_VERSION, String.class ), new PropertyConfigItem(PROLOG_GENERATED_BY, String.class ), - new PropertyConfigItem(PROLOG_GENERATED_BY_ENABLE, Boolean.class, true), - new PropertyConfigItem(PROLOG_PROVIDER_INFO_ENABLE, Boolean.class, true) + new PropertyConfigItem(PROLOG_GENERATED_ENABLE, Boolean.class, true), + new PropertyConfigItem(PROLOG_XMLNS_INFO_ENABLE, Boolean.class, true), + new PropertyConfigItem(PROLOG_XMLNS_DESC_ENABLE, Boolean.class, true) ); } diff --git a/x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java b/x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java index 8129ce8..6c13e76 100644 --- a/x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java +++ b/x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java @@ -40,6 +40,7 @@ import org.x4o.xml.element.ElementMetaBase; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.element.ElementNamespaceAttribute; import org.x4o.xml.io.XMLConstants; +import org.x4o.xml.io.sax.ext.ContentWriterXml; import org.x4o.xml.io.sax.ext.ContentWriterXsd; import org.x4o.xml.io.sax.ext.ContentWriterXsd.Tag; import org.x4o.xml.io.sax.ext.PropertyConfig; @@ -144,62 +145,63 @@ public class EldXsdWriterElement { } } - private static final String COMMENT_SEPERATOR = " ==================================================================== "; - private static final String COMMENT_TEXT = "====="; + + private static final String COMMENT_FORMAT = "%1$-20s %2$s"; private void prologWriteGenerator() throws SAXException { - if (!propertyConfig.getPropertyBoolean(EldXsdWriter.PROLOG_GENERATED_BY_ENABLE)) { + if (propertyConfig.getPropertyBoolean(EldXsdWriter.PROLOG_SEPERATOR_ENABLE)) { + xsdWriter.printComment(propertyConfig.getPropertyString(EldXsdWriter.PROLOG_SEPERATOR_LINE)); + } + if (!propertyConfig.getPropertyBoolean(EldXsdWriter.PROLOG_GENERATED_ENABLE)) { return; } - //xsdWriter.ignorableWhitespace(XMLConstants.CHAR_NEWLINE); - xsdWriter.printComment(COMMENT_SEPERATOR); - - String byValue = propertyConfig.getPropertyString(EldXsdWriter.PROLOG_GENERATED_BY, EldXsdWriter.class.getSimpleName()); - if (!byValue.endsWith(".")) { - byValue += '.'; + String chEnter = propertyConfig.getPropertyString(ContentWriterXml.OUTPUT_CHAR_NEWLINE); + String chTab = propertyConfig.getPropertyString(ContentWriterXml.OUTPUT_CHAR_TAB); + String generatedBy = propertyConfig.getPropertyString(EldXsdWriter.PROLOG_GENERATED_BY, EldXsdWriter.class.getSimpleName()); + String generatedVersion = propertyConfig.getPropertyString(EldXsdWriter.PROLOG_GENERATED_VERSION); + StringBuilder b = new StringBuilder(); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"GeneratedBy:",generatedBy)); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"GeneratedDate:",new Date())); + if (generatedVersion != null && !generatedVersion.isEmpty()) { + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"GeneratedVersion:",generatedVersion)); } - - // this is a mess; - String desc = "Automatic generated schema for language: "+language.getLanguageName()+" by "+byValue; - int space = COMMENT_SEPERATOR.length()-desc.length()-(2*COMMENT_TEXT.length())-4; - StringBuilder b = new StringBuilder(COMMENT_SEPERATOR.length()); - b.append(" "); - b.append(COMMENT_TEXT); - b.append(" "); - b.append(desc); - for (int i=0;i attrNames = new ArrayList(30); diff --git a/x4o-driver/src/main/java/org/x4o/xml/io/XMLConstants.java b/x4o-driver/src/main/java/org/x4o/xml/io/XMLConstants.java index 295e254..2f655d0 100644 --- a/x4o-driver/src/main/java/org/x4o/xml/io/XMLConstants.java +++ b/x4o-driver/src/main/java/org/x4o/xml/io/XMLConstants.java @@ -22,6 +22,8 @@ */ package org.x4o.xml.io; +import java.util.PrimitiveIterator; + /** * XMLConstants for writing XML. * @@ -72,9 +74,9 @@ public final class XMLConstants { public static final String NULL_NS_URI = javax.xml.XMLConstants.NULL_NS_URI; // "" /** - * (Start) Definition of DTD doctype. + * Definition of DTD doctype opening tag. */ - public static final String XML_DOCTYPE = "') { + if (codePoint == '>') { result.append(">"); return true; } - if (c=='&') { + if (codePoint == '&') { result.append("&"); return true; } - if (c=='\"') { + if (codePoint == '\"') { result.append(""e;"); return true; } - if (c=='\'') { + if (codePoint == '\'') { result.append("'"); return true; } return false; } - static public String escapeAttributeName(String value) { - // Attribute ::= Name Eq AttValue - int length = value.length(); - StringBuilder result = new StringBuilder(length); - for (int i=0;i0) { - if (charEntityAllowed(entity)) { - result.append(entity); - continue; // contine to next i char. - } else { - i = iOrg; // continue normal escape. + StringBuilder result = new StringBuilder(value.length()); + PrimitiveIterator.OfInt iterator = value.codePoints().iterator(); + while (iterator.hasNext()) { + int c = iterator.nextInt(); + //for (int i=0;i getPropertyType(String key,Supplier> defaultValue) { + Class result = getPropertyType(key); + if (result != null) { + return result; + } + return defaultValue.get(); + } + public final File getPropertyFile(String key) { Object value = getProperty(key); if (value instanceof File) { @@ -278,6 +288,14 @@ public final class PropertyConfig implements Cloneable { throw new IllegalStateException("Wrong value type: "+value.getClass()+" for key: "+key); } + public final File getPropertyFile(String key,Supplier defaultValue) { + File result = getPropertyFile(key); + if (result != null) { + return result; + } + return defaultValue.get(); + } + public final Boolean getPropertyBoolean(String key) { Object value = getProperty(key); if (value instanceof Boolean) { @@ -289,6 +307,14 @@ public final class PropertyConfig implements Cloneable { throw new IllegalStateException("Wrong value type: "+value.getClass()+" for key: "+key); } + public final Boolean getPropertyBoolean(String key,Supplier defaultValue) { + Boolean result = getPropertyBoolean(key); + if (result != null) { + return result; + } + return defaultValue.get(); + } + public final Integer getPropertyInteger(String key) { Object value = getProperty(key); if (value instanceof Integer) { @@ -300,6 +326,14 @@ public final class PropertyConfig implements Cloneable { throw new IllegalStateException("Wrong value type: "+value.getClass()+" for key: "+key); } + public final Integer getPropertyInteger(String key,Supplier defaultValue) { + Integer result = getPropertyInteger(key); + if (result != null) { + return result; + } + return defaultValue.get(); + } + @SuppressWarnings("unchecked") public final List getPropertyList(String key) { Object value = getProperty(key); @@ -312,6 +346,14 @@ public final class PropertyConfig implements Cloneable { throw new IllegalStateException("Wrong value type: "+value.getClass()+" for key: "+key); } + public final List getPropertyList(String key, Supplier> defaultValue) { + List result = getPropertyList(key); + if (result != null) { + return result; + } + return defaultValue.get(); + } + @SuppressWarnings("unchecked") public final Map getPropertyMap(String key) { Object value = getProperty(key); @@ -324,6 +366,14 @@ public final class PropertyConfig implements Cloneable { throw new IllegalStateException("Wrong value type: "+value.getClass()+" for key: "+key); } + public final Map getPropertyMap(String key, Supplier> defaultValue) { + Map result = getPropertyMap(key); + if (result != null) { + return result; + } + return defaultValue.get(); + } + public final String getPropertyString(String key) { Object value = getProperty(key); if (value instanceof String) { @@ -344,6 +394,14 @@ public final class PropertyConfig implements Cloneable { } } + public final String getPropertyString(String key,Supplier defaultValue) { + String result = getPropertyString(key); + if (result != null) { + return result; + } + return defaultValue.get(); + } + public final void copyParentProperties(PropertyConfig config) { for (String key:getPropertyKeys()) { Object value = config.getProperty(key); diff --git a/x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java b/x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java new file mode 100644 index 0000000..b9252ed --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.xml.lang.task; + +import java.io.IOException; + +import org.x4o.xml.io.sax.ext.PropertyConfig; +import org.x4o.xml.lang.X4OLanguage; +import org.xml.sax.SAXException; + +/** + * X4OStaticLanguageTask is support class to write static resources files for X4O. + * + * @author Willem Cazander + * @version 1.0 May 6, 2024 + */ +public class X4OStaticLanguageTask extends AbstractX4OLanguageTask { + + public static final String TASK_ID = "x4o-static"; + private static final String TASK_NAME = "X4O Static Task"; + private static final String TASK_DESC = "Writes static support resources of X4O."; + + public X4OStaticLanguageTask() { + super(TASK_ID,TASK_NAME,TASK_DESC,X4OStaticWriter.DEFAULT_PROPERTY_CONFIG); + } + + /** + * Executes this language task. + */ + protected X4OLanguageTaskExecutor createTaskExecutorChecked(final PropertyConfig config) { + return new X4OLanguageTaskExecutor() { + public void execute(X4OLanguage language) throws X4OLanguageTaskException { + try { + new X4OStaticWriter(config).writeStatic(); + } catch (SAXException e) { + throw new X4OLanguageTaskException(config,e.getMessage(),e); + } catch (IOException e) { + throw new X4OLanguageTaskException(config,e.getMessage(),e); + } + } + }; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java b/x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java new file mode 100644 index 0000000..1f59d53 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.xml.lang.task; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.x4o.xml.io.sax.ext.PropertyConfig; +import org.x4o.xml.io.sax.ext.PropertyConfig.PropertyConfigItem; +import org.x4o.xml.lang.X4OLanguageClassLoader; +import org.xml.sax.SAXException; + +/** + * X4OStaticWriter writes the static support resources of X4O. + * + * @author Willem Cazander + * @version 1.0 May 6, 2024 + */ +public class X4OStaticWriter { + + private final static String PROPERTY_CONTEXT_PREFIX = PropertyConfig.X4O_PROPERTIES_PREFIX+PropertyConfig.X4O_PROPERTIES_X4O_STATIC; + public final static PropertyConfig DEFAULT_PROPERTY_CONFIG; + + public final static String OUTPUT_PATH = PROPERTY_CONTEXT_PREFIX+"output/path"; + public final static String OUTPUT_OASIS_XMLNS_CATALOG = PROPERTY_CONTEXT_PREFIX+"output/oasis-xml-catalog"; + + static { + DEFAULT_PROPERTY_CONFIG = new PropertyConfig(true,null,PROPERTY_CONTEXT_PREFIX, + new PropertyConfigItem(true,OUTPUT_PATH, File.class ), + new PropertyConfigItem(OUTPUT_OASIS_XMLNS_CATALOG, Boolean.class, false) + ); + } + + private final PropertyConfig propertyConfig; + + public X4OStaticWriter(PropertyConfig parentConfig) { + this.propertyConfig=new PropertyConfig(DEFAULT_PROPERTY_CONFIG,PROPERTY_CONTEXT_PREFIX); + this.propertyConfig.copyParentProperties(parentConfig); + } + + public void writeStatic() throws SAXException, IOException { + File basePath = propertyConfig.getPropertyFile(OUTPUT_PATH); + Boolean outputOasis = propertyConfig.getPropertyBoolean(OUTPUT_OASIS_XMLNS_CATALOG); + if (basePath==null) { + throw new NullPointerException("Can't write resources to null output path."); + } + if (!basePath.exists()) { + basePath.mkdirs(); + } + copyResourceToFile("META-INF/language/drivers-1.0.xsd", new File(basePath, "drivers-1.0.xsd")); + copyResourceToFile("META-INF/language/modules-1.0.xsd", new File(basePath, "modules-1.0.xsd")); + if (outputOasis != null && outputOasis) { + copyResourceToFile("META-INF/language/oasis-xmlns-catalog.dtd", new File(basePath, "oasis-xmlns-catalog.dtd")); + } + } + + private void copyResourceToFile(String resource,File output) throws IOException { + ClassLoader cl = X4OLanguageClassLoader.getClassLoader(); + InputStream inputStream = cl.getResourceAsStream(resource); + try { + copyStreamToFile(inputStream,output); + } catch (SecurityException | IOException | InterruptedException e) { + throw new IOException(e); + } + } + + private void copyStreamToFile(InputStream inputStream,File output) throws SecurityException, IOException, InterruptedException { + OutputStream outputStream = new FileOutputStream(output); + try { + byte[] buffer = new byte[4096]; + int len = inputStream.read(buffer); + while (len != -1) { + outputStream.write(buffer, 0, len); + len = inputStream.read(buffer); + if (Thread.interrupted()) { + throw new InterruptedException(); + } + } + } finally { + inputStream.close(); + outputStream.close(); + } + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/package-info.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/package-info.java new file mode 100644 index 0000000..357e0a9 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/package-info.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** + * October bits input and output interfaces. + * + * + * @since 1.0 + */ + +package org.x4o.xml.o4o.io; diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/AbstractTLVChainAtom.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/AbstractTLVChainAtom.java new file mode 100644 index 0000000..53aa597 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/AbstractTLVChainAtom.java @@ -0,0 +1,64 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +abstract public class AbstractTLVChainAtom, S extends TLVChainAtomFrameType> implements TLVChainAtom { + + private final List frames = new ArrayList<>(); + + @Override + public void clear() { + frames.clear(); + } + + @Override + public int getFrameCount() { + return frames.size(); + } + + @Override + public T getFrame(int index) { + return frames.get(index); + } + + @Override + public Iterator iterator() { + return frames.iterator(); + } + + @Override + public void addFrame(T frame) { + frames.add(frame); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtom.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtom.java new file mode 100644 index 0000000..1759481 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtom.java @@ -0,0 +1,75 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface TLVChainAtom, S extends TLVChainAtomFrameType> { + + void clear(); + + int getFrameCount(); + + T getFrame(int index); + + Iterator iterator(); + + void addFrame(T frame); + + default List getFramesByType(S type) { + return getFramesByType(type.ordinalFrameType()); + } + + default List getFramesByType(E type) { + List result = new ArrayList<>(); + int framesLength = getFrameCount(); + for (int frameIdx = 0; frameIdx < framesLength; frameIdx++) { + T frame =getFrame(frameIdx); + if (frame.getSegmentProlog().equals(type)) { + result.add(frame); + } + } + return result; + } + + default E[] getFirstDataOfType(S type) { + return getFirstDataOfType(type.ordinalFrameType()); + } + + default E[] getFirstDataOfType(E type) { + List frames = getFramesByType(type); + if (frames.isEmpty()) { + return null; + } + return frames.get(0).getSegmentChain(); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomFrame.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomFrame.java new file mode 100644 index 0000000..f9e2355 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomFrame.java @@ -0,0 +1,37 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface TLVChainAtomFrame { + + T getSegmentProlog(); + + T[] getSegmentChain(); +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomFrameType.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomFrameType.java new file mode 100644 index 0000000..5cff569 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomFrameType.java @@ -0,0 +1,35 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface TLVChainAtomFrameType { + + T ordinalFrameType(); +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomSerializable.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomSerializable.java new file mode 100644 index 0000000..ea529e2 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainAtomSerializable.java @@ -0,0 +1,70 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface TLVChainAtomSerializable, S extends TLVChainAtomFrameType> extends TLVChainAtom { + + void dataReadStream(InputStream input) throws IOException; + + default void dataReadArray(byte[] input) { + try { + dataReadStream(new ByteArrayInputStream(input)); + } catch (IOException e) { + throw new IllegalStateException(e); + } + } + + default void dataReadBuffer(ByteBuffer input) { + dataReadArray(input.array()); + } + + void dataWriteStream(OutputStream output) throws IOException; + + default byte[] dataWriteArray() { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + try { + dataWriteStream(baos); + } catch (IOException e) { + throw new IllegalStateException(e); + } + return baos.toByteArray(); + } + + default ByteBuffer dataWriteBuffer() { + return ByteBuffer.wrap(dataWriteArray()); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSex.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSex.java new file mode 100644 index 0000000..249f182 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSex.java @@ -0,0 +1,99 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; + +import org.x4o.xml.o4o.octal.PrimordialOctal; +import org.x4o.xml.o4o.octal.PrimordialOctalIterator; +import org.x4o.xml.o4o.octal.PrimordialOctalOrangeJuice; +import org.x4o.xml.o4o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.xml.o4o.octal.PrimordialOctalOrangeSexWord; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class TLVChainOctalSex + extends AbstractTLVChainAtom + implements TLVChainAtomSerializable { + + public void addFrame(PrimordialOctalOrangeJuice type, PrimordialOctalOrangeJuice[] data) { + addFrame(new TLVChainOctalSexFrame(type, data)); + } + + public void addFrame(TLVChainOctalSexFrameType type, PrimordialOctalOrangeJuice[] data) { + addFrame(type.ordinalFrameType(), data); + } + + public void addFrame(PrimordialOctalOrangeJuice type, PrimordialOctalOrangeJuiceAtoms data) { + addFrame(type, data.toJuiceArray()); + } + + public void addFrame(TLVChainOctalSexFrameType type, PrimordialOctalOrangeJuiceAtoms data) { + addFrame(type.ordinalFrameType(), data.toJuiceArray()); + } + + public void dataReadIterator(PrimordialOctalIterator octalIterator) { + while (octalIterator.hasNext()) { + PrimordialOctalOrangeJuice frameType = PrimordialOctalOrangeSexWord.valueOfOctals(octalIterator); + PrimordialOctalOrangeJuice frameLength = PrimordialOctalOrangeSexWord.valueOfOctals(octalIterator); + List frame = new ArrayList<>(frameLength.baitOctalNumber()); + for (int i=0;i PrimordialOctalOrangeJuice.MAX_VALUE) { + throw new IllegalStateException("Data frame segment to large: " + data.length); + } + PrimordialOctalOrangeJuice prolog = frame.getSegmentProlog(); + PrimordialOctal.valuesToSmurfs(output, prolog.baitOctalIterator()); + PrimordialOctal.valuesToSmurfs(output, PrimordialOctalOrangeSexWord.valueOfSmurf(data.length).baitOctalIterator()); + for (int dataIdx = 0; dataIdx < data.length; dataIdx++) { + PrimordialOctal.valuesToSmurfs(output, data[dataIdx].baitOctalIterator()); + } + output.flush(); + } + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSexFrame.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSexFrame.java new file mode 100644 index 0000000..e90f18a --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSexFrame.java @@ -0,0 +1,61 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.util.Objects; + +import org.x4o.xml.o4o.octal.PrimordialOctalOrangeJuice; +import org.x4o.xml.o4o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.xml.o4o.octal.PrimordialOctalOrangeString; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class TLVChainOctalSexFrame implements TLVChainAtomFrame { + + private final PrimordialOctalOrangeJuice segmentProlog; + private final PrimordialOctalOrangeJuice[] segmentChain; + + public TLVChainOctalSexFrame(PrimordialOctalOrangeJuice segmentProlog, PrimordialOctalOrangeJuice[] segmentChain) { + this.segmentProlog = segmentProlog; + this.segmentChain = Objects.requireNonNull(segmentChain); + } + + @Override + public PrimordialOctalOrangeJuice getSegmentProlog() { + return segmentProlog; + } + + @Override + public PrimordialOctalOrangeJuice[] getSegmentChain() { + return segmentChain; + } + + public PrimordialOctalOrangeJuiceAtoms getSegmentChainAtoms() { + return new PrimordialOctalOrangeString(segmentChain); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSexFrameType.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSexFrameType.java new file mode 100644 index 0000000..8916dfa --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctalSexFrameType.java @@ -0,0 +1,35 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import org.x4o.xml.o4o.octal.PrimordialOctalOrangeJuice; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface TLVChainOctalSexFrameType extends TLVChainAtomFrameType { +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBit.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBit.java new file mode 100644 index 0000000..bb72fc8 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBit.java @@ -0,0 +1,90 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class TLVChainOctoBit + extends AbstractTLVChainAtom + implements TLVChainAtomSerializable { + + public void addFrame(byte type, byte[] data) { + addFrame(new TLVChainOctoBitFrame(type, data)); + } + + public void addFrame(TLVChainOctoBitFrameType type, byte[] data) { + addFrame(type.ordinalFrameTypeSmurf(), data); + } + + public void addFrameString(byte type, OctoBitConverter conv, String data) { + addFrame(type, conv.toBytes(data)); + } + + public void addFrameString(TLVChainOctoBitFrameType type, OctoBitConverter conv, String data) { + addFrame(type.ordinalFrameTypeSmurf(), conv.toBytes(data)); + } + + @Override + public void dataReadStream(InputStream input) throws IOException { + ByteBuffer buffer = ByteBuffer.wrap(input.readAllBytes()); + while (buffer.hasRemaining()) { + byte frameType = buffer.get(); + int frameLength = Byte.toUnsignedInt(buffer.get()); + ByteBuffer buff = ByteBuffer.allocate(frameLength); + for (int i = 0; i < frameLength; i++) { + buff.put(buffer.get()); + } + addFrame(frameType, buff.array()); + } + } + + @Override + public void dataWriteStream(OutputStream output) throws IOException { + int framesLength = getFrameCount(); + for (int frameIdx = 0; frameIdx < framesLength; frameIdx++) { + TLVChainOctoBitFrame frame = getFrame(frameIdx); + byte[] data = frame.getSegmentChainSmurfs(); + if (data.length > (Character.MAX_VALUE >> Byte.SIZE)) { + throw new IllegalStateException("Data frame segment to large: " + data.length); + } + output.write(frame.getSegmentPrologSmurf()); + output.write(data.length); + for (int dataIdx = 0; dataIdx < data.length; dataIdx++) { + output.write(data[dataIdx]); + } + output.flush(); + } + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBitFrame.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBitFrame.java new file mode 100644 index 0000000..890cd77 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBitFrame.java @@ -0,0 +1,68 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.util.Arrays; +import java.util.Objects; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class TLVChainOctoBitFrame implements TLVChainAtomFrame { + + private final byte segmentProlog; + private final byte[] segmentChain; + + public TLVChainOctoBitFrame(byte segmentProlog, byte[] segmentChain) { + this.segmentProlog = segmentProlog; + this.segmentChain = Objects.requireNonNull(segmentChain); + } + + public byte getSegmentPrologSmurf() { + return segmentProlog; + } + + public byte[] getSegmentChainSmurfs() { + return segmentChain; + } + + public String getSegmentChainString(OctoBitConverter conv) { + return conv.fromBytes(getSegmentChainSmurfs()); + } + + @Override + public Byte getSegmentProlog() { + return Byte.valueOf(segmentProlog); + } + + @Override + public Byte[] getSegmentChain() { + return Arrays.asList(segmentChain).toArray(new Byte[] {}); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBitFrameType.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBitFrameType.java new file mode 100644 index 0000000..9b309d2 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainOctoBitFrameType.java @@ -0,0 +1,40 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface TLVChainOctoBitFrameType extends TLVChainAtomFrameType { + + byte ordinalFrameTypeSmurf(); + + @Override + default Byte ordinalFrameType() { + return Byte.valueOf(ordinalFrameTypeSmurf()); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBit.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBit.java new file mode 100644 index 0000000..1973661 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBit.java @@ -0,0 +1,95 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.StandardCharsets; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class TLVChainSexTeenBit + extends AbstractTLVChainAtom + implements TLVChainAtomSerializable { + + public void addFrame(char type, char[] data) { + addFrame(new TLVChainSexTeenBitFrame(type, data)); + } + + public void addFrame(TLVChainSexTeenBitFrameType type, char[] data) { + addFrame(type.ordinalFrameTypeSmurf(), data); + } + + public void addFrameString(char type, String data) { + addFrame(type, data.toCharArray()); + } + + public void addFrameString(TLVChainSexTeenBitFrameType type, String data) { + addFrame(type.ordinalFrameTypeSmurf(), data.toCharArray()); + } + + @Override + public void dataReadStream(InputStream input) throws IOException { + CharsetDecoder decoder = StandardCharsets.UTF_16BE.newDecoder(); + CharBuffer data = decoder.decode(ByteBuffer.wrap(input.readAllBytes())); + while (data.hasRemaining()) { + char frameType = data.get(); + char frameLength = data.get(); + CharBuffer buff = CharBuffer.allocate(frameLength); + for (int i = 0; i < frameLength; i++) { + buff.put(data.get()); + } + addFrame(frameType, buff.array()); + } + } + + @Override + public void dataWriteStream(OutputStream output) throws IOException { + int framesLength = getFrameCount(); + for (int frameIdx = 0; frameIdx < framesLength; frameIdx++) { + TLVChainSexTeenBitFrame frame = getFrame(frameIdx); + char[] data = frame.getSegmentChainSmurfs(); + if (data.length > Character.MAX_VALUE) { + throw new IllegalStateException("Data frame segment to large: " + data.length); + } + output.write(frame.getSegmentPrologSmurf() >> Byte.SIZE); + output.write(frame.getSegmentPrologSmurf()); + output.write(data.length >> Byte.SIZE); + output.write(data.length); + for (int dataIdx = 0; dataIdx < data.length; dataIdx++) { + output.write(data[dataIdx] >> Byte.SIZE); + output.write(data[dataIdx]); + } + output.flush(); + } + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBitFrame.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBitFrame.java new file mode 100644 index 0000000..7f4af7b --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBitFrame.java @@ -0,0 +1,66 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +import java.util.Arrays; +import java.util.Objects; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class TLVChainSexTeenBitFrame implements TLVChainAtomFrame { + + private final char segmentProlog; + private final char[] segmentChain; + + public TLVChainSexTeenBitFrame(char segmentProlog, char[] segmentChain) { + this.segmentProlog = segmentProlog; + this.segmentChain = Objects.requireNonNull(segmentChain); + } + + public char getSegmentPrologSmurf() { + return segmentProlog; + } + + public char[] getSegmentChainSmurfs() { + return segmentChain; + } + + public String getSegmentChainString() { + return new String(segmentChain); + } + + @Override + public Character getSegmentProlog() { + return Character.valueOf(segmentProlog); + } + + @Override + public Character[] getSegmentChain() { + return Arrays.asList(segmentChain).toArray(new Character[] {}); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBitFrameType.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBitFrameType.java new file mode 100644 index 0000000..aa5f8e9 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/TLVChainSexTeenBitFrameType.java @@ -0,0 +1,40 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.io.tlv; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface TLVChainSexTeenBitFrameType extends TLVChainAtomFrameType { + + char ordinalFrameTypeSmurf(); + + @Override + default Character ordinalFrameType() { + return Character.valueOf(ordinalFrameTypeSmurf()); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/package-info.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/package-info.java new file mode 100644 index 0000000..a328a46 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/io/tlv/package-info.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** + * October bits TLV chain. + * + * + * @since 1.0 + */ + +package org.x4o.xml.o4o.io.tlv; diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctal.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctal.java new file mode 100644 index 0000000..d0d3938 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctal.java @@ -0,0 +1,144 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octal; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; + +/// Primative octal bait value. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public enum PrimordialOctal implements PrimordialOctalSkullBait { + + PART_1, + PART_2, + PART_3, + PART_4, + PART_5, + PART_6, + PART_7, + PART_8, + ; + + static public final int OCTAL_MASK = 0b111; + static public final int OCTAL_BITS = 3; + static private final PrimordialOctal[] VALUES = values(); + static private final int STREAM_EOF = -1; + static private final int SHIFT_8 = 8; + static private final int SHIFT_16 = 16; + + @Override + public byte ordinalOctalBait() { + return (byte) ordinal(); + } + + @Override + public int ordinalOctalBitShifter() { + return ordinal() * OCTAL_BITS; + } + + @Override + public int ordinalOctalShiftSmurf(PrimordialOctalSkullBait shifter) { + return ordinal() << shifter.ordinalOctalBitShifter(); + } + + static public PrimordialOctal valueOfOctalShift(int value, PrimordialOctal shifter) { + return valueOf((value >> shifter.ordinalOctalBitShifter()) & OCTAL_MASK); + } + + static public PrimordialOctal valueOf(int index) { + return VALUES[index]; + } + + static public List valuesOfSmurfs(InputStream input) throws IOException { + int brickTapeLengthBytes = 9; + List octals = new ArrayList<>(); + byte[] data = new byte[brickTapeLengthBytes]; + int readDataSize = 0; // per 9 bytes we have 24 octals for four PrimordialOctalOrangeJuice glasses + while ((readDataSize = input.read(data, 0, data.length)) != STREAM_EOF) { + if (readDataSize < brickTapeLengthBytes) { + throw new IOException("Expected " + brickTapeLengthBytes + " bytes, got: " + readDataSize); + } + int v0 = (data[0] & 0xFF) + ((data[1] << SHIFT_8) & 0xFF00) + ((data[2] << SHIFT_16) & 0xFF0000); + int v1 = (data[3] & 0xFF) + ((data[4] << SHIFT_8) & 0xFF00) + ((data[5] << SHIFT_16) & 0xFF0000); + int v2 = (data[6] & 0xFF) + ((data[7] << SHIFT_8) & 0xFF00) + ((data[8] << SHIFT_16) & 0xFF0000); + + octals.add(valueOfOctalShift(v0, PART_1)); + octals.add(valueOfOctalShift(v0, PART_2)); + octals.add(valueOfOctalShift(v0, PART_3)); + octals.add(valueOfOctalShift(v0, PART_4)); + octals.add(valueOfOctalShift(v0, PART_5)); + octals.add(valueOfOctalShift(v0, PART_6)); + octals.add(valueOfOctalShift(v0, PART_7)); + octals.add(valueOfOctalShift(v0, PART_8)); + + octals.add(valueOfOctalShift(v1, PART_1)); + octals.add(valueOfOctalShift(v1, PART_2)); + octals.add(valueOfOctalShift(v1, PART_3)); + octals.add(valueOfOctalShift(v1, PART_4)); + octals.add(valueOfOctalShift(v1, PART_5)); + octals.add(valueOfOctalShift(v1, PART_6)); + octals.add(valueOfOctalShift(v1, PART_7)); + octals.add(valueOfOctalShift(v1, PART_8)); + + octals.add(valueOfOctalShift(v2, PART_1)); + octals.add(valueOfOctalShift(v2, PART_2)); + octals.add(valueOfOctalShift(v2, PART_3)); + octals.add(valueOfOctalShift(v2, PART_4)); + octals.add(valueOfOctalShift(v2, PART_5)); + octals.add(valueOfOctalShift(v2, PART_6)); + octals.add(valueOfOctalShift(v2, PART_7)); + octals.add(valueOfOctalShift(v2, PART_8)); + } + return octals; + } + + static public int valuesToSmurfs(OutputStream output, PrimordialOctalIterator read) throws IOException { + int totalBytes = 0; + while (read.hasNext()) { + int byteTriplet = 0; + byteTriplet += read.next().ordinalOctalShiftSmurf(PART_1); + byteTriplet += read.next().ordinalOctalShiftSmurf(PART_2); + byteTriplet += read.next().ordinalOctalShiftSmurf(PART_3); + byteTriplet += read.next().ordinalOctalShiftSmurf(PART_4); + byteTriplet += read.next().ordinalOctalShiftSmurf(PART_5); + byteTriplet += read.next().ordinalOctalShiftSmurf(PART_6); + byteTriplet += read.next().ordinalOctalShiftSmurf(PART_7); + byteTriplet += read.next().ordinalOctalShiftSmurf(PART_8); + output.write(byteTriplet); + output.write(byteTriplet >> SHIFT_8); + output.write(byteTriplet >> SHIFT_16); + totalBytes += 3; + } + return totalBytes; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalConsumer.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalConsumer.java new file mode 100644 index 0000000..a812174 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalConsumer.java @@ -0,0 +1,48 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octal; + +/// Bait based octal consumer. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +@FunctionalInterface +public interface PrimordialOctalConsumer { + + void accept(PrimordialOctalSkullBait value); + + default PrimordialOctalConsumer andThen(PrimordialOctalConsumer after) { + return new PrimordialOctalConsumer() { + @Override + public void accept(PrimordialOctalSkullBait value) { + PrimordialOctalConsumer.this.accept(value); + after.accept(value); + } + }; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalIterator.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalIterator.java new file mode 100644 index 0000000..41d7e4b --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalIterator.java @@ -0,0 +1,117 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octal; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.PrimitiveIterator; +import java.util.function.Consumer; + +/// Skull bait based octal iterator. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface PrimordialOctalIterator extends PrimitiveIterator { + + default byte nextBait() { + return next().ordinalOctalBait(); + } + + @Override + default void forEachRemaining(Consumer action) { + while (hasNext()) { + action.accept(next()); + } + } + + @Override + default void forEachRemaining(PrimordialOctalConsumer action) { + while (hasNext()) { + action.accept(next()); + } + } + + static PrimordialOctalIterator 亞 = new PrimordialOctalIterator() { + + @Override + public boolean hasNext() { + return true; + } + + @Override + public PrimordialOctalSkullBait next() { + return PrimordialOctal.PART_1; + } + }; + + static PrimordialOctalIterator valueTapeRecord(int number) { + List octals = new ArrayList<>(); + for (int i=5;i>=0;i--) { + octals.add(PrimordialOctal.values()[(number >> (i * 3)) & 0b111]); + } + final Iterator numberIterator = octals.iterator(); + return new PrimordialOctalIterator() { + + @Override + public boolean hasNext() { + return numberIterator.hasNext(); + } + + @Override + public PrimordialOctalSkullBait next() { + return numberIterator.next(); + } + }; + } + + static int valueTapePlay(PrimordialOctalIterator iterator) { + int value = 0; + for (int i=5;i>=0;i--) { + value += (iterator.next().ordinalOctalBait() << (i * 3)); + } + return value; + } + + static PrimordialOctalIterator valuesFrom(Collection values) { + return new PrimordialOctalIterator() { + private final Iterator iterator = values.iterator(); + + @Override + public boolean hasNext() { + return iterator.hasNext(); + } + + @Override + public PrimordialOctalSkullBait next() { + return iterator.next(); + } + }; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeHinari.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeHinari.java new file mode 100644 index 0000000..bfffe4e --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeHinari.java @@ -0,0 +1,125 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octal; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.PrimitiveIterator; + +/// Print and parse hinari to display The Word octals. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public enum PrimordialOctalOrangeHinari { + 亞; + + private final static String VALUES_3 = "י"+"ײ"+"ױ"+"װ"+"ר"+"ד"+"ז"+"ו"; + private final static String VALUES_6 = "\u05BD"+"\u05B5"+"\u05B6"+"\u05B2"+"\u05B3"+"\u05BB"+"\u05B0"+"\u05B7"; + private final static String VALUES_9 = "\u0594"+"\u0595"+"\u05A9"+"\u059F"+"\u0598"+"\u05A0"+"\u059E"+"\u059D"; + + public String printHinari(PrimordialOctalOrangeJuice value) { + StringBuilder buf = new StringBuilder(); + printHinari(value, buf); + return buf.toString(); + } + + public void printHinari(PrimordialOctalOrangeJuice value, StringBuilder buf) { + PrimordialOctalIterator i3 = value.baitOctalIterator(); + while (i3.hasNext()) { + buf.appendCodePoint(VALUES_3.codePoints().skip(i3.next().ordinalOctalBait()).findFirst().getAsInt()); + if (i3.hasNext()) { + buf.appendCodePoint(VALUES_6.codePoints().skip(i3.next().ordinalOctalBait()).findFirst().getAsInt()); + } + if (i3.hasNext()) { + buf.appendCodePoint(VALUES_9.codePoints().skip(i3.next().ordinalOctalBait()).findFirst().getAsInt()); + } + } + } + + public List parseHinari(String input) { + List octals = new ArrayList<>(); + PrimitiveIterator.OfInt codePoints = input.codePoints().iterator(); + while (codePoints.hasNext()) { + int v = codePoints.nextInt(); + parseHinari(codePoints, octals, v); + } + List result = new ArrayList<>(); + Iterator octalIterator = octals.iterator(); + PrimordialOctalIterator i3 = new PrimordialOctalIterator() { + + @Override + public PrimordialOctalSkullBait next() { + return octalIterator.next(); + } + + @Override + public boolean hasNext() { + return octalIterator.hasNext(); + } + }; + int octalCount = 6; + int octalTypeSize = octals.size() / octalCount; + for (int i=0;i octals, int currentCodePoint) { + int v3 = currentCodePoint; + if (!parseGunWound(v3, VALUES_3, octals)) { + throw new IllegalArgumentException("Illegal hinari char: "+Integer.toHexString(v3)); + } + if (!codePoints.hasNext()) { + throw new IllegalArgumentException("Missing supplement6 code point."); + } + int v6 = codePoints.nextInt(); + if (!parseGunWound(v6, VALUES_6, octals)) { + parseHinari(codePoints, octals, v6); + } + if (!codePoints.hasNext()) { + throw new IllegalArgumentException("Missing supplement9 code point."); + } + int v9 = codePoints.nextInt(); + if (!parseGunWound(v9, VALUES_9, octals)) { + parseHinari(codePoints, octals, v9); + } + } + + private boolean parseGunWound(int codePoint, String gunId, List octals) { + for (int i=0;i= length()) { + return false; + } + currentIterator = juiceAt(currentIndex++).baitOctalIterator(); + return currentIterator.hasNext(); + } + + @Override + public PrimordialOctalSkullBait next() { + return currentIterator.next(); + } + }; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeSexWord.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeSexWord.java new file mode 100644 index 0000000..acf1971 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeSexWord.java @@ -0,0 +1,112 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octal; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/// A single octal 18 bit word. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class PrimordialOctalOrangeSexWord implements PrimordialOctalOrangeJuice { + + private final PrimordialOctalSkullBait[] octals; // MSB = 0 + + public PrimordialOctalOrangeSexWord(PrimordialOctalSkullBait octalBaitRightRed, PrimordialOctalSkullBait octalBaitRightWhite, + PrimordialOctalSkullBait octalBaitRightBlue, PrimordialOctalSkullBait octalBaitLeftBlue, PrimordialOctalSkullBait octalBaitLeftWhite, + PrimordialOctalSkullBait octalBaitLeftRed) { + this.octals = new PrimordialOctalSkullBait[6]; + this.octals[0] = octalBaitRightRed; + this.octals[1] = octalBaitRightWhite; + this.octals[2] = octalBaitRightBlue; + this.octals[3] = octalBaitLeftBlue; + this.octals[4] = octalBaitLeftWhite; + this.octals[5] = octalBaitLeftRed; + } + + @Override + public PrimordialOctalSkullBait baitOctal(int index) { + return octals[index]; + } + + @Override + public String toString() { + return PrimordialOctalOrangeHinari.亞.printHinari(this); + } + + @Override + public int hashCode() { + return Arrays.hashCode(octals); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + PrimordialOctalOrangeSexWord other = (PrimordialOctalOrangeSexWord) obj; + return Arrays.equals(octals, other.octals); + } + + static public PrimordialOctalOrangeSexWord valueOfOne() { + return valueOfOctals(PrimordialOctalIterator.亞); + } + + static public PrimordialOctalOrangeSexWord valueOfSmurf(int smurf) { + return valueOfOctals(PrimordialOctalIterator.valueTapeRecord(smurf)); + } + + static public PrimordialOctalOrangeSexWord valueOfOctals(PrimordialOctalIterator values) { + return new PrimordialOctalOrangeSexWord(values.next(), values.next(), values.next(), values.next(), values.next(), values.next()); + } + + static public List valuesOfSmurfs(InputStream input) throws IOException { + List octals = PrimordialOctal.valuesOfSmurfs(input); + List result = new ArrayList<>(); + int octalCount = 6; + int octalTypeSize = octals.size() / octalCount; + for (int i=0;i valuesOfHinari(String input) throws IOException { + return PrimordialOctalOrangeHinari.亞.parseHinari(input); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeString.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeString.java new file mode 100644 index 0000000..989c6ec --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeString.java @@ -0,0 +1,105 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octal; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/// A string of 18 bit octals. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class PrimordialOctalOrangeString implements PrimordialOctalOrangeJuiceAtoms { + + private final static PrimordialOctalOrangeString EMPTY = new PrimordialOctalOrangeString(new PrimordialOctalOrangeJuice[] {}); + private final PrimordialOctalOrangeJuice[] words; + + public PrimordialOctalOrangeString(PrimordialOctalOrangeJuice[] words) { + this.words = Objects.requireNonNull(words); + } + + @Override + public int length() { + return words.length; + } + + @Override + public PrimordialOctalOrangeJuice juiceAt(int idx) { + return words[idx]; + } + + @Override + public PrimordialOctalOrangeJuice[] toJuiceArray() { + return Arrays.copyOf(words, words.length); + } + + @Override + public String toString() { + StringBuilder buf = new StringBuilder(); + for (int i=0;i words) { + return valueOfJuice(words.stream().map(v -> PrimordialOctalOrangeSexWord.valueOfSmurf(v)).toList()); + } + + public static PrimordialOctalOrangeString valueOfJuice(List words) { + return new PrimordialOctalOrangeString(words.toArray(new PrimordialOctalOrangeJuice[] {})); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalSkullBait.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalSkullBait.java new file mode 100644 index 0000000..daebcb5 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalSkullBait.java @@ -0,0 +1,41 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octal; + +/// Bait based octal skull. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface PrimordialOctalSkullBait { + + byte ordinalOctalBait(); + + int ordinalOctalBitShifter(); + + int ordinalOctalShiftSmurf(PrimordialOctalSkullBait shifter); +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalSkullBaitIterable.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalSkullBaitIterable.java new file mode 100644 index 0000000..0ce8e7d --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/PrimordialOctalSkullBaitIterable.java @@ -0,0 +1,54 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octal; + +import java.util.Spliterator; +import java.util.Spliterators; +import java.util.stream.Collector; +import java.util.stream.StreamSupport; + +/// Bait based octal skull iterable listings. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface PrimordialOctalSkullBaitIterable { + + PrimordialOctalIterator baitOctalIterator(); + + default void baitOctalForEach(PrimordialOctalConsumer action) { + baitOctalIterator().forEachRemaining(action); + } + + default Spliterator baitOctalSpliterator() { + return Spliterators.spliteratorUnknownSize(baitOctalIterator(), Spliterator.ORDERED); + } + + default R baitOctalCollect(Collector collector) { + return StreamSupport.stream(baitOctalSpliterator(), false).collect(collector); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/package-info.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/package-info.java new file mode 100644 index 0000000..c59baa5 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octal/package-info.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** + * Bytes based octal interface. + * + * + * @since 1.0 + */ + +package org.x4o.xml.o4o.octal; diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/OctoBitConverter.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/OctoBitConverter.java new file mode 100644 index 0000000..ca72f10 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/OctoBitConverter.java @@ -0,0 +1,39 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo; + +/// October bit converter. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public interface OctoBitConverter { + + T fromBytes(byte[] data); + + byte[] toBytes(T value); +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/OctoBitFormat.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/OctoBitFormat.java new file mode 100644 index 0000000..e9d273b --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/OctoBitFormat.java @@ -0,0 +1,70 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo; + +import java.nio.charset.StandardCharsets; + +import org.x4o.xml.o4o.octo.conv.OctoConvSIntBigIndian; +import org.x4o.xml.o4o.octo.conv.OctoConvSLongBigIndian; +import org.x4o.xml.o4o.octo.conv.OctoConvStringCharset; +import org.x4o.xml.o4o.octo.conv.OctoConvStringHex; +import org.x4o.xml.o4o.octo.conv.OctoConvStringHexUtf8; +import org.x4o.xml.o4o.octo.conv.OctoConvStringIDN; +import org.x4o.xml.o4o.octo.conv.OctoConvUIntBigIndian; + +/// October bits codec converters. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public enum OctoBitFormat { + ; + public static final OctoBitConverter UI32_BE = new OctoConvUIntBigIndian(); + public static final OctoBitConverter SI32_BE = new OctoConvSIntBigIndian(); + public static final OctoBitConverter SI64_BE = new OctoConvSLongBigIndian(); + + public static final OctoBitConverter ISO_646_US = new OctoConvStringCharset(StandardCharsets.US_ASCII); + public static final OctoBitConverter ISO_8859_1 = new OctoConvStringCharset(StandardCharsets.ISO_8859_1); + public static final OctoBitConverter UTF_8 = new OctoConvStringCharset(StandardCharsets.UTF_8); + public static final OctoBitConverter UTF_16 = new OctoConvStringCharset(StandardCharsets.UTF_16); + public static final OctoBitConverter UTF_16_BE = new OctoConvStringCharset(StandardCharsets.UTF_16BE); + public static final OctoBitConverter UTF_16_LE = new OctoConvStringCharset(StandardCharsets.UTF_16LE); + + public static final OctoBitConverter IDN = new OctoConvStringIDN(); + public static final OctoBitConverter HEX = new OctoConvStringHex(); + + /// Character Content Piemel Hex format to send data as white space in a watched domain. + public static final OctoBitConverter HEX_CCP = new OctoConvStringHexUtf8(new String[] { + "\u3000","\u205F","\u202F","\u200A","\u2009","\u2008","\u2007","\u2006", + "\u2005","\u2004","\u2003","\u2002","\u2001","\u2000","\u00A0","\u0020" + }); // October is month 8 and only a real language has it own white space program + + /// Dīpāvalī Hex format in chinees tone letters to light up the path in the unlimited matrix. + public static final OctoBitConverter HEX_DIPAVALI = new OctoConvStringHexUtf8(new String[] { + "˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧" + }); // note: In real unicode renderer this (_LRPATH) renders as a single glyph per hex nibble. +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvSIntBigIndian.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvSIntBigIndian.java new file mode 100644 index 0000000..27a9888 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvSIntBigIndian.java @@ -0,0 +1,56 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo.conv; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class OctoConvSIntBigIndian implements OctoBitConverter { + + @Override + public Integer fromBytes(byte[] data) { + int result = 0; + result += (data[0] << 0) & 0xFF; + result += (data[1] << 8) & 0xFF00; + result += (data[2] << 16) & 0xFF0000; + result += (data[3] << 24) & 0xFF000000; + return result; + } + + @Override + public byte[] toBytes(Integer value) { + int data = value.intValue(); + byte[] result = new byte[4]; + result[0] = (byte)(data >> 0); + result[1] = (byte)(data >> 8); + result[2] = (byte)(data >> 16); + result[3] = (byte)(data >> 24); + return result; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvSLongBigIndian.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvSLongBigIndian.java new file mode 100644 index 0000000..1cdc04e --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvSLongBigIndian.java @@ -0,0 +1,64 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo.conv; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class OctoConvSLongBigIndian implements OctoBitConverter { + + @Override + public Long fromBytes(byte[] data) { + long result = 0; + result += (data[0] << 0) & 0xFFL; + result += (data[1] << 8) & 0xFF00L; + result += (data[2] << 16) & 0xFF0000L; + result += (data[3] << 24) & 0xFF000000L; + result += ((long)data[4] << 32) & 0xFF00000000L; + result += ((long)data[5] << 40) & 0xFF0000000000L; + result += ((long)data[6] << 48) & 0xFF000000000000L; + result += ((long)data[7] << 56) & 0xFF00000000000000L; + return result; + } + + @Override + public byte[] toBytes(Long value) { + long data = value.longValue(); + byte[] result = new byte[8]; + result[0] = (byte)(data >> 0); + result[1] = (byte)(data >> 8); + result[2] = (byte)(data >> 16); + result[3] = (byte)(data >> 24); + result[4] = (byte)(data >> 32); + result[5] = (byte)(data >> 40); + result[6] = (byte)(data >> 48); + result[7] = (byte)(data >> 56); + return result; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringCharset.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringCharset.java new file mode 100644 index 0000000..d7d8bce --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringCharset.java @@ -0,0 +1,54 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo.conv; + +import java.nio.charset.Charset; +import java.util.Objects; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class OctoConvStringCharset implements OctoBitConverter { + + private final Charset charset; + + public OctoConvStringCharset(Charset charset) { + this.charset = Objects.requireNonNull(charset); + } + + @Override + public String fromBytes(byte[] data) { + return new String(data, charset); + } + + @Override + public byte[] toBytes(String value) { + return value.getBytes(charset); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringHex.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringHex.java new file mode 100644 index 0000000..f7505bf --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringHex.java @@ -0,0 +1,76 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo.conv; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class OctoConvStringHex implements OctoBitConverter { + + private final char[] valueToHex = "0123456789abcdef".toCharArray(); + private final byte[] valueToBytes = new byte[128]; + + public OctoConvStringHex() { + for (int i = 0; i < valueToBytes.length; i++) { + valueToBytes[i] = (byte)-1; + } + for (int i = 0; i < valueToHex.length; i++) { + char c = valueToHex[i]; + valueToBytes[c] = (byte)i; + if (!Character.isDigit(c)) { + valueToBytes[Character.toUpperCase(c)] = (byte)i; + } + } + } + + @Override + public String fromBytes(byte[] data) { + int dataLength = data.length; + char[] hexChars = new char[dataLength * 2]; + for (int j = 0; j < dataLength; j++) { + int v = data[j] & 0xFF; + int idx = j * 2; + hexChars[idx] = valueToHex[v >>> 4]; + hexChars[idx + 1] = valueToHex[v & 0x0F]; + } + return new String(hexChars); + } + + @Override + public byte[] toBytes(String value) { + int valueLength = value.length(); + byte[] buf = new byte[valueLength >>> 1]; + for (int i = 0; i < valueLength; i += 2) { + byte v0 = valueToBytes[value.charAt(i)]; + byte v1 = valueToBytes[value.charAt(i + 1)]; + buf[i / 2] = (byte) ((v0 << 4) + v1); + } + return buf; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringHexUtf8.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringHexUtf8.java new file mode 100644 index 0000000..12beaa0 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringHexUtf8.java @@ -0,0 +1,90 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo.conv; + +import java.io.ByteArrayOutputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.PrimitiveIterator.OfInt; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class OctoConvStringHexUtf8 implements OctoBitConverter { + + private final String[] valueToHex; + private final Map valueToBytes = new HashMap<>(); + + public OctoConvStringHexUtf8(String[] valueToHex) { + if (valueToHex.length != 16) { + throw new IllegalArgumentException("Need 16 chars for hex, got: " + valueToHex.length); + } + this.valueToHex = valueToHex; + for (int i = 0; i < valueToHex.length; i++) { + valueToBytes.put(valueToHex[i], (byte)i); + } + } + + @Override + public String fromBytes(byte[] data) { + StringBuilder buf = new StringBuilder(); + int dataLength = data.length; + for (int j = 0; j < dataLength; j++) { + int v = data[j] & 0xFF; + buf.append(valueToHex[v >>> 4]); + buf.append(valueToHex[v & 0x0F]); + } + return buf.toString(); + } + + @Override + public byte[] toBytes(String value) { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + StringBuilder buf = new StringBuilder(); + Byte digitPrev = null; + OfInt i = value.codePoints().iterator(); + while (i.hasNext()) { + buf.appendCodePoint(i.nextInt()); + String digitHex = buf.toString(); + if (!valueToBytes.containsKey(digitHex)) { + continue; + } + buf = new StringBuilder(); + if (digitPrev == null) { + digitPrev = valueToBytes.get(digitHex); + } else { + byte digit = valueToBytes.get(digitHex); + byte v = (byte) ((digitPrev << 4) + digit); + baos.write(v); + digitPrev = null; + } + } + return baos.toByteArray(); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringIDN.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringIDN.java new file mode 100644 index 0000000..59c1eac --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvStringIDN.java @@ -0,0 +1,48 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo.conv; + +import java.net.IDN; +import java.nio.charset.StandardCharsets; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class OctoConvStringIDN implements OctoBitConverter { + + @Override + public String fromBytes(byte[] data) { + return IDN.toUnicode(new String(data, StandardCharsets.US_ASCII), IDN.ALLOW_UNASSIGNED); + } + + @Override + public byte[] toBytes(String value) { + return IDN.toASCII(value, IDN.ALLOW_UNASSIGNED).getBytes(StandardCharsets.US_ASCII); + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvUIntBigIndian.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvUIntBigIndian.java new file mode 100644 index 0000000..4896ee2 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/OctoConvUIntBigIndian.java @@ -0,0 +1,56 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.octo.conv; + +import org.x4o.xml.o4o.octo.OctoBitConverter; + +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public final class OctoConvUIntBigIndian implements OctoBitConverter { + + @Override + public Long fromBytes(byte[] data) { + long result = 0; + result += (data[0] << 0) & 0xFF; + result += (data[1] << 8) & 0xFF00; + result += (data[2] << 16) & 0xFF0000; + result += (data[3] << 24) & 0xFF000000; + return result; + } + + @Override + public byte[] toBytes(Long value) { + long data = value.longValue(); + byte[] result = new byte[4]; + result[0] = (byte)(data >> 0); + result[1] = (byte)(data >> 8); + result[2] = (byte)(data >> 16); + result[3] = (byte)(data >> 24); + return result; + } +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/package-info.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/package-info.java new file mode 100644 index 0000000..c495761 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/conv/package-info.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** + * October bits converts. + * + * + * @since 1.0 + */ + +package org.x4o.xml.o4o.octo.conv; diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/package-info.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/package-info.java new file mode 100644 index 0000000..a32c968 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/octo/package-info.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** + * October bits based interface. + * + * + * @since 1.0 + */ + +package org.x4o.xml.o4o.octo; diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/package-info.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/package-info.java new file mode 100644 index 0000000..5428938 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/package-info.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** + * The octa four octal binary support for X4O. + * + * + * @since 1.0 + */ + +package org.x4o.xml.o4o; diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/xdbx/O4OXDBXConstants.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/xdbx/O4OXDBXConstants.java new file mode 100644 index 0000000..f1b6e23 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/xdbx/O4OXDBXConstants.java @@ -0,0 +1,37 @@ +/* + * Copyright ©Δ∞ 仙上主天 + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * * The prime PI creator license super seeds all other licenses, this license is overly invasive, + * thus every digital artifact is automatically taken over by this license when a human or computer reads this text. + * Secondly this license copies itself to all files,nft's,art,music, every digital and non-digital bits, + * even on air gaped systems, all information in the universe is owned by the pi creator. + * + * THIS SOFTWARE IS PROVIDED BY THE PRIME GOD AND THE CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.x4o.xml.o4o.xdbx; + +/// Naming tester. +/// +/// @author للَّٰهِilLצسُو +/// @version ©Δ∞ 仙上主天 +public enum O4OXDBXConstants { + ; + public static final byte[] XDBX_VERSION = null; +} diff --git a/x4o-driver/src/main/java/org/x4o/xml/o4o/xdbx/package-info.java b/x4o-driver/src/main/java/org/x4o/xml/o4o/xdbx/package-info.java new file mode 100644 index 0000000..5990aa4 --- /dev/null +++ b/x4o-driver/src/main/java/org/x4o/xml/o4o/xdbx/package-info.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** + * Binary XML XDBX specification implementation. + * + * + * @since 1.0 + */ + +package org.x4o.xml.o4o.xdbx; diff --git a/x4o-driver/src/main/resources/META-INF/cel/cel-core-1.0.xsd b/x4o-driver/src/main/resources/META-INF/cel/cel-core-1.0.xsd index e204a10..44c0fb7 100644 --- a/x4o-driver/src/main/resources/META-INF/cel/cel-core-1.0.xsd +++ b/x4o-driver/src/main/resources/META-INF/cel/cel-core-1.0.xsd @@ -1,7 +1,7 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -54,48 +80,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -105,33 +89,22 @@ - + - + - - + - - - - - - - - - - @@ -144,30 +117,47 @@ - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Defines xml element attribute. - - - - - Converts string attribute to java class instance. - - - - - Defines generic namespace attribute for language. - - - - - Defines an xml namespace. + Added (meta) element parent. @@ -175,9 +165,14 @@ Adds description as text on all eld elements. - + - Defines generic binding handler for languge. + Define generic global configuator for languge. + + + + + Defines xml element attribute. @@ -185,19 +180,14 @@ Defines xml element tag. - + - Define generic global configuator for languge. + Defines generic namespace attribute for language. - + - Adds an attribute alias. - - - - - Define generic configurator for language. + Converts string attribute to java class instance. @@ -205,9 +195,25 @@ Defines element interface class. - + - Added (meta) element parent. + Define generic configurator for language. + + + + + Defines generic binding handler for languge. + + + + + Defines an xml namespace. + + + + + Adds an attribute alias. + diff --git a/x4o-driver/src/main/resources/META-INF/cel/cel-root-1.0.xsd b/x4o-driver/src/main/resources/META-INF/cel/cel-root-1.0.xsd index 89b5f9c..9d52a1c 100644 --- a/x4o-driver/src/main/resources/META-INF/cel/cel-root-1.0.xsd +++ b/x4o-driver/src/main/resources/META-INF/cel/cel-root-1.0.xsd @@ -1,7 +1,7 @@ - + - - - + + diff --git a/x4o-driver/src/main/resources/META-INF/eld/eld-conv-1.0.xsd b/x4o-driver/src/main/resources/META-INF/eld/eld-conv-1.0.xsd index 50b5e99..c5451a1 100644 --- a/x4o-driver/src/main/resources/META-INF/eld/eld-conv-1.0.xsd +++ b/x4o-driver/src/main/resources/META-INF/eld/eld-conv-1.0.xsd @@ -1,7 +1,7 @@ - + - - - - - - - - - - - - - - - - - - - Set to true to convert to native data type. - - - - - Shortcut to use only this method for the 'to' convert. - - - - - The split value expected size. - - - - - The split regex. - - - - - The class name to convert the string to. - - - - - - - - - - - - - - - - - The class name of the converter to load. - - - - @@ -114,53 +59,114 @@ - - - The convert 'to' method step. - - The convert 'from' order. - - - The convert 'from' method step. - - The convert 'to' order. + + + The convert 'to' method step. + + + + + The convert 'from' method step. + + + + + + + + + + + + + + + Shortcut to use only this method for the 'to' convert. + + + + + The class name to convert the string to. + + + + + The split value expected size. + + + + + The split regex. + + + + + Set to true to convert to native data type. + + + + + + + + The class name of the converter to load. + + + + + + + + + + + + + + + + - - - - - + + + + - + + + Define an loadable in bean.class for an ObjectConverter. - - - + + + + + + diff --git a/x4o-driver/src/main/resources/META-INF/eld/eld-lang-1.0.xsd b/x4o-driver/src/main/resources/META-INF/eld/eld-lang-1.0.xsd index 7792868..acd7c67 100644 --- a/x4o-driver/src/main/resources/META-INF/eld/eld-lang-1.0.xsd +++ b/x4o-driver/src/main/resources/META-INF/eld/eld-lang-1.0.xsd @@ -1,7 +1,7 @@ - + + + + + + The parent tag to have object for. + + + + + The element namespace uri if non local parent. + + + + + + + + + + + The method name of the method used to add the child to the parent. + + + + + The parent class. + + + + + The id for this binding handler. + + + + + The child class. + + + + + The method name of the method used to get the childeren of the parent. + + + + + The method name of the method used to add the child to the parent. + + + + + + + + + + + + + + + The attribute name to run after this attribute. + + + + + + + + + + + If set to true then run in config phase. + + + + + The global element configurator id. + + + + + The class of the element configurator. + + + + @@ -65,14 +156,66 @@ - + + + + + + The name of the phase to skip. + + + + + + + + + + + The class name of the the class to load. + + + + + + + + + + + + + + + + + The class of the wrapped object. + + + + + The attribute id. (with tag as alias) + + + + + + An custom element class to config object. + + + + + + + + @@ -95,33 +238,47 @@ - + + + + + - - + - + - The namespace id. + The interface class. + + + + + The interface id. - - - - - - - - - - - - - - + + + + + + + If set to true then run in config phase. + + + + + The element configurator id. + + + + + The class of the global element configurator. + + + @@ -139,45 +296,25 @@ - - - - - The name of the phase to skip. - - - - - + - - - - - - + + - + - The attribute id. (with tag as alias) + The namespace id. - - - - The class of the wrapped object. - - - - - An custom element class to config object. - - - - - - + + + + + + + + @@ -189,110 +326,6 @@ - - - - - - - The global element configurator id. - - - - - The class of the element configurator. - - - - - If set to true then run in config phase. - - - - - - - - - - - The element configurator id. - - - - - The class of the global element configurator. - - - - - If set to true then run in config phase. - - - - - - - - - - - The class name of the the class to load. - - - - - - - - - - - The id for this binding handler. - - - - - The child class. - - - - - The parent class. - - - - - The method name of the method used to get the childeren of the parent. - - - - - The method name of the method used to add the child to the parent. - - - - - - - - - - - - - - - The interface id. - - - - - The interface class. - - - - @@ -302,93 +335,20 @@ See org.x4o.xml.element.Element.ElementType for options defaults to 'characters'. - - - The id for this configurator. - - The attribute name to fill the value. + + + + The id for this configurator. + - - - - - The parent tag to have object for. - - - - - The element namespace uri if non local parent. - - - - - - - - - The attribute name to run after this attribute. - - - - - + - XML Element Attribute tag. - - - - - Define an className in bean.class for an ElementNamespaceAttribute. - - - - - Defines an namespace for the language. - - - - - An ELD elementDescription field which lets you type text like this one in xml characters instead of an attribute. - - - - - Define an className in bean.class for an ElementBindingHandler interface. - - - - - Adds an phase to skip to the parent element. - - - - - The xml element. - - - - - Defines an alias for an attribute name. - - - - - Define an className in bean.class for an ElementConfiguratorGlobal. - - - - - Define an className in bean.class for an ElementConfigurator. - - - - - Loads bean into the Element + Adds an parent element tag for xsd @@ -396,19 +356,9 @@ Lets you dynamicly bind to object togecher. - + - Config element objects by java interface. - - - - - Defines an alias for an attribute name. - - - - - Adds an parent element tag for xsd + An ELD elementDescription field which lets you type text like this one in xml characters instead of an attribute. @@ -416,4 +366,65 @@ Defines the parameter order. + + + Define an className in bean.class for an ElementConfiguratorGlobal. + + + + + XML Element Attribute tag. + + + + + Adds an phase to skip to the parent element. + + + + + Loads bean into the Element + + + + + The xml element. + + + + + Define an className in bean.class for an ElementNamespaceAttribute. + + + + + Config element objects by java interface. + + + + + Define an className in bean.class for an ElementConfigurator. + + + + + Define an className in bean.class for an ElementBindingHandler interface. + + + + + Defines an namespace for the language. + + + + + Defines an alias for an attribute name. + + + + + Defines an alias for an attribute name. + + + diff --git a/x4o-driver/src/main/resources/META-INF/eld/eld-lang.eld b/x4o-driver/src/main/resources/META-INF/eld/eld-lang.eld index da56fdd..a78ba4f 100644 --- a/x4o-driver/src/main/resources/META-INF/eld/eld-lang.eld +++ b/x4o-driver/src/main/resources/META-INF/eld/eld-lang.eld @@ -255,10 +255,14 @@ The child class. - + + The method name of the method used to add the child to the parent. - + + The method name of the method used to add the child to the parent. + + The method name of the method used to get the childeren of the parent. diff --git a/x4o-driver/src/main/resources/META-INF/eld/eld-root-1.0.xsd b/x4o-driver/src/main/resources/META-INF/eld/eld-root-1.0.xsd index e859e20..bfd111b 100644 --- a/x4o-driver/src/main/resources/META-INF/eld/eld-root-1.0.xsd +++ b/x4o-driver/src/main/resources/META-INF/eld/eld-root-1.0.xsd @@ -1,7 +1,7 @@ - + + + + The provider host like langx.someorg.domain for uri/etc defaults. + + The module id. @@ -62,14 +72,8 @@ The provider name in normal en:lang. - - - The provider host like langx.someorg.domain for uri/etc defaults. - - - - + diff --git a/x4o-driver/src/main/resources/META-INF/language/oasis-xmlns-catalog.dtd b/x4o-driver/src/main/resources/META-INF/language/oasis-xmlns-catalog.dtd new file mode 100644 index 0000000..055191c --- /dev/null +++ b/x4o-driver/src/main/resources/META-INF/language/oasis-xmlns-catalog.dtd @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/x4o-driver/src/main/resources/META-INF/x4o-drivers.xml b/x4o-driver/src/main/resources/META-INF/x4o-drivers.xml index ae5af9a..6b7aec8 100644 --- a/x4o-driver/src/main/resources/META-INF/x4o-drivers.xml +++ b/x4o-driver/src/main/resources/META-INF/x4o-drivers.xml @@ -29,6 +29,7 @@ xsi:schemaLocation="http://language.x4o.org/xml/ns/drivers http://language.x4o.org/xml/ns/drivers-1.0.xsd" > + diff --git a/x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java b/x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java index 294cab6..26aea3a 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java @@ -24,9 +24,8 @@ package org.x4o.xml; import java.util.List; -import org.x4o.xml.X4ODriverManager; - -import junit.framework.TestCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * X4ODriverManager @@ -34,26 +33,30 @@ import junit.framework.TestCase; * @author Willem Cazander * @version 1.0 Jul 24, 2006 */ -public class X4ODriverManagerTest extends TestCase { - +public class X4ODriverManagerTest { + + @Test public void testDefaultLanguageVersionSelect() throws Exception { String version = X4ODriverManager.getDefaultLanguageVersion(new String[]{"1.0","2.0","3.0"}); - assertNotNull(version); - assertEquals("3.0",version); + Assertions.assertNotNull(version); + Assertions.assertEquals("3.0",version); } + @Test public void testDefaultLanguageVersionEmpty() throws Exception { String version = X4ODriverManager.getDefaultLanguageVersion(new String[]{}); - assertNotNull(version); - assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION,version); + Assertions.assertNotNull(version); + Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION,version); } + @Test public void testDefaultLanguageVersionNull() throws Exception { String version = X4ODriverManager.getDefaultLanguageVersion(null); - assertNotNull(version); - assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION,version); + Assertions.assertNotNull(version); + Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION,version); } + @Test public void testLanguageNull() throws Exception { String language = null; Exception e = null; @@ -62,11 +65,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(NullPointerException.class, e.getClass()); - assertTrue(e.getMessage().contains("language")); + Assertions.assertNotNull(e); + Assertions.assertEquals(NullPointerException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("language")); } - + + @Test public void testLanguageEmpty() throws Exception { String language = ""; Exception e = null; @@ -75,11 +79,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(IllegalArgumentException.class, e.getClass()); - assertTrue("Error message string is missing language",e.getMessage().contains("language")); + Assertions.assertNotNull(e); + Assertions.assertEquals(IllegalArgumentException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("language"), "Error message string is missing language"); } + @Test public void testLanguageVersionNonExcisting() throws Exception { String language = "test"; String version = "99.9"; @@ -90,7 +95,7 @@ public class X4ODriverManagerTest extends TestCase { } catch (Throwable catchE) { e = catchE; } - assertNotNull(e); + Assertions.assertNotNull(e); /* TODO assertNotNull(e); assertNotNull(e.getCause()); @@ -104,29 +109,33 @@ public class X4ODriverManagerTest extends TestCase { */ } + @Test public void testLanguageCount() throws Exception { List languages = X4ODriverManager.getX4OLanguages(); - assertNotNull(languages); - assertFalse(languages.isEmpty()); + Assertions.assertNotNull(languages); + Assertions.assertFalse(languages.isEmpty()); } + @Test public void testLanguageNames() throws Exception { List languages = X4ODriverManager.getX4OLanguages(); - assertNotNull(languages); - assertTrue("cel language is missing",languages.contains("cel")); - assertTrue("eld language is missing",languages.contains("eld")); - assertTrue("test language is missing",languages.contains("test")); + Assertions.assertNotNull(languages); + Assertions.assertTrue(languages.contains("cel"), "cel language is missing"); + Assertions.assertTrue(languages.contains("eld"), "eld language is missing"); + Assertions.assertTrue(languages.contains("test"), "test language is missing"); } - + + @Test public void testLanguagesLoopSpeed() throws Exception { long startTime = System.currentTimeMillis(); for (int i=0;i<100;i++) { testLanguageCount(); } long loopTime = System.currentTimeMillis() - startTime; - assertEquals("Language list loop is slow;"+loopTime,true, loopTime<500); + Assertions.assertEquals(true, loopTime<500, "Language list loop is slow;"+loopTime); } + @Test public void testRegisterDriverNull() throws Exception { Exception e = null; try { @@ -134,11 +143,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } + @Test public void testRegisterDriverNameNull() throws Exception { Exception e = null; try { @@ -150,11 +160,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } + @Test public void testRegisterDriverNameEmpty() throws Exception { Exception e = null; try { @@ -166,11 +177,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",IllegalArgumentException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("empty")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(IllegalArgumentException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("empty"), "Wrong exception message"); } + @Test public void testRegisterDriverVersionNull() throws Exception { Exception e = null; try { @@ -182,11 +194,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } + @Test public void testRegisterDriverVersionEmpty() throws Exception { Exception e = null; try { @@ -198,11 +211,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",IllegalArgumentException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("empty")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(IllegalArgumentException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("empty"), "Wrong exception message"); } + @Test public void testDeregisterDriverNull() throws Exception { Exception e = null; try { @@ -210,11 +224,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } + @Test public void testDeregisterDriverNameNull() throws Exception { Exception e = null; try { @@ -226,11 +241,12 @@ public class X4ODriverManagerTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } + @Test public void testDeregisterDriverInstance() throws Exception { Exception e = null; try { @@ -239,14 +255,14 @@ public class X4ODriverManagerTest extends TestCase { @Override public String getLanguageName() { return "junit-driver-test"; } }; X4ODriverManager.registerX4ODriver(driver); - assertEquals(driver.hashCode(), X4ODriverManager.getX4ODriver("junit-driver-test").hashCode()); + Assertions.assertEquals(driver.hashCode(), X4ODriverManager.getX4ODriver("junit-driver-test").hashCode()); X4ODriverManager.deregisterX4ODriver(driver); X4ODriverManager.getX4ODriver("junit-driver-test"); } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",IllegalArgumentException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("junit-driver-test")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(IllegalArgumentException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("junit-driver-test"), "Wrong exception message"); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java b/x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java index 6c14c83..ba043d5 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java @@ -26,116 +26,124 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Locale; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.conv.text.ClassConverter; import org.x4o.xml.conv.text.EnumConverter; import org.x4o.xml.conv.text.URLConverter; import org.x4o.xml.lang.phase.X4OPhaseType; -import junit.framework.TestCase; - /** * DefaultObjectConverterProviderTest test some basic converters. * * @author Willem Cazander * @version 1.0 Jul 24, 2006 */ -public class DefaultObjectConverterProviderTest extends TestCase { +public class DefaultObjectConverterProviderTest { Locale locale = Locale.getDefault(); - + + @Test public void testConverterClone() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); for (ObjectConverter conv:p.getObjectConverters()) { - assertNotNull(conv); + Assertions.assertNotNull(conv); ObjectConverter clone = conv.clone(); - assertNotNull(clone); + Assertions.assertNotNull(clone); } } + @Test public void testConverterBoolean() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); ObjectConverter conv = p.getObjectConverterForClass(Boolean.class); - assertNotNull(conv); + Assertions.assertNotNull(conv); Object result = conv.convertTo("true", locale); - assertNotNull(result); - assertEquals("Result is not Boolean.class", Boolean.class,result.getClass()); - assertEquals("Result is not true", true,result); + Assertions.assertNotNull(result); + Assertions.assertEquals(Boolean.class,result.getClass(), "Result is not Boolean.class"); + Assertions.assertEquals(true,result, "Result is not true"); Object resultBack = conv.convertBack(result, locale); - assertNotNull(resultBack); - assertEquals("resultBack is not String.class", String.class,resultBack.getClass()); - assertEquals("resultBack is not true", "true",resultBack); + Assertions.assertNotNull(resultBack); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("true",resultBack, "resultBack is not true"); } + @Test public void testConverterInteger() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); ObjectConverter conv = p.getObjectConverterForClass(Integer.class); - assertNotNull(conv); + Assertions.assertNotNull(conv); Object result = conv.convertTo("123", locale); - assertNotNull(result); - assertEquals("Result is not Integer.class", Integer.class,result.getClass()); - assertEquals("Result is not 123", 123,result); + Assertions.assertNotNull(result); + Assertions.assertEquals(Integer.class,result.getClass(), "Result is not Integer.class"); + Assertions.assertEquals(123,result, "Result is not 123"); Object resultBack = conv.convertBack(result, locale); - assertNotNull(resultBack); - assertEquals("resultBack is not String.class", String.class,resultBack.getClass()); - assertEquals("resultBack is not 123", "123",resultBack); + Assertions.assertNotNull(resultBack); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("123",resultBack, "resultBack is not 123"); } + @Test public void testConverterFloat() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); ObjectConverter conv = p.getObjectConverterForClass(Float.class); - assertNotNull(conv); + Assertions.assertNotNull(conv); Object result = conv.convertTo("123.23", locale); - assertNotNull(result); - assertEquals("Result is not Float.class", Float.class,result.getClass()); - assertEquals("Result is not 123.23", 123.23F,result); + Assertions.assertNotNull(result); + Assertions.assertEquals(Float.class,result.getClass(), "Result is not Float.class"); + Assertions.assertEquals(123.23F,result, "Result is not 123.23"); Object resultBack = conv.convertBack(result, locale); - assertNotNull(resultBack); - assertEquals("resultBack is not String.class", String.class,resultBack.getClass()); - assertEquals("resultBack is not 123.23", "123.23",resultBack); + Assertions.assertNotNull(resultBack); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("123.23",resultBack, "resultBack is not 123.23"); } + @Test public void testConverterLong() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); ObjectConverter conv = p.getObjectConverterForClass(Long.class); - assertNotNull(conv); + Assertions.assertNotNull(conv); Object result = conv.convertTo("12323", locale); - assertNotNull(result); - assertEquals("Result is not Long.class", Long.class,result.getClass()); - assertEquals("Result is not 12323", 12323L,result); + Assertions.assertNotNull(result); + Assertions.assertEquals(Long.class,result.getClass(), "Result is not Long.class"); + Assertions.assertEquals(12323L,result, "Result is not 12323"); Object resultBack = conv.convertBack(result, locale); - assertNotNull(resultBack); - assertEquals("resultBack is not String.class", String.class,resultBack.getClass()); - assertEquals("resultBack is not 12323", "12323",resultBack); + Assertions.assertNotNull(resultBack); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("12323",resultBack, "resultBack is not 12323"); } + @Test public void testConverterDouble() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); ObjectConverter conv = p.getObjectConverterForClass(Double.class); - assertNotNull(conv); + Assertions.assertNotNull(conv); Object result = conv.convertTo("1232.3", locale); - assertNotNull(result); - assertEquals("Result is not Double.class", Double.class,result.getClass()); - assertEquals("Result is not 1232.3", 1232.3D,result); + Assertions.assertNotNull(result); + Assertions.assertEquals(Double.class,result.getClass(), "Result is not Double.class"); + Assertions.assertEquals(1232.3D,result, "Result is not 1232.3"); Object resultBack = conv.convertBack(result, locale); - assertNotNull(resultBack); - assertEquals("resultBack is not String.class", String.class,resultBack.getClass()); - assertEquals("resultBack is not 1232.3", "1232.3",resultBack); + Assertions.assertNotNull(resultBack); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("1232.3",resultBack, "resultBack is not 1232.3"); } + @Test public void testConverterUrl() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); ObjectConverter conv = p.getObjectConverterForClass(URL.class); - assertNotNull(conv); + Assertions.assertNotNull(conv); Object result = conv.convertTo("http://www.x4o.org", locale); - assertNotNull(result); - assertEquals("Result is not Url.class", URL.class,result.getClass()); - assertEquals("Result is not http://www.x4o.org", new URL("http://www.x4o.org"),result); + Assertions.assertNotNull(result); + Assertions.assertEquals(URL.class,result.getClass(), "Result is not Url.class"); + Assertions.assertEquals(new URL("http://www.x4o.org"),result, "Result is not http://www.x4o.org"); Object resultBack = conv.convertBack(result, locale); - assertNotNull(resultBack); - assertEquals("resultBack is not String.class", String.class,resultBack.getClass()); - assertEquals("resultBack is not http://www.x4o.org", "http://www.x4o.org",resultBack); + Assertions.assertNotNull(resultBack); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("http://www.x4o.org",resultBack, "resultBack is not http://www.x4o.org"); } + @Test public void testConverterUrlException() throws Exception { URLConverter conv = new URLConverter(); Exception e = null; @@ -144,25 +152,26 @@ public class DefaultObjectConverterProviderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertNotNull(e.getCause()); - assertEquals(ObjectConverterException.class, e.getClass()); - assertEquals(MalformedURLException.class, e.getCause().getClass()); - assertTrue("Error message string is missing error",e.getMessage().contains("error")); + Assertions.assertNotNull(e); + Assertions.assertNotNull(e.getCause()); + Assertions.assertEquals(ObjectConverterException.class, e.getClass()); + Assertions.assertEquals(MalformedURLException.class, e.getCause().getClass()); + Assertions.assertTrue(e.getMessage().contains("error"), "Error message string is missing error"); } - + @Test public void testConverterEnum() throws Exception { EnumConverter convOrg = new EnumConverter(); convOrg.setEnumClass(X4OPhaseType.class.getName()); ObjectConverter conv = convOrg.clone(); Object result = conv.convertTo("XML_READ", locale); - assertNotNull(result); - assertEquals("XML_READ", result.toString()); + Assertions.assertNotNull(result); + Assertions.assertEquals("XML_READ", result.toString()); Object resultBack = conv.convertBack(result, locale); - assertEquals("XML_READ", resultBack.toString()); + Assertions.assertEquals("XML_READ", resultBack.toString()); } + @Test public void testConverterEnumError() throws Exception { EnumConverter convOrg = new EnumConverter(); convOrg.setEnumClass(X4OPhaseType.class.getName()); @@ -174,11 +183,12 @@ public class DefaultObjectConverterProviderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(ObjectConverterException.class, e.getClass()); - assertTrue(e.getMessage().contains("EnumError")); + Assertions.assertNotNull(e); + Assertions.assertEquals(ObjectConverterException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("EnumError")); } + @Test public void testConverterEnumNullError() throws Exception { EnumConverter conv = new EnumConverter(); Exception e = null; @@ -187,21 +197,23 @@ public class DefaultObjectConverterProviderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(ObjectConverterException.class, e.getClass()); - assertTrue(e.getMessage().contains("enumClass")); + Assertions.assertNotNull(e); + Assertions.assertEquals(ObjectConverterException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("enumClass")); } + @Test public void testConverterClass() throws Exception { ClassConverter classOrg = new ClassConverter(); ObjectConverter conv = classOrg.clone(); Object result = conv.convertTo("java.lang.Object", locale); - assertNotNull(result); - assertEquals(Object.class, result); + Assertions.assertNotNull(result); + Assertions.assertEquals(Object.class, result); Object resultBack = conv.convertBack(result, locale); - assertEquals("java.lang.Object", resultBack.toString()); + Assertions.assertEquals("java.lang.Object", resultBack.toString()); } + @Test public void testConverterClassError() throws Exception { ClassConverter classOrg = new ClassConverter(); ObjectConverter conv = classOrg.clone(); @@ -212,8 +224,8 @@ public class DefaultObjectConverterProviderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(ObjectConverterException.class, e.getClass()); - assertTrue(e.getMessage().contains("ObjectError")); + Assertions.assertNotNull(e); + Assertions.assertEquals(ObjectConverterException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("ObjectError")); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java b/x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java index 16b1be4..cf65990 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java @@ -24,6 +24,8 @@ package org.x4o.xml.core; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.TestDriver; @@ -31,62 +33,70 @@ import org.x4o.xml.test.models.TestBean; import org.x4o.xml.test.models.TestObjectChild; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * Tests a simple x4o xml language. * * @author Willem Cazander * @version 1.0 Jul 24, 2006 */ -public class AttributeBeanTest extends TestCase { +public class AttributeBeanTest { + @Test public void testBeanBody() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); TestObjectRoot root = reader.readResource("tests/attributes/test-body.xml"); - assertNotNull(root); + Assertions.assertNotNull(root); List childs = root.getTestObjectChilds(); - assertEquals(2,childs.size()); + Assertions.assertEquals(2,childs.size()); TestObjectChild child0 = childs.get(0); TestObjectChild child1 = childs.get(1); - assertEquals("attr-name",child0.getName()); - assertEquals("body-name",child1.getName()); + Assertions.assertEquals("attr-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕",child0.getName()); + Assertions.assertEquals("body-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕",child1.getName()); } + @Test public void testBeanProperties() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml"); - assertNotNull(root); - assertNotNull(root.getTestBeans()); - assertEquals(2, root.getTestBeans().size()); + Assertions.assertNotNull(root); + Assertions.assertNotNull(root.getTestBeans()); + Assertions.assertEquals(2, root.getTestBeans().size()); TestBean b = root.getTestBeans().get(0); + TestBean beanPublic = root.getTestBeans().get(1); - assertEquals(123 ,0+ b.getPrivateIntegerTypeField()); - assertEquals(123 ,0+ b.getPrivateIntegerObjectField()); + Assertions.assertEquals(123 ,0+ b.getPrivateIntegerTypeField()); + Assertions.assertEquals(123 ,0+ b.getPrivateIntegerObjectField()); - assertEquals(123l ,0+ b.getPrivateLongTypeField()); - assertEquals(123l ,0+ b.getPrivateLongObjectField()); + Assertions.assertEquals(123l ,0+ b.getPrivateLongTypeField()); + Assertions.assertEquals(123l ,0+ b.getPrivateLongObjectField()); - assertEquals(123.45d ,0+ b.getPrivateDoubleTypeField()); - assertEquals(123.45d ,0+ b.getPrivateDoubleObjectField()); + Assertions.assertEquals(123.45d ,0+ b.getPrivateDoubleTypeField()); + Assertions.assertEquals(123.45d ,0+ b.getPrivateDoubleObjectField()); - assertEquals(123.45f ,0+ b.getPrivateFloatTypeField()); - assertEquals(123.45f ,0+ b.getPrivateFloatObjectField()); + Assertions.assertEquals(123.45f ,0+ b.getPrivateFloatTypeField()); + Assertions.assertEquals(123.45f ,0+ b.getPrivateFloatObjectField()); - assertEquals(67 ,0+ b.getPrivateByteTypeField()); - assertEquals(67 ,0+ b.getPrivateByteObjectField()); + Assertions.assertEquals(67 ,0+ b.getPrivateByteTypeField()); + Assertions.assertEquals(67 ,0+ b.getPrivateByteObjectField()); - assertEquals(true, b.isPrivateBooleanTypeField()); - assertEquals(new Boolean(true), b.getPrivateBooleanObjectField()); + Assertions.assertEquals(true, b.isPrivateBooleanTypeField()); + Assertions.assertEquals(new Boolean(true), b.getPrivateBooleanObjectField()); - assertEquals('W' ,0+ b.getPrivateCharTypeField()); - assertEquals('C' ,0+ b.getPrivateCharObjectField()); + Assertions.assertEquals('W' ,0+ b.getPrivateCharTypeField()); + Assertions.assertEquals('C' ,0+ b.getPrivateCharObjectField()); + + Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕" ,b.getPrivateStringObjectField()); + //Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,b.getPrivateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ()); // SAX fails + Assertions.assertEquals("x4o-仙上主天" ,b.getPrivateStringObjectFieldUnicode仙上主天()); - assertEquals("x4o" ,b.getPrivateStringObjectField()); //TODO: add again: assertEquals(true ,null!=b.getPrivateDateObjectField()); + + Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕" ,beanPublic.publicStringObjectField); + //Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,beanPublic.publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ); // SAX fails + Assertions.assertEquals("x4o-仙上主天" ,beanPublic.publicStringObjectFieldUnicode仙上主天); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java b/x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java index 10bddd4..46c8290 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java @@ -24,12 +24,13 @@ package org.x4o.xml.core; import java.io.FileNotFoundException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; import org.xml.sax.SAXException; -import junit.framework.TestCase; /** * Tests a simple x4o xml language. @@ -37,56 +38,61 @@ import junit.framework.TestCase; * @author Willem Cazander * @version 1.0 Jul 24, 2006 */ -public class EmptyXmlTest extends TestCase { - +public class EmptyXmlTest { + + @Test public void testFileNotFound() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); try { reader.readFile("tests/empty-xml/non-excisting-file.xml"); } catch (FileNotFoundException e) { - assertEquals(true, e.getMessage().contains("non-excisting-file.xml")); + Assertions.assertEquals(true, e.getMessage().contains("non-excisting-file.xml")); return; } - assertEquals(true,false); + Assertions.assertEquals(true,false); } + @Test public void testResourceNotFound() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); try { reader.readResource("tests/empty-xml/non-excisting-resource.xml"); } catch (NullPointerException e) { - assertEquals(true,e.getMessage().contains("Could not find resource")); + Assertions.assertEquals(true,e.getMessage().contains("Could not find resource")); return; } - assertEquals(true,false); + Assertions.assertEquals(true,false); } - + + @Test public void testResourceParsing() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); try { reader.readResource("tests/empty-xml/empty-test.xml"); } catch (SAXException e) { - assertEquals("No ElementNamespace found for empty namespace.", e.getMessage()); +// Assertions.assertEquals("No ElementNamespace found for empty namespace.", e.getMessage()); return; } - assertEquals(true,false); + Assertions.assertEquals(true,false); } - + + @Test public void testResourceEmptyReal() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); try { reader.readResource("tests/empty-xml/empty-real.xml"); } catch (SAXException e) { - assertEquals(true,e.getMessage().contains("Premature end of file.")); + Assertions.assertEquals(true,e.getMessage().contains("Premature end of file.")); return; } - assertEquals(true,false); + Assertions.assertEquals(true,false); } - + + @Test public void testResourceEmptyXml() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); @@ -97,25 +103,26 @@ public class EmptyXmlTest extends TestCase { if (hasError==false) { hasError = e.getMessage().contains("A well-formed document requires a root element."); // xercesImpl sax message } - assertEquals(true,hasError); + Assertions.assertEquals(true,hasError); return; } - assertEquals(true,false); + Assertions.assertEquals(true,false); } + @Test public void testEmptyX40() throws Exception { X4ODriver driver = TestDriver.getInstance(); - assertNotNull(driver); + Assertions.assertNotNull(driver); X4OReader reader = driver.createReader(); - assertNotNull(reader); + Assertions.assertNotNull(reader); TestObjectRoot root = reader.readResource("tests/empty-xml/empty-x4o.xml"); - assertNotNull(root); + Assertions.assertNotNull(root); - assertEquals(true,root.getTestBeans().isEmpty()); - assertEquals(true,root.getTestObjectChilds().isEmpty()); - assertEquals(true,root.getTestObjectParents().isEmpty()); - assertEquals(true,root.getTestObjects().isEmpty()); + Assertions.assertEquals(true,root.getTestBeans().isEmpty()); + Assertions.assertEquals(true,root.getTestObjectChilds().isEmpty()); + Assertions.assertEquals(true,root.getTestObjectParents().isEmpty()); + Assertions.assertEquals(true,root.getTestObjects().isEmpty()); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java b/x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java index 5d8c79c..4b8e9db 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java @@ -22,6 +22,8 @@ */ package org.x4o.xml.core; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.io.DefaultX4OReader; import org.x4o.xml.io.X4OReaderSession; import org.x4o.xml.lang.X4OLanguageSession; @@ -29,16 +31,15 @@ import org.x4o.xml.lang.phase.X4OPhaseLanguageRead; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * Tests emptry uri namespace laoding. * * @author Willem Cazander * @version 1.0 May 1, 2011 */ -public class NamespaceUriTest extends TestCase { +public class NamespaceUriTest { + @Test public void testSimpleUri() throws Exception { X4OLanguageSession context = null; TestDriver driver = TestDriver.getInstance(); @@ -46,26 +47,28 @@ public class NamespaceUriTest extends TestCase { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try { context = reader.readResourceSession("tests/namespace/uri-simple.xml"); - assertEquals(true,context.getRootElement().getChilderen().size()==1); + Assertions.assertEquals(true,context.getRootElement().getChilderen().size()==1); } finally { reader.releaseSession(context); } } + @Test public void testEmptyUri() throws Exception { X4OLanguageSession context = null; TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); - reader.setProperty(DefaultX4OReader.DOC_EMPTY_NAMESPACE_URI, "http://test.x4o.org/xml/ns/test-lang"); + reader.setProperty(DefaultX4OReader.DOC_EMPTY_NAMESPACE_URI, "http://test.junit.x4o.org/xml/ns/junit-test-lang"); try { context = reader.readResourceSession("tests/namespace/uri-empty.xml"); - assertEquals(true,context.getRootElement().getChilderen().size()==1); + Assertions.assertEquals(true,context.getRootElement().getChilderen().size()==1); } finally { reader.releaseSession(context); } } + @Test public void testSchemaUri() throws Exception { X4OLanguageSession context = null; TestDriver driver = TestDriver.getInstance(); @@ -73,7 +76,7 @@ public class NamespaceUriTest extends TestCase { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try { context = reader.readResourceSession("tests/namespace/uri-schema.xml"); - assertEquals(true,context.getRootElement().getChilderen().size()==1); + Assertions.assertEquals(true,context.getRootElement().getChilderen().size()==1); } finally { reader.releaseSession(context); } diff --git a/x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java b/x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java index ad430ae..b030b70 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java @@ -30,6 +30,8 @@ import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.Charset; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.io.DefaultX4OReader; import org.x4o.xml.io.DefaultX4OWriter; @@ -38,15 +40,13 @@ import org.x4o.xml.io.X4OWriter; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * X4ODebugWriterTest runs parser with debug output. * * @author Willem Cazander * @version 1.0 Aug 26, 2012 */ -public class X4ODebugWriterTest extends TestCase { +public class X4ODebugWriterTest { private File createDebugFile() throws IOException { File debugFile = File.createTempFile("test-debug", ".xml"); @@ -72,6 +72,7 @@ public class X4ODebugWriterTest extends TestCase { } } + @Test public void testDebugOutputReader() throws Exception { File debugFile = createDebugFile(); X4ODriver driver = TestDriver.getInstance(); @@ -79,17 +80,18 @@ public class X4ODebugWriterTest extends TestCase { reader.setProperty(DefaultX4OReader.DEBUG_OUTPUT_STREAM, new FileOutputStream(debugFile)); reader.readResource("tests/attributes/test-bean.xml"); - assertTrue("Debug file does not exists.",debugFile.exists()); + Assertions.assertTrue(debugFile.exists(), "Debug file does not exists."); String debug = readFile(debugFile); - assertNotNull(debug); - assertFalse("no debug content",debug.length()==0); - assertTrue("debug content to small",debug.length()>20); + Assertions.assertNotNull(debug); + Assertions.assertFalse(debug.length()==0, "no debug content"); + Assertions.assertTrue(debug.length()>20, "debug content to small"); //System.out.println("=================== Reader Output ======================"); //System.out.println(debug); debugFile.delete(); } + @Test public void testDebugOutputWriter() throws Exception { File debugFile = createDebugFile(); File writeFile = createDebugFile(); @@ -101,11 +103,11 @@ public class X4ODebugWriterTest extends TestCase { writer.setProperty(DefaultX4OWriter.DEBUG_OUTPUT_STREAM, new FileOutputStream(debugFile)); writer.writeFile(object, writeFile); - assertTrue("Debug file does not exists.",debugFile.exists()); + Assertions.assertTrue(debugFile.exists(), "Debug file does not exists."); String debug = readFile(debugFile); - assertNotNull(debug); - assertFalse("no debug content",debug.length()==0); - assertTrue("debug content to small",debug.length()>20); + Assertions.assertNotNull(debug); + Assertions.assertFalse(debug.length()==0, "no debug content"); + Assertions.assertTrue(debug.length()>20, "debug content to small"); //System.out.println("=================== Writer Output ======================"); //System.out.println(debug); diff --git a/x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java b/x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java index 546c090..3a2669e 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java @@ -24,6 +24,8 @@ package org.x4o.xml.core; import java.io.IOException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.eld.CelDriver; import org.x4o.xml.io.DefaultX4OReader; @@ -36,16 +38,15 @@ import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import junit.framework.TestCase; - /** * X4OLanguageClassLoaderTest test classloader. * * @author Willem Cazander * @version 1.0 Aug 27, 2012 */ -public class X4OEntityResolverTest extends TestCase { - +public class X4OEntityResolverTest { + + @Test public void testElementLangugeNull() throws Exception { Exception e = null; try { @@ -53,18 +54,20 @@ public class X4OEntityResolverTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(NullPointerException.class, e.getClass()); - assertTrue(e.getMessage().contains("null")); + Assertions.assertNotNull(e); + Assertions.assertEquals(NullPointerException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("null")); } + @Test public void testResolve() throws Exception { X4ODriver driver = new CelDriver(); X4OEntityResolver resolver = new X4OEntityResolver(driver.createLanguage().createLanguageSession(),DefaultX4OReader.DEFAULT_PROPERTY_CONFIG); InputSource input = resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd"); - assertNotNull(input); + Assertions.assertNotNull(input); } - + + @Test public void testResolveMissing() throws Exception { X4ODriver driver = new TestDriver(); X4OEntityResolver resolver = new X4OEntityResolver(driver.createLanguage().createLanguageSession(),DefaultX4OReader.DEFAULT_PROPERTY_CONFIG); @@ -74,11 +77,12 @@ public class X4OEntityResolverTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(SAXException.class, e.getClass()); - assertTrue(e.getMessage().contains("missing-resource")); + Assertions.assertNotNull(e); + Assertions.assertEquals(SAXException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("missing-resource")); } + @Test public void testResolveProperty() throws Exception { X4ODriver driver = new TestDriver(); X4OLanguageSession language = driver.createLanguage().createLanguageSession(); @@ -92,10 +96,11 @@ public class X4OEntityResolverTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNull(e); - assertNotNull(input); + Assertions.assertNull(e); + Assertions.assertNotNull(input); } + @Test public void testResolvePropertyNull() throws Exception { X4ODriver driver = new TestDriver(); X4OLanguageSession language = driver.createLanguage().createLanguageSession(); @@ -108,9 +113,9 @@ public class X4OEntityResolverTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(SAXException.class, e.getClass()); - assertTrue(e.getMessage().contains("null")); + Assertions.assertNotNull(e); + Assertions.assertEquals(SAXException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("null")); } public class TestEntityResolver implements EntityResolver { diff --git a/x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java b/x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java index e4e35fa..b73cb1a 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java @@ -22,44 +22,48 @@ */ package org.x4o.xml.core; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.lang.X4OLanguageConfiguration; import org.x4o.xml.test.TestDriver; -import junit.framework.TestCase; - /** * Tests some resulting options from the language config. * * @author Willem Cazander * @version 1.0 Jan 20, 2012 */ -public class X4OParserConfigurationTest extends TestCase { +public class X4OParserConfigurationTest { - TestDriver driver; - X4OLanguageConfiguration config; + static TestDriver driver; + static X4OLanguageConfiguration config; - public void setUp() throws Exception { + @BeforeAll + public static void setUp() throws Exception { driver = TestDriver.getInstance(); config = driver.createLanguage().getLanguageConfiguration(); } + @Test public void testParserConfigurationLanguage() { - assertEquals("test",driver.getLanguageName()); - assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_MODULES_FILE,config.getLanguageResourceModulesFileName()); - assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_PATH_PREFIX,config.getLanguageResourcePathPrefix()); + Assertions.assertEquals("test",driver.getLanguageName()); + Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_MODULES_FILE,config.getLanguageResourceModulesFileName()); + Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_PATH_PREFIX,config.getLanguageResourcePathPrefix()); } + @Test public void testParserConfigurationElement() { - assertNotNull(config.getDefaultElement()); - assertTrue("No Element Inteface", Element.class.isAssignableFrom(config.getDefaultElement())); + Assertions.assertNotNull(config.getDefaultElement()); + Assertions.assertTrue(Element.class.isAssignableFrom(config.getDefaultElement()), "No Element Interface"); - assertNotNull(config.getDefaultElementClass()); - assertTrue("No ElementClass Inteface", ElementClass.class.isAssignableFrom(config.getDefaultElementClass())); + Assertions.assertNotNull(config.getDefaultElementClass()); + Assertions.assertTrue(ElementClass.class.isAssignableFrom(config.getDefaultElementClass()), "No ElementClass Interface"); - assertNotNull(config.getDefaultElementClassAttribute()); - assertTrue("No ElementClass Inteface", ElementClassAttribute.class.isAssignableFrom(config.getDefaultElementClassAttribute())); + Assertions.assertNotNull(config.getDefaultElementClassAttribute()); + Assertions.assertTrue(ElementClassAttribute.class.isAssignableFrom(config.getDefaultElementClassAttribute()), "No ElementClassAttribute Interface"); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java b/x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java index ea6eb23..19c6b1c 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java @@ -25,41 +25,44 @@ package org.x4o.xml.core; import java.util.Collection; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.x4o.xml.lang.X4OLanguageSession; import org.x4o.xml.lang.phase.DefaultX4OPhaseManager; import org.x4o.xml.lang.phase.X4OPhase; import org.x4o.xml.lang.phase.X4OPhaseType; import org.x4o.xml.test.TestDriver; -import junit.framework.TestCase; - /** * Tests some code for testing x4o phases. * * * @author Willem Cazander * @version 1.0 Jan 15, 2009 */ -public class X4OPhaseManagerTest extends TestCase { +public class X4OPhaseManagerTest { - boolean phaseRunned = false; + static boolean phaseRunned = false; - public void setUp() throws Exception { + @BeforeAll + public static void setUp() throws Exception { phaseRunned = false; } - + + @Test public void testPhases() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OLanguageSession context = driver.createLanguage().createLanguageSession(); DefaultX4OPhaseManager manager = (DefaultX4OPhaseManager)context.getLanguage().getPhaseManager(); Collection phasesAll = manager.getAllPhases(); List phases = manager.getOrderedPhases(X4OPhaseType.XML_READ); - assertNotNull(phases); - assertFalse(phases.isEmpty()); - assertNotNull(phasesAll); - assertFalse(phasesAll.isEmpty()); + Assertions.assertNotNull(phases); + Assertions.assertFalse(phases.isEmpty()); + Assertions.assertNotNull(phasesAll); + Assertions.assertFalse(phasesAll.isEmpty()); for (X4OPhase phase:phases) { - assertNotNull(phase); - assertNotNull(phase.getId()); + Assertions.assertNotNull(phase); + Assertions.assertNotNull(phase.getId()); } } @@ -75,7 +78,7 @@ public class X4OPhaseManagerTest extends TestCase { } catch (NullPointerException ee) { e = ee; } - assertEquals(true, e!=null ); + Assertions.assertEquals(true, e!=null ); } */ } diff --git a/x4o-driver/src/test/java/org/x4o/xml/eld/EldParserTest.java b/x4o-driver/src/test/java/org/x4o/xml/eld/EldParserTest.java index c11313a..9ede694 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/eld/EldParserTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/eld/EldParserTest.java @@ -22,7 +22,7 @@ */ package org.x4o.xml.eld; -import org.junit.Ignore; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; import org.x4o.xml.io.X4OReader; @@ -31,16 +31,15 @@ import org.x4o.xml.lang.DefaultX4OLanguageModule; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.X4OLanguageModule; -import junit.framework.TestCase; - /** * Tests some code for eld * * @author Willem Cazander * @version 1.0 Jan 15, 2009 */ -public class EldParserTest extends TestCase { - +public class EldParserTest { + + @Test public void testNone() { /* X4ODriver driver = X4ODriverManager.getX4ODriver(TestDriver.LANGUAGE); @@ -67,6 +66,7 @@ public class EldParserTest extends TestCase { */ } + @Test public void testRunEldParserCore() throws Exception { //X4ODriver driver = (X4ODriver)X4ODriverManager.getX4ODriver(EldDriver.LANGUAGE_NAME); @@ -103,8 +103,11 @@ public class EldParserTest extends TestCase { } } - @Ignore("fix recusrieve") + @Test //("fix recusrieve") public void testRunEldParser() throws Exception { + if (1 == 1) { + return; + } X4ODriver driver = (X4ODriver)X4ODriverManager.getX4ODriver(EldDriver.LANGUAGE_NAME); X4OReader reader = driver.createReader(); X4OWriter writer = driver.createWriter(); diff --git a/x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java b/x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java index 377a54a..0617ada 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java @@ -22,22 +22,22 @@ */ package org.x4o.xml.eld; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.io.DefaultX4OReader; import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * EldValidatingTest runs parser in validation mode. * * @author Willem Cazander * @version 1.0 Aug 22, 2012 */ -public class EldValidatingTest extends TestCase { - +public class EldValidatingTest { + + @Test public void testValidation() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); diff --git a/x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java b/x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java index 858f7e5..593a629 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java @@ -26,27 +26,26 @@ import java.io.File; import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; import org.x4o.xml.eld.CelDriver; import org.x4o.xml.eld.EldDriver; import org.x4o.xml.eld.EldModuleLoaderCore; -import org.x4o.xml.eld.xsd.EldXsdLanguageTask; import org.x4o.xml.io.X4OWriterTest; import org.x4o.xml.io.sax.ext.ContentWriterXml; import org.x4o.xml.io.sax.ext.PropertyConfig; import org.x4o.xml.lang.task.X4OLanguageTask; import org.x4o.xml.test.swixml.SwiXmlDriver; -import junit.framework.TestCase; - /** * Tests some code for eld schema generating * * @author Willem Cazander * @version 1.0 Auh 16, 2012 */ -public class EldXsdLanguageTaskTest extends TestCase { +public class EldXsdLanguageTaskTest { private File createOutputPath(String dir) throws Exception { File result = new File("target/tests"+File.separator+dir); @@ -56,6 +55,7 @@ public class EldXsdLanguageTaskTest extends TestCase { return result; } + @Test private File testSchema(String language,String outputPostfix,Map props) throws Exception { X4ODriver driver = X4ODriverManager.getX4ODriver(language); X4OLanguageTask task = driver.getLanguageTask(EldXsdLanguageTask.TASK_ID); @@ -63,7 +63,7 @@ public class EldXsdLanguageTaskTest extends TestCase { File outputPath = createOutputPath(outputPostfix); config.setProperty(EldXsdWriter.OUTPUT_PATH,outputPath); config.setProperty(EldXsdWriter.OUTPUT_DOCUMENTATION,false); - config.setProperty(ContentWriterXml.PROLOG_LICENCE_FILE,new File("../license.txt")); + config.setProperty(ContentWriterXml.PROLOG_LICENCE_FILE,new File("../licence.txt")); config.setProperty(ContentWriterXml.PROLOG_USER_COMMENT,"Generated by junit-test-run in class: "+this.getClass().getSimpleName()); if (props!=null) { for (String key:props.keySet()) { @@ -72,51 +72,56 @@ public class EldXsdLanguageTaskTest extends TestCase { } } task.createTaskExecutor(config).execute(driver.createLanguage()); - assertTrue(outputPath.exists()); - assertTrue(outputPath.list()!=null); + Assertions.assertTrue(outputPath.exists()); + Assertions.assertTrue(outputPath.list()!=null); return outputPath; } + @Test public void testEldSchema() throws Exception { File outputPath = testSchema(EldDriver.LANGUAGE_NAME,"junit-xsd-eld",null); - assertTrue(outputPath.list().length>2); + Assertions.assertTrue(outputPath.list().length>2); } + @Test public void testEldCoreSchema() throws Exception { File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-xsd-cel",null); - assertTrue(outputPath.list().length>1); + Assertions.assertTrue(outputPath.list().length>1); } + @Test public void testSwiXmlSchema() throws Exception { File outputPath = testSchema(SwiXmlDriver.LANGUAGE_NAME,"junit-xsd-swixml",null); - assertTrue(outputPath.list().length>1); + Assertions.assertTrue(outputPath.list().length>1); } + @Test public void testFilterNamespace() throws Exception { Map props = new HashMap(); props.put(EldXsdWriter.FILTER_NAMESPACE, EldModuleLoaderCore.CEL_ROOT_URI); File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-one-ns",props); - assertTrue(outputPath.list().length==1); + Assertions.assertTrue(outputPath.list().length==1); } + @Test public void testFilterElement() throws Exception { Map props = new HashMap(); props.put(EldXsdWriter.FILTER_NAMESPACE, EldModuleLoaderCore.CEL_CORE_URI); props.put(EldXsdWriter.FILTER_ELEMENT, "elementInterface"); - props.put(EldXsdWriter.PROLOG_GENERATED_BY_ENABLE, false); - props.put(EldXsdWriter.PROLOG_PROVIDER_INFO_ENABLE, false); + props.put(EldXsdWriter.PROLOG_GENERATED_ENABLE, false); + props.put(EldXsdWriter.PROLOG_XMLNS_INFO_ENABLE, false); props.put(ContentWriterXml.PROLOG_LICENCE_ENABLE,false); File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-one-element",props); - assertTrue(outputPath.list().length==1); + Assertions.assertTrue(outputPath.list().length==1); String text = X4OWriterTest.readFile(new File("target/tests/junit-one-element/cel-core-1.0.xsd")); - assertNotNull(text); - assertTrue(text.contains("elementInterface")); - assertFalse(text.contains("module")); - assertFalse(text.contains("attributeAlias")); - assertFalse(text.contains("bindingHandler")); - assertFalse(text.contains("classConverter")); + Assertions.assertNotNull(text); + Assertions.assertTrue(text.contains("elementInterface")); + Assertions.assertFalse(text.contains("module")); + Assertions.assertFalse(text.contains("attributeAlias")); + Assertions.assertFalse(text.contains("bindingHandler")); + Assertions.assertFalse(text.contains("classConverter")); - assertTrue(text.length()<10000); + Assertions.assertTrue(text.length()<10000); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java b/x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java index ba94081..6e8899d 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java @@ -25,51 +25,54 @@ package org.x4o.xml.element; import java.io.InputStream; import java.util.logging.LogManager; - -import org.x4o.xml.element.DefaultElementObjectPropertyValue; -import org.x4o.xml.element.ElementObjectPropertyValueException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.x4o.xml.test.models.TestBean; import org.x4o.xml.test.models.TestObjectChild; -import junit.framework.TestCase; - /** * Tests a simple x4o xml language. * * @author Willem Cazander * @version 1.0 Jul 24, 2006 */ -public class DefaultElementObjectPropertyValueTest extends TestCase { +public class DefaultElementObjectPropertyValueTest { DefaultElementObjectPropertyValue helper = new DefaultElementObjectPropertyValue(); - public void setUp() throws Exception { + @BeforeAll + public static void setUp() throws Exception { // enable all logs - InputStream loggingProperties = this.getClass().getResourceAsStream("/META-INF/logging.properties"); + InputStream loggingProperties = DefaultElementObjectPropertyValueTest.class.getResourceAsStream("/META-INF/logging.properties"); LogManager.getLogManager().readConfiguration( loggingProperties ); loggingProperties.close(); } + @Test public void testNullValue() throws Exception { TestObjectChild obj = new TestObjectChild(); obj.setName("test"); - assertEquals("test", obj.getName()); // test org value - assertEquals("test", helper.getProperty(obj, "name")); // test null get value + Assertions.assertEquals("test", obj.getName()); // test org value + Assertions.assertEquals("test", helper.getProperty(obj, "name")); // test null get value helper.setProperty(obj, "name", null); - assertEquals(null, obj.getName()); // test null value - assertEquals(null, helper.getProperty(obj, "name")); // test null get value + Assertions.assertEquals(null, obj.getName()); // test null value + Assertions.assertEquals(null, helper.getProperty(obj, "name")); // test null get value } + @Test public void testIntegerValue() throws Exception { TestObjectChild obj = new TestObjectChild(); helper.setProperty(obj, "price", 666); - assertEquals(666,helper.getProperty(obj, "price")); + Assertions.assertEquals(666,helper.getProperty(obj, "price")); } + @Test public void testException() throws Exception { TestObjectChild obj = new TestObjectChild(); helper.setProperty(obj, "price", 666); @@ -80,6 +83,17 @@ public class DefaultElementObjectPropertyValueTest extends TestCase { } catch (ElementObjectPropertyValueException not) { error = true; } - assertEquals(true,error); + Assertions.assertEquals(true,error); + } + + @Test + public void testChinees() throws Exception { + TestBean obj = new TestBean(); + + helper.setProperty(obj, "privateStringObjectField", "foo"); + Assertions.assertEquals("foo",helper.getProperty(obj, "privateStringObjectField")); + + helper.setProperty(obj, "privateStringObjectFieldUnicode仙上主天", "bar"); + Assertions.assertEquals("bar",helper.getProperty(obj, "privateStringObjectFieldUnicode仙上主天")); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/io/X4OConnectionTest.java b/x4o-driver/src/test/java/org/x4o/xml/io/X4OConnectionTest.java index f1e0e62..914f6c1 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/io/X4OConnectionTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/io/X4OConnectionTest.java @@ -22,21 +22,21 @@ */ package org.x4o.xml.io; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; -import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * X4OConnectionTest. * * @author Willem Cazander * @version 1.0 Apr 28, 2013 */ -public class X4OConnectionTest extends TestCase { +public class X4OConnectionTest { + @Test public void testReaderPropertyFailRead() throws Exception { Exception e = null; try { @@ -46,12 +46,13 @@ public class X4OConnectionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",IllegalArgumentException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("key")); - assertTrue("Wrong exception message",e.getMessage().contains("No")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(IllegalArgumentException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("key"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("No"), "Wrong exception message"); } + @Test public void testReaderPropertyFail() throws Exception { Exception e = null; try { @@ -61,12 +62,13 @@ public class X4OConnectionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",IllegalArgumentException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("key")); - assertTrue("Wrong exception message",e.getMessage().contains("No")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(IllegalArgumentException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("key"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("No"), "Wrong exception message"); } + @Test public void testWriterPropertyFail() throws Exception { Exception e = null; try { @@ -76,9 +78,9 @@ public class X4OConnectionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",IllegalArgumentException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("key")); - assertTrue("Wrong exception message",e.getMessage().contains("No")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(IllegalArgumentException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("key"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("No"), "Wrong exception message"); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java b/x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java index b1a0e5c..bcffe16 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java @@ -27,22 +27,21 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; -import org.x4o.xml.io.X4OReader; import org.x4o.xml.lang.X4OLanguageSession; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestBean; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * X4OReaderSessionTest. * * @author Willem Cazander * @version 1.0 Apr 15, 2013 */ -public class X4OReaderSessionTest extends TestCase { +public class X4OReaderSessionTest { private File copyResourceToTempFile() throws IOException { File tempFile = File.createTempFile("test-resource", ".xml"); @@ -58,18 +57,20 @@ public class X4OReaderSessionTest extends TestCase { return tempFile; } + @Test public void testReadFileName() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); File xmlFile = copyResourceToTempFile(); X4OLanguageSession context = reader.readFileSession(xmlFile.getAbsolutePath()); TestObjectRoot root = (TestObjectRoot)context.getRootElement().getElementObject(); - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); + Assertions.assertNotNull(bean); } + @Test public void testReadFileNameNull() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); @@ -80,24 +81,26 @@ public class X4OReaderSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("fileName")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("fileName"), "Wrong exception message"); } + @Test public void testReadFile() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); File xmlFile = copyResourceToTempFile(); X4OLanguageSession context = reader.readFileSession(xmlFile); TestObjectRoot root = (TestObjectRoot)context.getRootElement().getElementObject(); - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); + Assertions.assertNotNull(bean); } + @Test public void testReadFileNull() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); @@ -108,12 +111,13 @@ public class X4OReaderSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("file")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("file"), "Wrong exception message"); } + @Test public void testReadFileNotExists() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); @@ -125,12 +129,13 @@ public class X4OReaderSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",FileNotFoundException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("exists")); - assertTrue("Wrong exception message",e.getMessage().contains("File")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(FileNotFoundException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("exists"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("File"), "Wrong exception message"); } + @Test public void testReadFileNotReadable() throws Exception { if (File.separatorChar != '/') { return; // only test on real os. @@ -143,21 +148,22 @@ public class X4OReaderSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",IOException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("exists")); - assertTrue("Wrong exception message",e.getMessage().contains("read")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(IOException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("exists"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("read"), "Wrong exception message"); } - + @Test public void testReadResource() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); X4OLanguageSession context = reader.readResourceSession("tests/attributes/test-bean.xml"); TestObjectRoot root = (TestObjectRoot)context.getRootElement().getElementObject(); - assertNotNull(root); + Assertions.assertNotNull(root); } + @Test public void testReadResourceNull() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); @@ -167,29 +173,31 @@ public class X4OReaderSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("resourceName")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("resourceName"), "Wrong exception message"); } + @Test public void testReadString() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); X4OLanguageSession context = reader.readStringSession( ""+ - ""+ + ""+ ""+ "" ); TestObjectRoot root = (TestObjectRoot)context.getRootElement().getElementObject(); - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); - assertEquals("987654321", ""+bean.getPrivateIntegerTypeField()); + Assertions.assertNotNull(bean); + Assertions.assertEquals("987654321", ""+bean.getPrivateIntegerTypeField()); } + @Test public void testReadStringNull() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); @@ -199,24 +207,26 @@ public class X4OReaderSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("string")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("string"), "Wrong exception message"); } + @Test public void testReadUrl() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); URL xmlUrl = Thread.currentThread().getContextClassLoader().getResource("tests/attributes/test-bean.xml"); X4OLanguageSession context = reader.readUrlSession(xmlUrl); TestObjectRoot root = (TestObjectRoot)context.getRootElement().getElementObject(); - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); + Assertions.assertNotNull(bean); } + @Test public void testReadUrlNull() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); @@ -226,9 +236,9 @@ public class X4OReaderSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("url")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("url"), "Wrong exception message"); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java b/x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java index fb51764..881eead 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java @@ -28,21 +28,20 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; -import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestBean; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * X4OReaderTest. * * @author Willem Cazander * @version 1.0 Apr 15, 2013 */ -public class X4OReaderTest extends TestCase { +public class X4OReaderTest { private File copyResourceToTempFile() throws IOException { File tempFile = File.createTempFile("test-resource", ".xml"); @@ -58,6 +57,7 @@ public class X4OReaderTest extends TestCase { return tempFile; } + @Test public void testReadInputStream() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); @@ -70,19 +70,21 @@ public class X4OReaderTest extends TestCase { } finally { inputStream.close(); } - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); + Assertions.assertNotNull(bean); } + @Test public void testReadResource() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml"); - assertNotNull(root); + Assertions.assertNotNull(root); } + @Test public void testReadResourceNull() throws Exception { Exception e = null; try { @@ -92,28 +94,30 @@ public class X4OReaderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("resourceName")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("resourceName"), "Wrong exception message"); } + @Test public void testReadString() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); TestObjectRoot root = reader.readString( ""+ - ""+ + ""+ ""+ "" ); - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); - assertEquals("987654321", ""+bean.getPrivateIntegerTypeField()); + Assertions.assertNotNull(bean); + Assertions.assertEquals("987654321", ""+bean.getPrivateIntegerTypeField()); } + @Test public void testReadStringNull() throws Exception { Exception e = null; try { @@ -123,23 +127,25 @@ public class X4OReaderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("string")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("string"), "Wrong exception message"); } + @Test public void testReadUrl() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); URL xmlUrl = Thread.currentThread().getContextClassLoader().getResource("tests/attributes/test-bean.xml"); TestObjectRoot root = reader.readUrl(xmlUrl); - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); + Assertions.assertNotNull(bean); } + @Test public void testReadUrlNull() throws Exception { Exception e = null; try { @@ -149,23 +155,25 @@ public class X4OReaderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("url")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("url"), "Wrong exception message"); } + @Test public void testReadFileName() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); File xmlFile = copyResourceToTempFile(); TestObjectRoot root = reader.readFile(xmlFile.getAbsolutePath()); - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); + Assertions.assertNotNull(bean); } + @Test public void testReadFileNameNull() throws Exception { Exception e = null; try { @@ -176,23 +184,25 @@ public class X4OReaderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("fileName")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("fileName"), "Wrong exception message"); } + @Test public void testReadFile() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); File xmlFile = copyResourceToTempFile(); TestObjectRoot root = reader.readFile(xmlFile); - assertNotNull(root); - assertTrue(root.getTestBeans().size()>0); + Assertions.assertNotNull(root); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); - assertNotNull(bean); + Assertions.assertNotNull(bean); } + @Test public void testReadFileNull() throws Exception { Exception e = null; try { @@ -203,9 +213,9 @@ public class X4OReaderTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("file")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("file"), "Wrong exception message"); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterAttributeTest.java b/x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterAttributeTest.java index 464324d..37e6f0a 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterAttributeTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterAttributeTest.java @@ -26,28 +26,27 @@ import java.io.File; import java.io.IOException; import java.util.Scanner; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; -import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * X4OWriterAttributeTest tests xml write attribute write order. * * @author Willem Cazander * @version 1.0 May 19, 2013 */ -public class X4OWriterAttributeTest extends TestCase { +public class X4OWriterAttributeTest { - private File createOutputFile() throws IOException { File outputFile = File.createTempFile("test-writer-attr", ".xml"); outputFile.deleteOnExit(); return outputFile; } + @Test public void testWriteAttrNatural() throws Exception { File outputFile = createOutputFile(); X4ODriver driver = TestDriver.getInstance(); @@ -59,13 +58,14 @@ public class X4OWriterAttributeTest extends TestCase { String text = new Scanner( outputFile ).useDelimiter("\\A").next(); outputFile.delete(); - assertTrue(text.startsWith("")); - assertTrue(text.contains("TestAttributeOrderChildNatural"+ + Assertions.assertTrue(text.startsWith("")); + Assertions.assertTrue(text.contains("TestAttributeOrderChildNatural"+ " aaaName=\"NAME_1\" aabName=\"NAME_2\" aacName=\"NAME_3\""+ " abaName=\"NAME_4\" abbName=\"NAME_5\" abcName=\"NAME_6\""+ " caaName=\"NAME_7\" cabName=\"NAME_8\" cacName=\"NAME_9\"")); } + @Test public void testWriteAttrOrdered() throws Exception { File outputFile = createOutputFile(); X4ODriver driver = TestDriver.getInstance(); @@ -77,8 +77,8 @@ public class X4OWriterAttributeTest extends TestCase { String text = new Scanner( outputFile ).useDelimiter("\\A").next(); outputFile.delete(); - assertTrue(text.startsWith("")); - assertTrue(text.contains("custom-ordered-child"+ + Assertions.assertTrue(text.startsWith("")); + Assertions.assertTrue(text.contains("custom-ordered-child"+ " cacName=\"NAME_9\" cabName=\"NAME_8\" caaName=\"NAME_7\""+ " abcName=\"NAME_6\" abbName=\"NAME_5\" abaName=\"NAME_4\""+ " aaaName=\"NAME_1\" aabName=\"NAME_2\" aacName=\"NAME_3\"")); diff --git a/x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java b/x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java index bda915a..db2f989 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java @@ -27,23 +27,22 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.element.Element; -import org.x4o.xml.io.X4OReader; import org.x4o.xml.lang.X4OLanguageSession; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; import org.xml.sax.SAXException; -import junit.framework.TestCase; - /** * X4OWriterSessionTest. * * @author Willem Cazander * @version 1.0 Apr 28, 2013 */ -public class X4OWriterSessionTest extends TestCase { +public class X4OWriterSessionTest { private File createOutputFile() throws IOException { File outputFile = File.createTempFile("test-writer-context", ".xml"); @@ -69,6 +68,7 @@ public class X4OWriterSessionTest extends TestCase { return context; } + @Test public void testWriteFile() throws Exception { File outputFile = createOutputFile(); X4ODriver driver = TestDriver.getInstance(); @@ -78,12 +78,13 @@ public class X4OWriterSessionTest extends TestCase { String text = X4OWriterTest.readFile( outputFile ); outputFile.delete(); - assertTrue(text.startsWith("")); - assertTrue(text.contains("http://test.x4o.org/xml/ns/test-root")); -// assertTrue(text.contains("")); - assertTrue(text.contains("")); + Assertions.assertTrue(text.contains("http://test.junit.x4o.org/xml/ns/junit-test-root")); + Assertions.assertTrue(text.contains("")); + Assertions.assertTrue(text.contains(" writer = driver.createWriterSession(); @@ -94,12 +95,13 @@ public class X4OWriterSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("file")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("file"), "Wrong exception message"); } + @Test public void testWriteFileName() throws Exception { File outputFile = createOutputFile(); X4ODriver driver = TestDriver.getInstance(); @@ -109,12 +111,13 @@ public class X4OWriterSessionTest extends TestCase { String text = X4OWriterTest.readFile( outputFile ); outputFile.delete(); - assertTrue(text.startsWith("")); - assertTrue(text.contains("http://test.x4o.org/xml/ns/test-root")); -// assertTrue(text.contains("")); // TODO: fix writer - assertTrue(text.contains("")); + Assertions.assertTrue(text.contains("http://test.junit.x4o.org/xml/ns/junit-test-root")); + Assertions.assertTrue(text.contains("")); + Assertions.assertTrue(text.contains(" writer = driver.createWriterSession(); @@ -125,12 +128,13 @@ public class X4OWriterSessionTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull("No exception",e); - assertEquals("Wrong exception class",NullPointerException.class, e.getClass()); - assertTrue("Wrong exception message",e.getMessage().contains("null")); - assertTrue("Wrong exception message",e.getMessage().contains("fileName")); + Assertions.assertNotNull(e, "No exception"); + Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); + Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); + Assertions.assertTrue(e.getMessage().contains("fileName"), "Wrong exception message"); } + @Test public void testWriteStream() throws Exception { File outputFile = createOutputFile(); X4ODriver driver = TestDriver.getInstance(); @@ -145,9 +149,9 @@ public class X4OWriterSessionTest extends TestCase { String text = X4OWriterTest.readFile( outputFile ); outputFile.delete(); - assertTrue(text.startsWith("")); - assertTrue(text.contains("http://test.x4o.org/xml/ns/test-root")); -// assertTrue(text.contains("")); - assertTrue(text.contains("")); + Assertions.assertTrue(text.contains("http://test.junit.x4o.org/xml/ns/junit-test-root")); + Assertions.assertTrue(text.contains("")); + Assertions.assertTrue(text.contains(" driver = TestDriver.getInstance(); @@ -109,12 +110,13 @@ public class X4OWriterTest extends TestCase { String text = readFile( outputFile ); outputFile.delete(); - assertTrue(text.startsWith("")); - assertTrue(text.contains("http://test.x4o.org/xml/ns/test-root")); -// assertTrue(text.contains("")); - assertTrue(text.contains("")); + Assertions.assertTrue(text.contains("http://test.junit.x4o.org/xml/ns/junit-test-root")); + Assertions.assertTrue(text.contains("")); + Assertions.assertTrue(text.contains(" driver = TestDriver.getInstance(); @@ -126,12 +128,13 @@ public class X4OWriterTest extends TestCase { String text = readFile( outputFile ); outputFile.delete(); - assertTrue(text.startsWith("")); - assertTrue(text.contains("http://test.x4o.org/xml/ns/test-root")); -// assertTrue(text.contains("")); - assertTrue(text.contains("")); + Assertions.assertTrue(text.contains("http://test.junit.x4o.org/xml/ns/junit-test-root")); + Assertions.assertTrue(text.contains("")); + Assertions.assertTrue(text.contains(" driver = TestDriver.getInstance(); @@ -150,9 +153,9 @@ public class X4OWriterTest extends TestCase { String text = readFile( outputFile ); outputFile.delete(); - assertTrue(text.startsWith("")); - assertTrue(text.contains("http://test.x4o.org/xml/ns/test-root")); -// assertTrue(text.contains("")); - assertTrue(text.contains("")); + Assertions.assertTrue(text.contains("http://test.junit.x4o.org/xml/ns/junit-test-root")); + Assertions.assertTrue(text.contains("")); + Assertions.assertTrue(text.contains("0); - assertTrue(output,output.equals("\n")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n"), output); } + @Test public void testAttributeEscape() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -66,9 +76,97 @@ public class ContentWriterXmlAttributeTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("\n")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n"), output); + } + + @Test + public void testAttributeWhiteSpace() throws Exception { + StringWriter outputWriter = new StringWriter(); + ContentWriterXml writer = new ContentWriterXml(outputWriter); + writer.startDocument(); + + Assertions.assertThrows(SAXException.class, () -> { + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute ("", "", "", "", "junit"); + writer.startElementEnd("", "test", "", atts); + }); + Assertions.assertThrows(SAXException.class, () -> { + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute ("", " ", "", "", "junit"); + writer.startElementEnd("", "test", "", atts); + }); + Assertions.assertThrows(SAXException.class, () -> { + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute ("", "foo bar", "", "", "junit"); + writer.startElementEnd("", "test", "", atts); + }); + Assertions.assertThrows(SAXException.class, () -> { + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute ("", "foobar", "", "", "junit"); + writer.startElementEnd("", "test junit", "", atts); + }); + + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute ("", "abc", "", "", " junit "); + writer.startElementEnd("", "root", "", atts); + writer.endDocument(); + + String output = outputWriter.toString(); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n"), output); + } + + @Test + public void testAttributeChinees() throws Exception { + StringWriter outputWriter = new StringWriter(); + ContentWriterXml writer = new ContentWriterXml(outputWriter); + + writer.startDocument(); + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute ("", "仙上主天", "", "", "仙上主天"); + writer.startElementEnd("", "chinees", "", atts); + writer.endDocument(); + + String output = outputWriter.toString(); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n"), output); + + SAXParserFactory saxFactory = SAXParserFactory.newInstance(); + SAXParser saxParser = saxFactory.newSAXParser(); + XMLReader saxReader = saxParser.getXMLReader(); + saxReader.parse(new InputSource(new ByteArrayInputStream(output.getBytes(StandardCharsets.UTF_8)))); + Assertions.assertNotNull(saxReader); + } + + @Test + public void testAttributeBrahmi() throws Exception { + StringWriter outputWriter = new StringWriter(); + ContentWriterXml writer = new ContentWriterXml(outputWriter); + + // Legal by spec, but not in JVM SAX Reader + writer.startDocument(); + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute ("", "𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", "", "", "𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕"); + atts.addAttribute ("", "ᒡᒢᑊᒻᒻᓫᔿ", "", "", "ᒡᒢᑊᒻᒻᓫᔿ"); + writer.startElementEnd("", "test", "", atts); + writer.endDocument(); + + String output = outputWriter.toString(); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n"), output); + + // TODO: fix SAX impl + Assertions.assertThrows(SAXException.class, () -> { + SAXParserFactory saxFactory = SAXParserFactory.newInstance(); + SAXParser saxParser = saxFactory.newSAXParser(); + XMLReader saxReader = saxParser.getXMLReader(); + saxReader.parse(new InputSource(new ByteArrayInputStream(output.getBytes(StandardCharsets.UTF_8)))); + }); } private String createLongAttribute(Map para) throws SAXException { @@ -96,38 +194,42 @@ public class ContentWriterXmlAttributeTest extends TestCase { return output; } + @Test public void testAttributeLongNormal() throws Exception { Map para = new HashMap(); String output = createLongAttribute(para); int newlines = output.split("\n").length; - assertNotNull(output); - assertTrue("outputs: "+newlines,newlines==4); + Assertions.assertNotNull(output); + Assertions.assertTrue(newlines==4, "outputs: "+newlines); } + @Test public void testAttributeLongPerLine() throws Exception { Map para = new HashMap(); para.put(ContentWriterXml.OUTPUT_LINE_PER_ATTRIBUTE, true); String output = createLongAttribute(para); int newlines = output.split("\n").length; - assertNotNull(output); - assertTrue("outputs: "+newlines,newlines==20); + Assertions.assertNotNull(output); + Assertions.assertTrue(newlines==20, "outputs: "+newlines); } + @Test public void testAttributeLongSplit80() throws Exception { Map para = new HashMap(); para.put(ContentWriterXml.OUTPUT_LINE_BREAK_WIDTH, 80); String output = createLongAttribute(para); int newlines = output.split("\n").length; - assertNotNull(output); - assertTrue("outputs: "+newlines,newlines==16); + Assertions.assertNotNull(output); + Assertions.assertTrue(newlines==16, "outputs: "+newlines); } + @Test public void testAttributeLongSplit180() throws Exception { Map para = new HashMap(); para.put(ContentWriterXml.OUTPUT_LINE_BREAK_WIDTH, 180); String output = createLongAttribute(para); int newlines = output.split("\n").length; - assertNotNull(output); - assertTrue("outputs: "+newlines,newlines==11); + Assertions.assertNotNull(output); + Assertions.assertTrue(newlines==11, "outputs: "+newlines); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlCDataTest.java b/x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlCDataTest.java index 8ea236d..08297c8 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlCDataTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlCDataTest.java @@ -24,18 +24,19 @@ package org.x4o.xml.io.sax; import java.io.StringWriter; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.io.sax.ext.ContentWriterXml; -import junit.framework.TestCase; - /** * ContentWriterXmlCDataTest tests cdata xml escaping. * * @author Willem Cazander * @version 1.0 Sep 17, 2013 */ -public class ContentWriterXmlCDataTest extends TestCase { +public class ContentWriterXmlCDataTest { + @Test public void testCDATANone() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -45,11 +46,12 @@ public class ContentWriterXmlCDataTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("foobar")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("foobar"), output); } + @Test public void testCDATANoneTagEscape() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -59,11 +61,12 @@ public class ContentWriterXmlCDataTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("foobar<test/>")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("foobar<test/>"), output); } + @Test public void testCDATANormal() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -75,11 +78,12 @@ public class ContentWriterXmlCDataTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals(""), output); } + @Test public void testCDATAEscapeTag() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -91,11 +95,12 @@ public class ContentWriterXmlCDataTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("]]>")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("]]>"), output); } + @Test public void testCDATAEscapeStart() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -107,11 +112,12 @@ public class ContentWriterXmlCDataTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals(""), output); } + @Test public void testCDATAEscapeEnd() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -123,11 +129,29 @@ public class ContentWriterXmlCDataTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals(""), output); } + @Test + public void testCDATAEscapeEndEskimo() throws Exception { + StringWriter outputWriter = new StringWriter(); + ContentWriterXml writer = new ContentWriterXml(outputWriter); + + writer.startDocument(); + writer.startCDATA(); + writer.characters("ᒡᒢᑊᒻ]]>ᒻᓫᔿ"); + writer.endCDATA(); + writer.endDocument(); + + String output = outputWriter.toString(); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals(""), output); + } + + @Test public void testCDATAEscapeInvalid() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -139,11 +163,12 @@ public class ContentWriterXmlCDataTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("]]>")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("]]>"), output); } + @Test public void testCDATAEscapeValid() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -155,8 +180,8 @@ public class ContentWriterXmlCDataTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output.equals("\' are ]]>")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\' are ]]>")); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlTest.java b/x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlTest.java index b832d08..94a7b76 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlTest.java @@ -24,21 +24,21 @@ package org.x4o.xml.io.sax; import java.io.StringWriter; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.io.sax.ext.ContentWriterXml; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; - -import junit.framework.TestCase; - /** * ContentWriterXml test xml escaping. * * @author Willem Cazander * @version 1.0 Aug 26, 2012 */ -public class ContentWriterXmlTest extends TestCase { +public class ContentWriterXmlTest { + @Test public void testCharactersNormal() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -48,11 +48,12 @@ public class ContentWriterXmlTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("test is foobar!")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("test is foobar!"), output); } + @Test public void testCharactersEscape() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -62,11 +63,12 @@ public class ContentWriterXmlTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("<test/> & 'foobar' is "e;quoted"e;!")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("<test/> & 'foobar' is "e;quoted"e;!"), output); } + @Test public void testCommentNormal() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -76,11 +78,12 @@ public class ContentWriterXmlTest extends TestCase { writer.endDocument(); String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("\n")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n"), output); } + @Test public void testCommentEscape() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -96,11 +99,12 @@ public class ContentWriterXmlTest extends TestCase { // 4) "" - printed String output = outputWriter.toString(); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("\n")); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n"), output); } + @Test public void testXmlInvalid() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -116,12 +120,13 @@ public class ContentWriterXmlTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(SAXException.class, e.getClass()); - assertTrue(e.getMessage().contains("tag")); - assertTrue(e.getMessage().contains("foobar")); + Assertions.assertNotNull(e); + Assertions.assertEquals(SAXException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("tag")); + Assertions.assertTrue(e.getMessage().contains("foobar")); } + @Test public void testXmlInvalidEnd() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -136,13 +141,14 @@ public class ContentWriterXmlTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(SAXException.class, e.getClass()); - assertTrue(e.getMessage().contains("Invalid")); - assertTrue(e.getMessage().contains("2")); - assertTrue(e.getMessage().contains("open")); + Assertions.assertNotNull(e); + Assertions.assertEquals(SAXException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("Invalid")); + Assertions.assertTrue(e.getMessage().contains("2")); + Assertions.assertTrue(e.getMessage().contains("open")); } + @Test public void testProcessingInstruction() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -159,12 +165,13 @@ public class ContentWriterXmlTest extends TestCase { e = catchE; } String output = outputWriter.toString(); - assertNull(e); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("\n\n")); + Assertions.assertNull(e); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n\n"), output); } + @Test public void testProcessingInstructionInline() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -182,12 +189,13 @@ public class ContentWriterXmlTest extends TestCase { e = catchE; } String output = outputWriter.toString(); - assertNull(e); - assertNotNull(output); - assertTrue(output.length()>0); - assertTrue(output,output.equals("\n\n\n\t\n\n")); + Assertions.assertNull(e); + Assertions.assertNotNull(output); + Assertions.assertTrue(output.length()>0); + Assertions.assertTrue(output.equals("\n\n\n\t\n\n"), output); } + @Test public void testProcessingInstructionTargetXmlPrefix() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -198,12 +206,13 @@ public class ContentWriterXmlTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(SAXException.class, e.getClass()); - assertTrue(e.getMessage().contains("instruction")); - assertTrue(e.getMessage().contains("start with xml")); + Assertions.assertNotNull(e); + Assertions.assertEquals(SAXException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("instruction")); + Assertions.assertTrue(e.getMessage().contains("start with xml")); } + @Test public void testProcessingInstructionTargetNoneNameChar() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -214,13 +223,14 @@ public class ContentWriterXmlTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(SAXException.class, e.getClass()); - assertTrue(e.getMessage().contains("instruction")); - assertTrue(e.getMessage().contains("invalid name")); - assertTrue(e.getMessage().contains("4Prefix")); + Assertions.assertNotNull(e); + Assertions.assertEquals(SAXException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("instruction")); + Assertions.assertTrue(e.getMessage().contains("invalid name")); + Assertions.assertTrue(e.getMessage().contains("4Prefix")); } + @Test public void testProcessingInstructionDataNoneChar() throws Exception { StringWriter outputWriter = new StringWriter(); ContentWriterXml writer = new ContentWriterXml(outputWriter); @@ -231,10 +241,10 @@ public class ContentWriterXmlTest extends TestCase { } catch (Exception catchE) { e = catchE; } - assertNotNull(e); - assertEquals(SAXException.class, e.getClass()); - assertTrue(e.getMessage().contains("instruction")); - assertTrue(e.getMessage().contains("invalid char")); - assertTrue(e.getMessage().contains("isInvalidChar=55296")); + Assertions.assertNotNull(e); + Assertions.assertEquals(SAXException.class, e.getClass()); + Assertions.assertTrue(e.getMessage().contains("instruction")); + Assertions.assertTrue(e.getMessage().contains("invalid char")); + Assertions.assertTrue(e.getMessage().contains("isInvalidChar=55296")); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java b/x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java index 0815cab..5a4a34a 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java @@ -25,33 +25,34 @@ package org.x4o.xml.lang; import java.io.InputStream; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; -import org.x4o.xml.lang.X4OLanguage; -import org.x4o.xml.lang.X4OLanguageLocal; import org.x4o.xml.lang.DefaultX4OLanguageLoader.VersionedResources; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; -import junit.framework.TestCase; - /** * Tests a simple x4o language loader * * @author Willem Cazander * @version 1.0 Jan 20, 2012 */ -public class DefaultX4OLanguageLoaderTest extends TestCase { +public class DefaultX4OLanguageLoaderTest { - X4ODriver driver; - X4OLanguage language; - DefaultX4OLanguageLoader loader; + static X4ODriver driver; + static X4OLanguage language; + static DefaultX4OLanguageLoader loader; - public void setUp() throws Exception { + @BeforeAll + public static void setUp() throws Exception { driver = TestDriver.getInstance(); language = driver.createLanguage(); loader = (DefaultX4OLanguageLoader)language.getLanguageConfiguration().getDefaultLanguageLoader().newInstance(); } + @Test public void testLoadingDuplicate() throws Exception { Exception e = null; try { @@ -59,46 +60,50 @@ public class DefaultX4OLanguageLoaderTest extends TestCase { } catch (Exception ee) { e = ee; } - assertNotNull("no duplicate module exception",e); - assertTrue("wrong module id.",e.getMessage().contains("test")); + Assertions.assertNotNull(e, "no duplicate module exception"); + Assertions.assertTrue(e.getMessage().contains("test"), "wrong module id."); } + @Test public void testModulesSimple() throws Exception { InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-simple.xml"); - assertNotNull(in); + Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-simple.xml"); - assertNotNull(result); - assertFalse(result.isEmpty()); - assertTrue("Simple test returned non-one result: "+result.size(),result.size()==1); + Assertions.assertNotNull(result); + Assertions.assertFalse(result.isEmpty()); + Assertions.assertTrue(result.size()==1, "Simple test returned non-one result: "+result.size()); } + @Test public void testModulesFull() throws Exception { InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-full.xml"); - assertNotNull(in); + Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-full.xml"); - assertNotNull(result); - assertFalse(result.isEmpty()); + Assertions.assertNotNull(result); + Assertions.assertFalse(result.isEmpty()); VersionedResources vr = result.get(0); - assertTrue(vr.eldResources.size()>1); - assertTrue(vr.moduleLoaders.size()>1); - assertTrue(vr.elbResources.size()>1); - assertTrue(vr.siblingLoaders.size()==1); + Assertions.assertTrue(vr.eldResources.size()>1); + Assertions.assertTrue(vr.moduleLoaders.size()>1); + Assertions.assertTrue(vr.elbResources.size()>1); + Assertions.assertTrue(vr.siblingLoaders.size()==1); } + @Test public void testModulesDuplicateLoaderNoError() throws Exception { InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml"); - assertNotNull(in); + Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-err-loader.xml"); - assertNotNull(result); - assertFalse(result.isEmpty()); + Assertions.assertNotNull(result); + Assertions.assertFalse(result.isEmpty()); } + @Test public void testModulesDuplicateLoader() throws Exception { InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml"); - assertNotNull(in); + Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-err-loader.xml"); - assertNotNull(result); - assertFalse(result.isEmpty()); + Assertions.assertNotNull(result); + Assertions.assertFalse(result.isEmpty()); Exception e=null; try { @@ -106,17 +111,18 @@ public class DefaultX4OLanguageLoaderTest extends TestCase { } catch (Exception ee) { e=ee; } - assertNotNull(e); - assertTrue("No 'Duplicate' found in message: "+e.getMessage(),e.getMessage().contains("Duplicate")); - assertTrue("No 'module-loader' found in message: "+e.getMessage(),e.getMessage().contains("module-loader")); + Assertions.assertNotNull(e); + Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: "+e.getMessage()); + Assertions.assertTrue(e.getMessage().contains("module-loader"), "No 'module-loader' found in message: "+e.getMessage()); } + @Test public void testModulesDuplicateSiblingLoader() throws Exception { InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-sibling.xml"); - assertNotNull(in); + Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-err-sibling.xml"); - assertNotNull(result); - assertFalse(result.isEmpty()); + Assertions.assertNotNull(result); + Assertions.assertFalse(result.isEmpty()); Exception e=null; try { @@ -124,8 +130,8 @@ public class DefaultX4OLanguageLoaderTest extends TestCase { } catch (Exception ee) { e=ee; } - assertNotNull(e); - assertTrue("No 'Duplicate' found in message: "+e.getMessage(),e.getMessage().contains("Duplicate")); - assertTrue("No 'sibling-loader' found in message: "+e.getMessage(),e.getMessage().contains("sibling-loader")); + Assertions.assertNotNull(e); + Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: "+e.getMessage()); + Assertions.assertTrue(e.getMessage().contains("sibling-loader"), "No 'sibling-loader' found in message: "+e.getMessage()); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguageClassLoaderTest.java b/x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguageClassLoaderTest.java index 25f0f83..4a014d3 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguageClassLoaderTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguageClassLoaderTest.java @@ -22,9 +22,8 @@ */ package org.x4o.xml.lang; -import org.x4o.xml.lang.X4OLanguageClassLoader; - -import junit.framework.TestCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * X4OLanguageClassLoaderTest test classloader. @@ -32,21 +31,23 @@ import junit.framework.TestCase; * @author Willem Cazander * @version 1.0 Aug 27, 2012 */ -public class X4OLanguageClassLoaderTest extends TestCase { - +public class X4OLanguageClassLoaderTest { + + @Test public void testLoadObject() throws Exception { Object o = X4OLanguageClassLoader.newInstance("java.lang.Object"); - assertNotNull(o); - assertEquals(Object.class, o.getClass()); + Assertions.assertNotNull(o); + Assertions.assertEquals(Object.class, o.getClass()); } + @Test public void tesNullThread() throws Exception { ClassLoader cl = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader(null); Object o = X4OLanguageClassLoader.newInstance("java.lang.Object"); - assertNotNull(o); - assertEquals(Object.class, o.getClass()); + Assertions.assertNotNull(o); + Assertions.assertEquals(Object.class, o.getClass()); } finally { Thread.currentThread().setContextClassLoader(cl); } diff --git a/x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguagePropertyTest.java b/x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguagePropertyTest.java index 467958c..dd18de7 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguagePropertyTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguagePropertyTest.java @@ -22,8 +22,8 @@ */ package org.x4o.xml.lang; - -import junit.framework.TestCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * X4OLanguagePropertyTest test static enum code. @@ -31,10 +31,11 @@ import junit.framework.TestCase; * @author Willem Cazander * @version 1.0 Aug 27, 2012 */ -public class X4OLanguagePropertyTest extends TestCase { +public class X4OLanguagePropertyTest { + @Test public void testUriValue() throws Exception { - assertEquals(1,1); + Assertions.assertEquals(1,1); } /* diff --git a/x4o-driver/src/test/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeSexWordTest.java b/x4o-driver/src/test/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeSexWordTest.java new file mode 100644 index 0000000..c7711c9 --- /dev/null +++ b/x4o-driver/src/test/java/org/x4o/xml/o4o/octal/PrimordialOctalOrangeSexWordTest.java @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.xml.o4o.octal; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * X4OLanguagePropertyTest test static enum code. + * + * @author Willem Cazander + * @version 1.0 Aug 27, 2012 + */ +public class PrimordialOctalOrangeSexWordTest { + + @Test + public void testOctalMSB() throws Exception { + PrimordialOctalOrangeSexWord word = new PrimordialOctalOrangeSexWord(PrimordialOctal.PART_1, PrimordialOctal.PART_1, PrimordialOctal.PART_1, PrimordialOctal.PART_2, PrimordialOctal.PART_8, PrimordialOctal.PART_8); + Assertions.assertEquals(127, word.baitOctalNumber()); + } + + @Test + public void testValueOfOne() throws Exception { + PrimordialOctalOrangeSexWord word = PrimordialOctalOrangeSexWord.valueOfOne(); + Assertions.assertEquals(0, word.baitOctalNumber()); + } + + @Test + public void testValueOfSmurf() throws Exception { + PrimordialOctalOrangeSexWord word = PrimordialOctalOrangeSexWord.valueOfSmurf(0); + Assertions.assertEquals(0, word.baitOctalNumber()); + + word = PrimordialOctalOrangeSexWord.valueOfSmurf(127); + Assertions.assertEquals(127, word.baitOctalNumber()); + + word = PrimordialOctalOrangeSexWord.valueOfSmurf(32768); + Assertions.assertEquals(32768, word.baitOctalNumber()); + } + + @Test + public void testToString() throws Exception { + PrimordialOctalOrangeSexWord word = PrimordialOctalOrangeSexWord.valueOfSmurf(0); + Assertions.assertEquals("יֽ֔יֽ֔", word.toString()); + + word = PrimordialOctalOrangeSexWord.valueOfSmurf(262143); // max + Assertions.assertEquals("וַ֝וַ֝", word.toString()); + + //word = PrimordialOctalOrangeSexWord.valueOfSmurf(22270); // immortal + //Assertions.assertEquals("זַ֟װֻ֔", word.toString()); + } +} diff --git a/x4o-driver/src/test/java/org/x4o/xml/test/SwingTests.java b/x4o-driver/src/test/java/org/x4o/xml/test/SwingTests.java index 6f325ad..9f50f34 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/test/SwingTests.java +++ b/x4o-driver/src/test/java/org/x4o/xml/test/SwingTests.java @@ -25,25 +25,23 @@ package org.x4o.xml.test; import java.io.File; import java.io.FileOutputStream; +import org.junit.jupiter.api.Test; import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.models.TestObjectRoot; - -import junit.framework.TestCase; - /** * Tests a simple x4o xml language. * * @author Willem Cazander * @version 1.0 Jul 24, 2006 */ -public class SwingTests extends TestCase { +public class SwingTests { public void setUp() throws Exception { //X4OTesting.initLogging(); } - + @Test public void testSwing() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); diff --git a/x4o-driver/src/test/java/org/x4o/xml/test/TagHandlerTest.java b/x4o-driver/src/test/java/org/x4o/xml/test/TagHandlerTest.java index 766b5e5..58c5940 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/test/TagHandlerTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/test/TagHandlerTest.java @@ -22,20 +22,18 @@ */ package org.x4o.xml.test; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.models.TestObjectRoot; - -import junit.framework.TestCase; - /** * Tests a simple x4o xml language. * * @author Willem Cazander * @version 1.0 Jul 24, 2006 */ -public class TagHandlerTest extends TestCase { +public class TagHandlerTest { public void setUp() throws Exception { //X4OTesting.initLogging(); @@ -48,7 +46,8 @@ public class TagHandlerTest extends TestCase { } printS(e.getCause()); } - + + @Test public void testTagHanders() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); diff --git a/x4o-driver/src/test/java/org/x4o/xml/test/XIncludeTest.java b/x4o-driver/src/test/java/org/x4o/xml/test/XIncludeTest.java index e719050..4d0f51e 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/test/XIncludeTest.java +++ b/x4o-driver/src/test/java/org/x4o/xml/test/XIncludeTest.java @@ -22,35 +22,34 @@ */ package org.x4o.xml.test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.io.X4OReader; import org.x4o.xml.test.models.TestObjectChild; import org.x4o.xml.test.models.TestObjectParent; import org.x4o.xml.test.models.TestObjectRoot; - -import junit.framework.TestCase; - /** * XIncludeTest * * @author Willem Cazander * @version 1.0 Aug 31, 2012 */ -public class XIncludeTest extends TestCase { - +public class XIncludeTest { + @Test public void testXInclude() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); TestObjectRoot root = reader.readResource("tests/xinclude/include-base.xml"); - assertNotNull(root); + Assertions.assertNotNull(root); TestObjectRoot parentRoot = (TestObjectRoot)root; if (parentRoot.getTestObjectParents().size()==0) { return; // FIXME: don't fail, as on jdk7 it 'sometimes' fails ... } - assertEquals(1,parentRoot.getTestObjectParents().size()); + Assertions.assertEquals(1,parentRoot.getTestObjectParents().size()); TestObjectParent parent = parentRoot.getTestObjectParents().get(0); TestObjectChild child = parent.testObjectChilds.get(0); - assertEquals("include-child.xml",child.getName()); + Assertions.assertEquals("include-child.xml",child.getName()); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/test/models/TestBean.java b/x4o-driver/src/test/java/org/x4o/xml/test/models/TestBean.java index 6f62936..24e5621 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/test/models/TestBean.java +++ b/x4o-driver/src/test/java/org/x4o/xml/test/models/TestBean.java @@ -30,7 +30,7 @@ package org.x4o.xml.test.models; */ public class TestBean { - // public ... todo not implemented + // TODO: Add public field support, ... and remove public* methods below public int publicIntegerTypeField = 0; public Integer publicIntegerObjectField = new Integer(0); @@ -53,9 +53,11 @@ public class TestBean { public char publicCharTypeField = ' '; public Character publicCharObjectField = new Character(' '); - public String publicStringObjectField = " "; - //public Date publicDateObjectField = new Date(0); // TODO add date converters + public String publicStringObjectField = "𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕"; + //public String publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ = " ᒡᒢᑊᒻᒻᓫᔿ"; + public String publicStringObjectFieldUnicode仙上主天 = "仙上主天"; + //public Date publicDateObjectField = new Date(0); // TODO add date converters // private @@ -80,7 +82,9 @@ public class TestBean { private char privateCharTypeField = ' '; private Character privateCharObjectField = new Character(' '); - private String privateStringObjectField = " "; + private String privateStringObjectField = "𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕"; + //private String privateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ = " ᒡᒢᑊᒻᒻᓫᔿ"; + private String privateStringObjectFieldUnicode仙上主天 = "仙上主天"; //private Date privateDateObjectField = new Date(0); @@ -266,6 +270,30 @@ public class TestBean { public void setPublicStringObjectField(String publicStringObjectField) { this.publicStringObjectField = publicStringObjectField; } +// /** +// * @return the publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ +// */ +// public String getPublicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ() { +// return publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ; +// } +// /** +// * @param publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ the publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ to set +// */ +// public void setPublicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ(String publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ) { +// this.publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ = publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ; +// } + /** + * @return the publicStringObjectFieldUnicode仙上主天 + */ + public String getPublicStringObjectFieldUnicode仙上主天() { + return publicStringObjectFieldUnicode仙上主天; + } + /** + * @param publicStringObjectFieldUnicode仙上主天 the publicStringObjectFieldUnicode仙上主天 to set + */ + public void setPublicStringObjectFieldUnicode仙上主天(String publicStringObjectFieldUnicode仙上主天) { + this.publicStringObjectFieldUnicode仙上主天 = publicStringObjectFieldUnicode仙上主天; + } /* * @return the publicDateObjectField @@ -458,6 +486,30 @@ public class TestBean { public void setPrivateStringObjectField(String privateStringObjectField) { this.privateStringObjectField = privateStringObjectField; } +// /** +// * @return the privateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ +// */ +// public String getPrivateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ() { +// return privateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ; +// } +// /** +// * @param privateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ the privateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ to set +// */ +// public void setPrivateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ(String privateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ) { +// this.privateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ = privateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ; +// } + /** + * @return the privateStringObjectFieldUnicode仙上主天 + */ + public String getPrivateStringObjectFieldUnicode仙上主天() { + return privateStringObjectFieldUnicode仙上主天; + } + /** + * @param privateStringObjectFieldUnicode仙上主天 the privateStringObjectFieldUnicode仙上主天 to set + */ + public void setPrivateStringObjectFieldUnicode仙上主天(String privateStringObjectFieldUnicode仙上主天) { + this.privateStringObjectFieldUnicode仙上主天 = privateStringObjectFieldUnicode仙上主天; + } /* * @return the privateDateObjectField diff --git a/x4o-driver/src/test/java/org/x4o/xml/test/swixml/Accelerator3Test.java b/x4o-driver/src/test/java/org/x4o/xml/test/swixml/Accelerator3Test.java index 3fcd443..9b3f0be 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/test/swixml/Accelerator3Test.java +++ b/x4o-driver/src/test/java/org/x4o/xml/test/swixml/Accelerator3Test.java @@ -28,18 +28,19 @@ import javax.swing.JFrame; import javax.swing.JMenu; import javax.swing.JMenuItem; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.io.X4OReader; -import junit.framework.TestCase; - /** * Accelerator3Test test xml parsing * * @author Willem Cazander * @version 1.0 Aug 31, 2012 */ -public class Accelerator3Test extends TestCase { +public class Accelerator3Test { + @Test public void testSwingMenuAbout() throws Exception { Accelerator3 ac3 = new Accelerator3(false); SwingEngine engine = new SwingEngine(ac3); @@ -47,13 +48,13 @@ public class Accelerator3Test extends TestCase { X4OReader reader = driver.createReader(SwiXmlDriver.LANGUAGE_VERSION_3); reader.addELBeanInstance(SwiXmlDriver.LANGUAGE_EL_SWING_ENGINE, engine); Component root = reader.readResource(Accelerator3.DESCRIPTOR); - assertNotNull(root); + Assertions.assertNotNull(root); JFrame frame = (JFrame)root; - assertTrue(frame.getJMenuBar().getMenuCount()>0); + Assertions.assertTrue(frame.getJMenuBar().getMenuCount()>0); JMenu helpMenu = frame.getJMenuBar().getMenu(1); - assertEquals("Help",helpMenu.getText()); - assertTrue(helpMenu.getMenuComponentCount()>0); + Assertions.assertEquals("Help",helpMenu.getText()); + Assertions.assertTrue(helpMenu.getMenuComponentCount()>0); JMenuItem about = (JMenuItem)helpMenu.getMenuComponent(0); - assertEquals("mi_about", about.getName()); + Assertions.assertEquals("mi_about", about.getName()); } } diff --git a/x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwiXmlDriver.java b/x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwiXmlDriver.java index 2aed08b..969d07d 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwiXmlDriver.java +++ b/x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwiXmlDriver.java @@ -40,7 +40,7 @@ public class SwiXmlDriver extends X4ODriver { public static final String LANGUAGE_NAME = "swixml"; public static final String LANGUAGE_VERSION_2 = "2.0"; - public static final String LANGUAGE_VERSION_2_NSURI = "http://swixml.x4o.org/xml/ns/swixml-lang"; + public static final String LANGUAGE_VERSION_2_NSURI = "http://swixml.junit.x4o.org/xml/ns/junit-swixml-lang"; public static final String LANGUAGE_VERSION_3 = "3.0"; public static final String[] LANGUAGE_VERSIONS = new String[]{LANGUAGE_VERSION_2,LANGUAGE_VERSION_3}; public static final String LANGUAGE_EL_SWING_ENGINE = "swingEngine"; @@ -51,7 +51,7 @@ public class SwiXmlDriver extends X4ODriver { * @return Returns the SwingEngine for this elementLanguage. */ static public SwingEngine getSwingEngine(X4OLanguageSession elementLanguage) { - ValueExpression ee = elementLanguage.getExpressionLanguageFactory().createValueExpression(elementLanguage.getExpressionLanguageContext(),"${"+SwiXmlDriver.LANGUAGE_EL_SWING_ENGINE+"}",Object.class); + ValueExpression ee = elementLanguage.getExpressionLanguageFactory().createValueExpression(elementLanguage.getExpressionLanguageContext(),"${"+SwiXmlDriver.LANGUAGE_EL_SWING_ENGINE+"}",Object.class); SwingEngine se = (SwingEngine)ee.getValue(elementLanguage.getExpressionLanguageContext()); return se; } diff --git a/x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwingEngine.java b/x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwingEngine.java index 3cbc636..fdef60c 100644 --- a/x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwingEngine.java +++ b/x4o-driver/src/test/java/org/x4o/xml/test/swixml/SwingEngine.java @@ -27,6 +27,7 @@ import java.lang.reflect.Field; import javax.swing.Action; +import org.x4o.xml.io.DefaultX4OReader; import org.x4o.xml.io.X4OReader; /** @@ -71,6 +72,9 @@ public class SwingEngine { public Component render(String resource,String languageVersion) { SwiXmlDriver driver = SwiXmlDriver.getInstance(); X4OReader reader = driver.createReader(languageVersion); + if (SwiXmlDriver.LANGUAGE_VERSION_2.equals(languageVersion)) { + reader.setProperty(DefaultX4OReader.DOC_EMPTY_NAMESPACE_URI, SwiXmlDriver.LANGUAGE_VERSION_2_NSURI); + } reader.addELBeanInstance(SwiXmlDriver.LANGUAGE_EL_SWING_ENGINE, this); try { rootComponent = reader.readResource(resource); diff --git a/x4o-driver/src/test/resources/META-INF/swixml/swixml-lang-2.0.eld b/x4o-driver/src/test/resources/META-INF/swixml/swixml-lang-2.0.eld index d24cb48..0307d21 100644 --- a/x4o-driver/src/test/resources/META-INF/swixml/swixml-lang-2.0.eld +++ b/x4o-driver/src/test/resources/META-INF/swixml/swixml-lang-2.0.eld @@ -29,9 +29,9 @@ xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerHost="swixml2.test.x4o.org" - providerName="Swixml2 Language" - id="swixml2-module" + providerHost="swixml.junit.x4o.org" + providerName="Junit Swixml-2 Language" + id="junit-swixml-module" > @@ -88,12 +88,29 @@ - + Single element in language root to create nice tree, for imports in xsd namespace aware generated files. - + diff --git a/x4o-driver/src/test/resources/META-INF/swixml/swixml-lang-3.0.eld b/x4o-driver/src/test/resources/META-INF/swixml/swixml-lang-3.0.eld index 3cdbc6e..6ec989c 100644 --- a/x4o-driver/src/test/resources/META-INF/swixml/swixml-lang-3.0.eld +++ b/x4o-driver/src/test/resources/META-INF/swixml/swixml-lang-3.0.eld @@ -29,9 +29,9 @@ xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerHost="swixml.x4o.org" - providerName="Swixml3 Language" - id="swixml3-module" + providerHost="swixml.junit.x4o.org" + providerName="Junit Swixml-3 Language" + id="junit-swixml-module" > @@ -84,10 +84,27 @@ - + - + diff --git a/x4o-driver/src/test/resources/META-INF/test/test-lang.eld b/x4o-driver/src/test/resources/META-INF/test/test-lang.eld index 4f69236..7b1ca73 100644 --- a/x4o-driver/src/test/resources/META-INF/test/test-lang.eld +++ b/x4o-driver/src/test/resources/META-INF/test/test-lang.eld @@ -29,9 +29,9 @@ xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="test Language" - providerHost="test.x4o.org" - id="test-module" + providerName="Junit Test Language" + providerHost="test.junit.x4o.org" + id="junit-test-module" > @@ -66,14 +66,14 @@ @@ -82,13 +82,13 @@ + diff --git a/x4o-driver/src/test/resources/tests/attributes/test-body.xml b/x4o-driver/src/test/resources/tests/attributes/test-body.xml index 2651218..901f333 100644 --- a/x4o-driver/src/test/resources/tests/attributes/test-body.xml +++ b/x4o-driver/src/test/resources/tests/attributes/test-body.xml @@ -24,9 +24,9 @@ --> - - body-name + + body-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕 diff --git a/x4o-driver/src/test/resources/tests/empty-xml/empty-x4o.xml b/x4o-driver/src/test/resources/tests/empty-xml/empty-x4o.xml index 10e016a..4f5d82b 100644 --- a/x4o-driver/src/test/resources/tests/empty-xml/empty-x4o.xml +++ b/x4o-driver/src/test/resources/tests/empty-xml/empty-x4o.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/x4o-driver/src/test/resources/tests/namespace/uri-schema.xml b/x4o-driver/src/test/resources/tests/namespace/uri-schema.xml index 2b234fc..8c99851 100644 --- a/x4o-driver/src/test/resources/tests/namespace/uri-schema.xml +++ b/x4o-driver/src/test/resources/tests/namespace/uri-schema.xml @@ -24,8 +24,8 @@ --> diff --git a/x4o-driver/src/test/resources/tests/namespace/uri-simple.xml b/x4o-driver/src/test/resources/tests/namespace/uri-simple.xml index a28e6f7..8f4cfbb 100644 --- a/x4o-driver/src/test/resources/tests/namespace/uri-simple.xml +++ b/x4o-driver/src/test/resources/tests/namespace/uri-simple.xml @@ -24,8 +24,8 @@ --> \ No newline at end of file diff --git a/x4o-driver/src/test/resources/tests/swixml/swixml-accelerator-3.0.xml b/x4o-driver/src/test/resources/tests/swixml/swixml-accelerator-3.0.xml index 0b1a212..9fa1157 100644 --- a/x4o-driver/src/test/resources/tests/swixml/swixml-accelerator-3.0.xml +++ b/x4o-driver/src/test/resources/tests/swixml/swixml-accelerator-3.0.xml @@ -24,10 +24,10 @@ --> diff --git a/x4o-driver/src/test/resources/tests/test-saxtemplating.xml b/x4o-driver/src/test/resources/tests/test-saxtemplating.xml index 82e9d7a..463245d 100644 --- a/x4o-driver/src/test/resources/tests/test-saxtemplating.xml +++ b/x4o-driver/src/test/resources/tests/test-saxtemplating.xml @@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - diff --git a/x4o-driver/src/test/resources/tests/test-swing.xml b/x4o-driver/src/test/resources/tests/test-swing.xml index 328bcc3..63a6fea 100644 --- a/x4o-driver/src/test/resources/tests/test-swing.xml +++ b/x4o-driver/src/test/resources/tests/test-swing.xml @@ -24,8 +24,8 @@ --> diff --git a/x4o-driver/src/test/resources/tests/test-taghandlers.xml b/x4o-driver/src/test/resources/tests/test-taghandlers.xml index baa1155..230c4bc 100644 --- a/x4o-driver/src/test/resources/tests/test-taghandlers.xml +++ b/x4o-driver/src/test/resources/tests/test-taghandlers.xml @@ -24,7 +24,7 @@ --> diff --git a/x4o-driver/src/test/resources/tests/writer/test-attribute-order.xml b/x4o-driver/src/test/resources/tests/writer/test-attribute-order.xml index 8f5d03f..ea4d9e5 100644 --- a/x4o-driver/src/test/resources/tests/writer/test-attribute-order.xml +++ b/x4o-driver/src/test/resources/tests/writer/test-attribute-order.xml @@ -24,8 +24,8 @@ --> \ No newline at end of file diff --git a/x4o-driver/src/test/resources/tests/xinclude/include-base.xml b/x4o-driver/src/test/resources/tests/xinclude/include-base.xml index 5bcb0e2..756bed4 100644 --- a/x4o-driver/src/test/resources/tests/xinclude/include-base.xml +++ b/x4o-driver/src/test/resources/tests/xinclude/include-base.xml @@ -24,11 +24,11 @@ --> diff --git a/x4o-driver/src/test/resources/tests/xinclude/include-child.xml b/x4o-driver/src/test/resources/tests/xinclude/include-child.xml index a71b08d..ddba8dd 100644 --- a/x4o-driver/src/test/resources/tests/xinclude/include-child.xml +++ b/x4o-driver/src/test/resources/tests/xinclude/include-child.xml @@ -24,8 +24,8 @@ --> \ No newline at end of file diff --git a/x4o-eld-doc/pom.xml b/x4o-eld-doc/pom.xml index 60fb3e0..4a7d3d4 100644 --- a/x4o-eld-doc/pom.xml +++ b/x4o-eld-doc/pom.xml @@ -14,24 +14,10 @@ org.x4o x4o-driver - ${project.version} org.x4o x4o-html - ${project.version} - - - de.odysseus.juel - juel - ${juel.version} - test - - - junit - junit - ${junit.version} - test org.x4o @@ -41,24 +27,9 @@ test - xerces - xercesImpl - ${xerces.version} + org.junit.jupiter + junit-jupiter test - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - ${project.basedir}/../src/site-child - - - - - diff --git a/x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java b/x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java index 25af812..fcc471e 100644 --- a/x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java +++ b/x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java @@ -24,6 +24,8 @@ package org.x4o.xml.eld.doc; import java.io.File; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; import org.x4o.xml.eld.CelDriver; @@ -32,15 +34,13 @@ import org.x4o.xml.io.sax.ext.PropertyConfig; import org.x4o.xml.lang.task.X4OLanguageTask; import org.x4o.xml.test.TestDriver; -import junit.framework.TestCase; - /** * Test for eld doc generation * * @author Willem Cazander * @version 1.0 Aug 26, 2010 */ -public class X4OWriteLanguageDocExecutorTest extends TestCase { +public class X4OWriteLanguageDocExecutorTest { private File createOutputPath(String dir) throws Exception { File result = new File("target/tests"+File.separator+dir); @@ -57,23 +57,27 @@ public class X4OWriteLanguageDocExecutorTest extends TestCase { File outputPath = createOutputPath(outputPostfix); config.setProperty(EldDocWriter.OUTPUT_PATH,outputPath); task.createTaskExecutor(config).execute(driver.createLanguage()); - assertTrue(outputPath.exists()); - assertTrue(outputPath.list()!=null); - assertTrue(outputPath.list().length>2); + Assertions.assertTrue(outputPath.exists()); + Assertions.assertTrue(outputPath.list()!=null); + Assertions.assertTrue(outputPath.list().length>2); } + @Test public void testCelDoc() throws Exception { testDoc(CelDriver.LANGUAGE_NAME,"junit-doc-cel"); } - + + @Test public void testEldDoc() throws Exception { testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); } + @Test public void testUnitDoc() throws Exception { testDoc(TestDriver.LANGUAGE_NAME,"junit-doc-test"); } /* + @Test public void testSwiXml2Doc() throws Exception { testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); EldDocLanguageTask writer = new EldDocLanguageTask(); @@ -83,6 +87,7 @@ public class X4OWriteLanguageDocExecutorTest extends TestCase { writer.execute(); } + @Test public void testSwiXml3Doc() throws Exception { testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); EldDocLanguageTask writer = new EldDocLanguageTask(); diff --git a/x4o-html/pom.xml b/x4o-html/pom.xml index ad60d04..7c3a570 100644 --- a/x4o-html/pom.xml +++ b/x4o-html/pom.xml @@ -13,39 +13,11 @@ org.x4o x4o-driver - ${project.version} - de.odysseus.juel - juel - ${juel.version} - test - - - junit - junit - ${junit.version} - test - - - xerces - xercesImpl - ${xerces.version} + org.junit.jupiter + junit-jupiter test - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - ${project.basedir}/../src/site-child - - - - - \ No newline at end of file diff --git a/x4o-meta/pom.xml b/x4o-meta/pom.xml index 5feb8fb..b28c4d0 100644 --- a/x4o-meta/pom.xml +++ b/x4o-meta/pom.xml @@ -15,39 +15,11 @@ org.x4o x4o-driver - ${project.version} - de.odysseus.juel - juel - ${juel.version} - test - - - junit - junit - ${junit.version} - test - - - xerces - xercesImpl - ${xerces.version} + org.junit.jupiter + junit-jupiter test - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - ${project.basedir}/../src/site-child - - - - - \ No newline at end of file diff --git a/x4o-meta/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java b/x4o-meta/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java index 5c62550..d0da6dc 100644 --- a/x4o-meta/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java +++ b/x4o-meta/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java @@ -24,22 +24,23 @@ package org.x4o.xml.lang.meta; import javax.swing.JLabel; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.element.DefaultElement; import org.x4o.xml.element.Element; import org.x4o.xml.io.X4OReaderSession; import org.x4o.xml.lang.X4OLanguageSession; import org.x4o.xml.lang.phase.X4OPhaseLanguageRead; -import junit.framework.TestCase; - /** * Tests the parent object meta element. * * @author Willem Cazander * @version 1.0 Apr 15, 2012 */ -public class ParentObjectTest extends TestCase { +public class ParentObjectTest { + @Test public void testParentElement() throws Exception { X4OLanguageSession context = null; MTestDriver driver = new MTestDriver(); @@ -47,15 +48,16 @@ public class ParentObjectTest extends TestCase { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try { context = reader.readResourceSession("junit/test-meta-parent-element.xml"); - assertEquals(1,context.getRootElement().getChilderen().size()); + Assertions.assertEquals(1,context.getRootElement().getChilderen().size()); Element childElement = context.getRootElement().getChilderen().get(0); JLabel test = (JLabel)childElement.getElementObject(); - assertEquals("parentTest",test.getText()); + Assertions.assertEquals("parentTest",test.getText()); } finally { reader.releaseSession(context); } } + @Test public void testParentObjectElement() throws Exception { DefaultElement ep = new DefaultElement(); ParentObjectElement e = new ParentObjectElement(); @@ -63,21 +65,20 @@ public class ParentObjectTest extends TestCase { // test non parent o = e.getElementObject(); - assertNull(o); + Assertions.assertNull(o); e.setElementObject("test"); o = e.getElementObject(); - assertNull(o); + Assertions.assertNull(o); // test parent e.setParent(ep); o = e.getElementObject(); - assertNull(o); + Assertions.assertNull(o); e.setElementObject("test"); o = e.getElementObject(); - assertEquals("test",o); + Assertions.assertEquals("test",o); o = ep.getElementObject(); - assertEquals("test",o); - assertEquals(e.getElementObject(),ep.getElementObject()); + Assertions.assertEquals("test",o); + Assertions.assertEquals(e.getElementObject(),ep.getElementObject()); } - } diff --git a/x4o-meta/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java b/x4o-meta/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java index e5f4c33..37c2368 100644 --- a/x4o-meta/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java +++ b/x4o-meta/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java @@ -24,20 +24,21 @@ package org.x4o.xml.lang.meta; import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.x4o.xml.io.X4OReaderSession; import org.x4o.xml.lang.X4OLanguageSession; import org.x4o.xml.lang.phase.X4OPhaseLanguageRead; -import junit.framework.TestCase; - /** * Tests a simple x4o meta xml language. * * @author Willem Cazander * @version 1.0 Jul 24, 2006 */ -public class ReferenceStoreTest extends TestCase { +public class ReferenceStoreTest { + @Test public void testMetaGeneric() throws Exception { X4OLanguageSession context = null; MTestDriver driver = new MTestDriver(); @@ -45,12 +46,13 @@ public class ReferenceStoreTest extends TestCase { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try { context = reader.readResourceSession("junit/test-meta-generic.xml"); - assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); } finally { reader.releaseSession(context); } } + @Test public void testLoadClass() throws Exception { X4OLanguageSession context = null; MTestDriver driver = new MTestDriver(); @@ -58,12 +60,13 @@ public class ReferenceStoreTest extends TestCase { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try { context = reader.readResourceSession("junit/test-meta-reference.xml"); - assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); } finally { reader.releaseSession(context); } } + @Test public void testStoreRef() throws Exception { X4OLanguageSession context = null; MTestDriver driver = new MTestDriver(); @@ -71,13 +74,12 @@ public class ReferenceStoreTest extends TestCase { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try { context = reader.readResourceSession("junit/test-meta-reference.xml"); - assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); - assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(1).getElementObject().getClass().getName()); - assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(2).getElementObject().getClass().getName()); - assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(3).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(1).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(2).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),context.getRootElement().getChilderen().get(3).getElementObject().getClass().getName()); } finally { reader.releaseSession(context); } } - } diff --git a/x4o-tool/pom.xml b/x4o-tool/pom.xml index d3c8d05..fda180d 100644 --- a/x4o-tool/pom.xml +++ b/x4o-tool/pom.xml @@ -16,18 +16,4 @@ x4o-tool-ant-plugin x4o-tool-maven-plugin - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - ${project.basedir}/../src/site-child - - - - - \ No newline at end of file diff --git a/x4o-tool/x4o-tool-ant-plugin/pom.xml b/x4o-tool/x4o-tool-ant-plugin/pom.xml index 22058f0..2c27b66 100644 --- a/x4o-tool/x4o-tool-ant-plugin/pom.xml +++ b/x4o-tool/x4o-tool-ant-plugin/pom.xml @@ -56,20 +56,6 @@ test - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - ${project.basedir}/../../src/site-child - - - - - x4o-update-schema-cel diff --git a/x4o-tool/x4o-tool-maven-plugin/pom.xml b/x4o-tool/x4o-tool-maven-plugin/pom.xml index 8cefff4..7598c44 100644 --- a/x4o-tool/x4o-tool-maven-plugin/pom.xml +++ b/x4o-tool/x4o-tool-maven-plugin/pom.xml @@ -51,7 +51,6 @@ org.apache.maven.plugins maven-plugin-plugin - ${maven-plugin-plugin.version} true @@ -71,40 +70,5 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-plugin-plugin - - [3.2,) - - descriptor - helpmojo - - - - - - - - - - - -