{
@@ -125,11 +125,10 @@ public WriteBuffer writeLong(long value) {
/**
* Leaves a 4 byte space to write a length. When {@link SimplyCloseable#close()} is called,
* the number of intervening bytes is written as a length to the remembered location.
- * @param logger the logger to use to log the operations - must not be null
*/
- public SimplyCloseable recordLength(final Logger logger) {
+ public SimplyCloseable recordLength() {
final int lengthPosition = position;
- logger.finest("Writing a gap value for a length at offset " + lengthPosition);
+ DATA_OUT_LOG.finest("Writing a gap value for a length at offset " + lengthPosition);
pad(4);
return () -> {
@@ -139,7 +138,7 @@ public SimplyCloseable recordLength(final Logger logger) {
data[lengthPosition + 1] = (byte) (length >> 020);
data[lengthPosition + 2] = (byte) (length >> 010);
data[lengthPosition + 3] = (byte) (length >> 000);
- logger.finest("Wrote a length value of " + length + " at offset " + lengthPosition);
+ DATA_OUT_LOG.finest("Wrote a length value of " + length + " at offset " + lengthPosition);
};
}
diff --git a/yoko-util/src/main/java/org/apache/yoko/logging/VerboseLogging.java b/yoko-util/src/main/java/org/apache/yoko/logging/VerboseLogging.java
index 90cafde25..0cf3bd8cb 100644
--- a/yoko-util/src/main/java/org/apache/yoko/logging/VerboseLogging.java
+++ b/yoko-util/src/main/java/org/apache/yoko/logging/VerboseLogging.java
@@ -54,6 +54,12 @@ public enum VerboseLogging {
*/
public static final Logger ROOT_LOG = Logger.getLogger("yoko.verbose");
+ /** Log ORB initialization */
+ public static final Logger INIT_LOG = Logger.getLogger("yoko.verbose.init");
+ public static final Logger ORB_INIT_LOG = Logger.getLogger("yoko.verbose.init.orb");
+ public static final Logger POA_INIT_LOG = Logger.getLogger("yoko.verbose.init.poa");
+
+
/** Connection logging:
* CONFIG: timeout settings etc.
* FINE: open/accept/close connection to/from endpoint
@@ -75,7 +81,6 @@ public enum VerboseLogging {
/** Log data sent */
public static final Logger DATA_OUT_LOG = Logger.getLogger("yoko.verbose.data.out");
-
public static final Logger RETRY_LOG = Logger.getLogger("yoko.verbose.retry");
/** IOR logging:
diff --git a/yoko-util/src/main/java/org/apache/yoko/util/yasf/Yasf.java b/yoko-util/src/main/java/org/apache/yoko/util/yasf/Yasf.java
index a5c5a1370..ad59091ce 100644
--- a/yoko-util/src/main/java/org/apache/yoko/util/yasf/Yasf.java
+++ b/yoko-util/src/main/java/org/apache/yoko/util/yasf/Yasf.java
@@ -38,6 +38,7 @@
public enum Yasf {
ENUM_FIXED(0),
NON_SERIALIZABLE_FIELD_IS_ABSTRACT_VALUE(1),
+ WRITE_UTF8_AS_UTF8(2),
;
// TODO - Get the OMG to assign this value to Yoko
public static final int TAG_YOKO_AUXILIARY_STREAM_FORMAT = 0xeeeeeeee;
diff --git a/yoko-verify/src/test/java-testify/org/apache/yoko/CodeSetsTest.java b/yoko-verify/src/test/java-testify/org/apache/yoko/CodeSetsTest.java
new file mode 100644
index 000000000..e25752cd3
--- /dev/null
+++ b/yoko-verify/src/test/java-testify/org/apache/yoko/CodeSetsTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2026 IBM Corporation and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an \"AS IS\" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.apache.yoko;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.omg.CORBA.ORB;
+import test.codesets.TestCodeSets;
+import test.codesets.TestCodeSetsHelper;
+import test.codesets.TestCodeSets_impl;
+import testify.bus.Bus;
+import testify.bus.key.TypeKey;
+import testify.iiop.annotation.ConfigureOrb;
+import testify.iiop.annotation.ConfigureServer;
+import testify.iiop.annotation.ConfigureServer.BeforeServer;
+
+import static org.apache.yoko.CodeSetsTest.PublishStub.REF;
+
+@ConfigureServer
+public class CodeSetsTest {
+ // same latin codeset on server and client
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-1"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-1"})) public static class CodeSet1Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-2"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-2"})) public static class CodeSet2Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-3"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-3"})) public static class CodeSet3Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-4"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-4"})) public static class CodeSet4Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-5"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-5"})) public static class CodeSet5Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-6"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-6"})) public static class CodeSet6Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-7"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-7"})) public static class CodeSet7Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-8"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-8"})) public static class CodeSet8Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-9"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-9"})) public static class CodeSet9Test extends CodeSetsTest {}
+ // different latin codesets on server and client
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-1"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-2"})) public static class CodeSets12Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-2"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-3"})) public static class CodeSets23Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-3"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-4"})) public static class CodeSets34Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-4"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-5"})) public static class CodeSets45Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-5"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-6"})) public static class CodeSets56Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-6"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-7"})) public static class CodeSets67Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-7"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-8"})) public static class CodeSets78Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-8"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-9"})) public static class CodeSets89Test extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-9"}), serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-1"})) public static class CodeSets91Test extends CodeSetsTest {}
+ // server uses default (UTF-8)
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-1"})) public static class CodeSets1DTest extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-2"})) public static class CodeSets2DTest extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-3"})) public static class CodeSets3DTest extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-4"})) public static class CodeSets4DTest extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-5"})) public static class CodeSets5DTest extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-6"})) public static class CodeSets6DTest extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-7"})) public static class CodeSets7DTest extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-8"})) public static class CodeSets8DTest extends CodeSetsTest {}
+ @ConfigureServer (clientOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-9"})) public static class CodeSets9DTest extends CodeSetsTest {}
+ // client uses default (UTF-8)
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-1"})) public static class CodeSetsD1Test extends CodeSetsTest {}
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-2"})) public static class CodeSetsD2Test extends CodeSetsTest {}
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-3"})) public static class CodeSetsD3Test extends CodeSetsTest {}
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-4"})) public static class CodeSetsD4Test extends CodeSetsTest {}
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-5"})) public static class CodeSetsD5Test extends CodeSetsTest {}
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-6"})) public static class CodeSetsD6Test extends CodeSetsTest {}
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-7"})) public static class CodeSetsD7Test extends CodeSetsTest {}
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-8"})) public static class CodeSetsD8Test extends CodeSetsTest {}
+ @ConfigureServer (serverOrb = @ConfigureOrb(args = {"-ORBnative_cs", "8859-9"})) public static class CodeSetsD9Test extends CodeSetsTest {}
+
+ enum PublishStub implements TypeKey {REF}
+ private static TestCodeSets stub;
+
+ @BeforeServer
+ public static void exportObject(ORB orb, Bus bus) {
+ TestCodeSets_impl impl = new TestCodeSets_impl(null);
+ TestCodeSets tcs = impl._this(orb);
+ String ior = orb.object_to_string(tcs);
+ bus.put(REF, ior);
+ }
+
+ @BeforeAll
+ public static void retrieveStub(ORB orb, Bus bus) {
+ stub = TestCodeSetsHelper.narrow(orb.string_to_object(bus.get(REF)));
+ }
+
+ @Test void testChar() { Assertions.assertEquals('a', stub.testChar('a')); }
+ @Test void testString() { Assertions.assertEquals("Hello, world", stub.testString("Hello, world")); }
+ @Test void testWchar() { Assertions.assertEquals((char) 0x1234, stub.testWChar((char) 0x1234)); }
+ @Test void testWstring() { Assertions.assertEquals("Hello, world", stub.testWString("Hello, world")); }
+}
diff --git a/yoko-verify/src/test/java-testify/org/apache/yoko/UtfStringsTest.java b/yoko-verify/src/test/java-testify/org/apache/yoko/UtfStringsTest.java
index fb66e0443..8eebe22f7 100644
--- a/yoko-verify/src/test/java-testify/org/apache/yoko/UtfStringsTest.java
+++ b/yoko-verify/src/test/java-testify/org/apache/yoko/UtfStringsTest.java
@@ -18,22 +18,26 @@
package org.apache.yoko;
import org.apache.yoko.io.ReadBuffer;
-import org.apache.yoko.orb.CORBA.YokoInputStream;
import org.apache.yoko.orb.CORBA.ORB;
+import org.apache.yoko.orb.CORBA.YokoInputStream;
import org.apache.yoko.orb.CORBA.YokoOutputStream;
-import org.apache.yoko.orb.OB.CodeConverters;
+import org.apache.yoko.orb.OB.CodecPair;
import org.apache.yoko.orb.OB.ORBInstance;
+import org.apache.yoko.util.yasf.YasfThreadLocal;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import java.util.EnumSet;
import java.util.function.Consumer;
import java.util.stream.Stream;
+import static java.util.EnumSet.complementOf;
import static org.apache.yoko.orb.OB.CodeSetInfo.UTF_16;
import static org.apache.yoko.orb.OB.CodeSetInfo.UTF_8;
import static org.apache.yoko.orb.OCI.GiopVersion.GIOP1_2;
+import static org.apache.yoko.util.yasf.Yasf.WRITE_UTF8_AS_UTF8;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
import static testify.hex.HexBuilder.buildHex;
@@ -43,183 +47,223 @@
class UtfStringsTest {
static Stream unicodeTestStrings() {
return Stream.of(
- // Basic ASCII
- Arguments.of(
- "Basic ASCII greeting",
- "Hello, World!",
- "0000000e 48656c6c 6f2c2057 6f726c64 2100",
- "0000001a 00480065 006c006c 006f002c 00200057 006f0072 006c0064 0021"
- ),
- Arguments.of(
- "ASCII digits",
- "0123456789",
- "0000000b 30313233 34353637 383900",
- "00000014 00300031 00320033 00340035 00360037 00380039"
- ),
- // Latin Extended
- Arguments.of(
- "Latin extended characters",
- "Caf\u00e9 r\u00e9sum\u00e9",
- "0000000f 436166c3 a92072c3 a973756d c3a900",
- "00000016 00430061 006600e9 00200072 00e90073 0075006d 00e9"
- ),
- Arguments.of(
- "German umlaut",
- "Z\u00fcrich",
- "00000008 5ac3bc72 69636800",
- "0000000c 005a00fc 00720069 00630068"
- ),
- // Cyrillic
- Arguments.of(
- "Cyrillic - Privet (Hello)",
- "\u041f\u0440\u0438\u0432\u0435\u0442",
- "0000000d d09fd180 d0b8d0b2 d0b5d182 00",
- "0000000c 041f0440 04380432 04350442"
- ),
- // Greek
- Arguments.of(
- "Greek - Geia (Hello)",
- "\u0393\u03b5\u03b9\u03b1",
- "00000009 ce93ceb5 ceb9ceb1 00",
- "00000008 039303b5 03b903b1"
- ),
- // CJK
- Arguments.of(
- "Chinese - Ni hao (Hello)",
- "\u4f60\u597d",
- "00000007 e4bda0e5 a5bd00",
- "00000004 4f60597d"
- ),
- Arguments.of(
- "Japanese - Konnichiwa (Hello)",
- "\u3053\u3093\u306b\u3061\u306f",
- "00000010 e38193e3 8293e381 abe381a1 e381af00",
- "0000000a 30533093 306b3061 306f"
- ),
- Arguments.of(
- "Korean - Annyeong (Hello)",
- "\uc548\ub155",
- "00000007 ec9588eb 859500",
- "00000004 c548b155"
- ),
- // Arabic (RTL)
- Arguments.of(
- "Arabic RTL - Marhaba (Hello)",
- "\u0645\u0631\u062d\u0628\u0627",
- "0000000b d985d8b1 d8add8a8 d8a700",
- "0000000a 06450631 062d0628 0627"
- ),
- // Hebrew (RTL)
- Arguments.of(
- "Hebrew RTL - Shalom (Hello)",
- "\u05e9\u05dc\u05d5\u05dd",
- "00000009 d7a9d79c d795d79d 00",
- "00000008 05e905dc 05d505dd"
- ),
- // Emoji (surrogate pairs)
- Arguments.of(
- "Emoji - waving hand",
- "\ud83d\udc4b",
- "00000007 eda0bded b18b00",
- "00000004 d83ddc4b"
- ),
- Arguments.of(
- "Emoji - globe",
- "\ud83c\udf0d",
- "00000007 eda0bced bc8d00",
- "00000004 d83cdf0d"
- ),
- // Mathematical symbols
- Arguments.of(
- "Math symbols - sum, infinity, approximately",
- "\u2211\u221e\u2248",
- "0000000a e28891e2 889ee289 8800",
- "00000006 2211221e 2248"
- ),
- // Edge cases
- Arguments.of(
- "Empty string",
- "",
- "00000001 00",
- "00000000"
- ),
- Arguments.of(
- "First non-ASCII character",
- "\u0080",
- "00000003 c28000",
- "00000002 0080"
- ),
- Arguments.of(
- "Last BMP character",
- "\uffff",
- "00000004 efbfbf00",
- "00000002 ffff"
- ),
- // Mixed content
- Arguments.of(
- "Mixed - Euro symbol",
- "Price: \u20ac50",
- "0000000d 50726963 653a20e2 82ac3530 00",
- "00000014 00500072 00690063 0065003a 002020ac 00350030"
- ),
- Arguments.of(
- "Mixed - degree symbol",
- "Temp: 25\u00b0C",
- "0000000c 54656d70 3a203235 c2b04300",
- "00000014 00540065 006d0070 003a0020 00320035 00b00043"
- ),
- // Normalization test
- Arguments.of(
- "Normalization - precomposed e-acute",
- "caf\u00e9",
- "00000006 636166c3 a900",
- "00000008 00630061 006600e9"
- ),
- Arguments.of(
- "Normalization - e + combining acute",
- "cafe\u0301",
- "00000007 63616665 cc8100",
- "0000000a 00630061 00660065 0301"
- ),
- // Zero-width
- Arguments.of(
- "Zero-width space",
- "Hello\u200bWorld",
- "0000000e 48656c6c 6fe2808b 576f726c 6400",
- "00000016 00480065 006c006c 006f200b 0057006f 0072006c 0064"
- )
+ // Basic ASCII
+ Arguments.of(
+ "Basic ASCII greeting",
+ "Hello, World!",
+ "0000000e 48656c6c 6f2c2057 6f726c64 2100",
+ "0000001a 00480065 006c006c 006f002c 00200057 006f0072 006c0064 0021"
+ ),
+ Arguments.of(
+ "ASCII digits",
+ "0123456789",
+ "0000000b 30313233 34353637 383900",
+ "00000014 00300031 00320033 00340035 00360037 00380039"
+ ),
+ // Latin Extended
+ Arguments.of(
+ "Latin extended characters",
+ "Caf\u00e9 r\u00e9sum\u00e9",
+ "0000000f 436166c3 a92072c3 a973756d c3a900",
+ "00000016 00430061 006600e9 00200072 00e90073 0075006d 00e9"
+ ),
+ Arguments.of(
+ "German umlaut",
+ "Z\u00fcrich",
+ "00000008 5ac3bc72 69636800",
+ "0000000c 005a00fc 00720069 00630068"
+ ),
+ // Cyrillic
+ Arguments.of(
+ "Cyrillic - Privet (Hello)",
+ "\u041f\u0440\u0438\u0432\u0435\u0442",
+ "0000000d d09fd180 d0b8d0b2 d0b5d182 00",
+ "0000000c 041f0440 04380432 04350442"
+ ),
+ // Greek
+ Arguments.of(
+ "Greek - Geia (Hello)",
+ "\u0393\u03b5\u03b9\u03b1",
+ "00000009 ce93ceb5 ceb9ceb1 00",
+ "00000008 039303b5 03b903b1"
+ ),
+ // CJK
+ Arguments.of(
+ "Chinese - Ni hao (Hello)",
+ "\u4f60\u597d",
+ "00000007 e4bda0e5 a5bd00",
+ "00000004 4f60597d"
+ ),
+ Arguments.of(
+ "Japanese - Konnichiwa (Hello)",
+ "\u3053\u3093\u306b\u3061\u306f",
+ "00000010 e38193e3 8293e381 abe381a1 e381af00",
+ "0000000a 30533093 306b3061 306f"
+ ),
+ Arguments.of(
+ "Korean - Annyeong (Hello)",
+ "\uc548\ub155",
+ "00000007 ec9588eb 859500",
+ "00000004 c548b155"
+ ),
+ // Arabic (RTL)
+ Arguments.of(
+ "Arabic RTL - Marhaba (Hello)",
+ "\u0645\u0631\u062d\u0628\u0627",
+ "0000000b d985d8b1 d8add8a8 d8a700",
+ "0000000a 06450631 062d0628 0627"
+ ),
+ // Hebrew (RTL)
+ Arguments.of(
+ "Hebrew RTL - Shalom (Hello)",
+ "\u05e9\u05dc\u05d5\u05dd",
+ "00000009 d7a9d79c d795d79d 00",
+ "00000008 05e905dc 05d505dd"
+ ),
+ // Mathematical symbols
+ Arguments.of(
+ "Math symbols - sum, infinity, approximately",
+ "\u2211\u221e\u2248",
+ "0000000a e28891e2 889ee289 8800",
+ "00000006 2211221e 2248"
+ ),
+ // Edge cases
+ Arguments.of(
+ "Empty string",
+ "",
+ "00000001 00",
+ "00000000"
+ ),
+ Arguments.of(
+ "First non-ASCII character",
+ "\u0080",
+ "00000003 c28000",
+ "00000002 0080"
+ ),
+ Arguments.of(
+ "Last BMP character",
+ "\uffff",
+ "00000004 efbfbf00",
+ "00000002 ffff"
+ ),
+ // Mixed content
+ Arguments.of(
+ "Mixed - Euro symbol",
+ "Price: \u20ac50",
+ "0000000d 50726963 653a20e2 82ac3530 00",
+ "00000014 00500072 00690063 0065003a 002020ac 00350030"
+ ),
+ Arguments.of(
+ "Mixed - degree symbol",
+ "Temp: 25\u00b0C",
+ "0000000c 54656d70 3a203235 c2b04300",
+ "00000014 00540065 006d0070 003a0020 00320035 00b00043"
+ ),
+ // Normalization test
+ Arguments.of(
+ "Normalization - precomposed e-acute",
+ "caf\u00e9",
+ "00000006 636166c3 a900",
+ "00000008 00630061 006600e9"
+ ),
+ Arguments.of(
+ "Normalization - e + combining acute",
+ "cafe\u0301",
+ "00000007 63616665 cc8100",
+ "0000000a 00630061 00660065 0301"
+ ),
+ // Zero-width
+ Arguments.of(
+ "Zero-width space",
+ "Hello\u200bWorld",
+ "0000000e 48656c6c 6fe2808b 576f726c 6400",
+ "00000016 00480065 006c006c 006f200b 0057006f 0072006c 0064"
+ )
);
}
- static YokoOutputStream newUtfSpecificOutputStream() {
- ORB orb = (ORB) ORB.init((String[]) null, null);
- ORBInstance orbInst = orb._OB_ORBInstance();
- CodeConverters codeConverters = CodeConverters.create(orbInst, UTF_8.id, UTF_16.id);
- return new YokoOutputStream(codeConverters, GIOP1_2);
- }
-
@ParameterizedTest(name = "{0}")
@MethodSource("unicodeTestStrings")
- void writeUtf8String(String description, String text, String utf8Hex, String utf16Hex) {
+ void writeUtf8(String description, String text, String utf8Hex, String utf16Hex) {
checkWrittenForm(o -> o.write_string(text), utf8Hex);
}
@ParameterizedTest(name = "{0}")
@MethodSource("unicodeTestStrings")
- void readUtf8String(String description, String expectedText, String utf8Hex, String utf16Hex) {
+ void readUtf8(String description, String expectedText, String utf8Hex, String utf16Hex) {
String actualText = writeHex(utf8Hex).read_string();
assertEquals(expectedText, actualText);
}
@ParameterizedTest(name = "{0}")
@MethodSource("unicodeTestStrings")
- void writeUtf16Wstring(String description, String text, String utf8Hex, String utf16Hex) {
+ void writeUtf16(String description, String text, String utf8Hex, String utf16Hex) {
checkWrittenForm(o -> o.write_wstring(text), utf16Hex);
}
@ParameterizedTest(name = "{0}")
@MethodSource("unicodeTestStrings")
- void readUtf16String(String description, String expectedText, String utf8Hex, String utf16Hex) {
+ void readUtf16(String description, String expectedText, String utf8Hex, String utf16Hex) {
+ String actualText = writeHex(utf16Hex).read_wstring();
+ assertEquals(expectedText, actualText);
+ }
+
+ static Stream unicodeSupplementaryTestStrings() {
+ return Stream.of(
+ // Emoji (surrogate pairs)
+ Arguments.of(
+ "Emoji - waving hand",
+ "\ud83d\udc4b",
+ "00000005 f09f918b 00",
+ "00000007 eda0bded b18b00",
+ "00000004 d83ddc4b"
+ ),
+ Arguments.of(
+ "Emoji - globe",
+ "\ud83c\udf0d",
+ "00000005 f09f8c8d 00",
+ "00000007 eda0bced bc8d00",
+ "00000004 d83cdf0d"
+ ));
+ }
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("unicodeSupplementaryTestStrings")
+ void writeUtf8(String description, String text, String utf8Hex, String cesu8Hex, String utf16Hex) {
+ checkWrittenForm(o -> o.write_string(text), utf8Hex);
+ }
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("unicodeSupplementaryTestStrings")
+ void readUtf8(String description, String expectedText, String utf8Hex, String cesu8Hex, String utf16Hex) {
+ String actualText = writeHex(utf8Hex).read_string();
+ assertEquals(expectedText, actualText);
+ }
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("unicodeSupplementaryTestStrings")
+ void writeCesu8(String description, String text, String utf8Hex, String cesu8Hex, String utf16Hex) {
+ YasfThreadLocal.push(complementOf(EnumSet.of(WRITE_UTF8_AS_UTF8)));
+ try { checkWrittenForm(o -> o.write_string(text), cesu8Hex); }
+ finally { YasfThreadLocal.pop(); }
+ }
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("unicodeSupplementaryTestStrings")
+ void readCesu8(String description, String expectedText, String utf8Hex, String cesu8Hex, String utf16Hex) {
+ String actualText = writeHex(cesu8Hex).read_string();
+ assertEquals(expectedText, actualText);
+ }
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("unicodeSupplementaryTestStrings")
+ void writeUtf16(String description, String text, String utf8Hex, String cesu8Hex, String utf16Hex) {
+ checkWrittenForm(o -> o.write_wstring(text), utf16Hex);
+ }
+
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("unicodeSupplementaryTestStrings")
+ void readUtf16(String description, String expectedText, String utf8Hex, String cesu8Hex, String utf16Hex) {
String actualText = writeHex(utf16Hex).read_wstring();
assertEquals(expectedText, actualText);
}
@@ -248,4 +292,11 @@ static void checkWrittenForm(Consumer writeTextTo, String expe
assertEquals(expectedHex, actualHex);
}
}
+
+ static YokoOutputStream newUtfSpecificOutputStream() {
+ ORB orb = (ORB) ORB.init((String[]) null, null);
+ ORBInstance orbInst = orb._OB_ORBInstance();
+ CodecPair codecs = CodecPair.create(UTF_8.id, UTF_16.id);
+ return new YokoOutputStream(codecs, GIOP1_2);
+ }
}
diff --git a/yoko-verify/src/test/java/test/codesets/TestCodeSets.idl b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSets.idl
similarity index 100%
rename from yoko-verify/src/test/java/test/codesets/TestCodeSets.idl
rename to yoko-verify/src/test/java-testify/test/codesets/TestCodeSets.idl
diff --git a/yoko-verify/src/test/java/test/codesets/TestCodeSets.java b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSets.java
similarity index 100%
rename from yoko-verify/src/test/java/test/codesets/TestCodeSets.java
rename to yoko-verify/src/test/java-testify/test/codesets/TestCodeSets.java
diff --git a/yoko-verify/src/test/java/test/codesets/TestCodeSetsHelper.java b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsHelper.java
similarity index 100%
rename from yoko-verify/src/test/java/test/codesets/TestCodeSetsHelper.java
rename to yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsHelper.java
diff --git a/yoko-verify/src/test/java/test/codesets/TestCodeSetsHolder.java b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsHolder.java
similarity index 100%
rename from yoko-verify/src/test/java/test/codesets/TestCodeSetsHolder.java
rename to yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsHolder.java
diff --git a/yoko-verify/src/test/java/test/codesets/TestCodeSetsOperations.java b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsOperations.java
similarity index 100%
rename from yoko-verify/src/test/java/test/codesets/TestCodeSetsOperations.java
rename to yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsOperations.java
diff --git a/yoko-verify/src/test/java/test/codesets/TestCodeSetsPOA.java b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsPOA.java
similarity index 100%
rename from yoko-verify/src/test/java/test/codesets/TestCodeSetsPOA.java
rename to yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsPOA.java
diff --git a/yoko-verify/src/test/java/test/codesets/TestCodeSetsPOATie.java b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsPOATie.java
similarity index 100%
rename from yoko-verify/src/test/java/test/codesets/TestCodeSetsPOATie.java
rename to yoko-verify/src/test/java-testify/test/codesets/TestCodeSetsPOATie.java
diff --git a/yoko-verify/src/test/java/test/codesets/TestCodeSets_impl.java b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSets_impl.java
similarity index 79%
rename from yoko-verify/src/test/java/test/codesets/TestCodeSets_impl.java
rename to yoko-verify/src/test/java-testify/test/codesets/TestCodeSets_impl.java
index bf9c32be9..3fdd2e3da 100644
--- a/yoko-verify/src/test/java/test/codesets/TestCodeSets_impl.java
+++ b/yoko-verify/src/test/java-testify/test/codesets/TestCodeSets_impl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,10 +17,12 @@
*/
package test.codesets;
-class TestCodeSets_impl extends TestCodeSetsPOA {
- private org.omg.CORBA.ORB orb_;
+import org.omg.CORBA.ORB;
- TestCodeSets_impl(org.omg.CORBA.ORB orb) {
+public class TestCodeSets_impl extends TestCodeSetsPOA {
+ private ORB orb_;
+
+ public TestCodeSets_impl(ORB orb) {
orb_ = orb;
}
@@ -41,6 +43,6 @@ public String testWString(String ws) {
}
public void deactivate() {
- orb_.shutdown(false);
+ if (null != orb_) orb_.shutdown(false);
}
}
diff --git a/yoko-verify/src/test/java/test/codesets/_TestCodeSetsStub.java b/yoko-verify/src/test/java-testify/test/codesets/_TestCodeSetsStub.java
similarity index 100%
rename from yoko-verify/src/test/java/test/codesets/_TestCodeSetsStub.java
rename to yoko-verify/src/test/java-testify/test/codesets/_TestCodeSetsStub.java
diff --git a/yoko-verify/src/test/java/ORBTest/Server.java b/yoko-verify/src/test/java/ORBTest/Server.java
index 553b218a4..b65e7201a 100644
--- a/yoko-verify/src/test/java/ORBTest/Server.java
+++ b/yoko-verify/src/test/java/ORBTest/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
*/
package ORBTest;
+import java.io.FileOutputStream;
+import java.io.PrintWriter;
import java.util.Properties;
import org.omg.CORBA.*;
import org.omg.PortableServer.*;
@@ -24,8 +26,7 @@
public class Server {
private static final String refFile = "TestIntf.ref";
- public static int run(ORB orb, boolean nonBlocking, String[] args)
- throws org.omg.CORBA.UserException {
+ public static int run(ORB orb, boolean nonBlocking, String[] args) throws UserException {
//
// Resolve Root POA
//
@@ -51,11 +52,11 @@ public static int run(ORB orb, boolean nonBlocking, String[] args)
// not being ready yet.
//
try {
- java.io.FileOutputStream file = new java.io.FileOutputStream(
- refFile);
- java.io.PrintWriter out = new java.io.PrintWriter(file);
+ FileOutputStream file = new FileOutputStream(refFile);
+ PrintWriter out = new PrintWriter(file);
out.println(impl);
out.flush();
+ file.getFD().sync();
file.close();
} catch (java.io.IOException ex) {
System.err.println("Can't write to `" + ex.getMessage() + "'");
diff --git a/yoko-verify/src/test/java/org/apache/yoko/CodeSetTest.java b/yoko-verify/src/test/java/org/apache/yoko/CodeSetTest.java
deleted file mode 100644
index afc4feab5..000000000
--- a/yoko-verify/src/test/java/org/apache/yoko/CodeSetTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2019 IBM Corporation and others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an \"AS IS\" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.apache.yoko;
-
-import test.codesets.Client;
-import test.codesets.Server;
-
-public class CodeSetTest extends AbstractOrbTestBase {
- private static final Class SERVER_CLASS = Server.class;
- private static final Class CLIENT_CLASS = Client.class;
- private static final String OUTPUT_FILE = "TestCodeSets.ref";
-
- public void setUp() throws Exception {
- super.setUp();
- setWaitForFile(OUTPUT_FILE);
- }
-
- public void testStandardCodeSet() throws Exception {
- runServerClientTest(SERVER_CLASS, CLIENT_CLASS);
- }
-
- public void testStandardCodeSet_11() throws Exception {
- runServerClientTest(SERVER_CLASS, new String[] {"-OAversion", "1.1"}, CLIENT_CLASS, new String[0]);
- }
-
- public void testCodeSet8859_5() throws Exception {
- String[] args = {"-ORBnative_cs", "ISO/IEC", "8859-5" };
- runServerClientTest(SERVER_CLASS, args, CLIENT_CLASS, args);
- }
-
- public void testCodeSet8859_5_11() throws Exception {
- runServerClientTest(SERVER_CLASS, new String[] {"-ORBnative_cs", "ISO/IEC", "8859-5"},
- CLIENT_CLASS, new String[] {"-ORBnative_cs", "ISO/IEC", "8859-5", "-OAversion", "1.1" });
- }
-
- public void testCodeSet8859_1_vs_8859_4() throws Exception {
- runServerClientTest(SERVER_CLASS, new String[] {"-ORBnative_cs", "ISO/IEC", "8859-4"},
- CLIENT_CLASS, new String[] {"-ORBnative_cs", "ISO/IEC", "8859-1" });
- }
-
- public void testCodeSet8859_1_vs_8859_4_11() throws Exception {
- runServerClientTest(SERVER_CLASS, new String[] {"-ORBnative_cs", "ISO/IEC", "8859-4", "-OAversion", "1.1"},
- CLIENT_CLASS, new String[] {"-ORBnative_cs", "ISO/IEC", "8859-1"});
- }
-}
diff --git a/yoko-verify/src/test/java/org/apache/yoko/orb/OB/ConversionWidthsTest.java b/yoko-verify/src/test/java/org/apache/yoko/orb/OB/ConversionWidthsTest.java
deleted file mode 100644
index ed73812a2..000000000
--- a/yoko-verify/src/test/java/org/apache/yoko/orb/OB/ConversionWidthsTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2020 IBM Corporation and others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an \"AS IS\" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.apache.yoko.orb.OB;
-
-import org.junit.jupiter.api.Test;
-
-import java.nio.charset.StandardCharsets;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class ConversionWidthsTest {
- static final char[] testData = { '\u0000', '\u007f', '\u0080', '\u07ff', '\u0800', '\uffff' };
-
- @Test
- public void testUTF8ConversionWidths() {
- UTF8Writer writer = new UTF8Writer();
- for (char c: testData) {
- assertEquals(StandardCharsets.UTF_8.encode(Character.toString(c)).remaining(), writer.count_wchar(c),
- () -> String.format("Mismatch width for character '\\u%04x'", (int)c));
- }
- }
-}
diff --git a/yoko-verify/src/test/java/org/apache/yoko/orb/OB/TestCharMapConversions.java b/yoko-verify/src/test/java/org/apache/yoko/orb/OB/TestCharMapConversions.java
deleted file mode 100644
index a4287d723..000000000
--- a/yoko-verify/src/test/java/org/apache/yoko/orb/OB/TestCharMapConversions.java
+++ /dev/null
@@ -1,669 +0,0 @@
-/*
- * Copyright 2019 IBM Corporation and others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an \"AS IS\" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.apache.yoko.orb.OB;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.util.BitSet;
-import java.util.EnumMap;
-
-import static org.apache.yoko.orb.OB.CharMapInfo.CM_IDENTITY;
-import static org.apache.yoko.orb.OB.CharMapInfo.CM_8859_2;
-import static org.apache.yoko.orb.OB.CharMapInfo.CM_8859_3;
-import static org.apache.yoko.orb.OB.CharMapInfo.CM_8859_4;
-import static org.apache.yoko.orb.OB.CharMapInfo.CM_8859_5;
-import static org.apache.yoko.orb.OB.CharMapInfo.CM_8859_7;
-import static org.apache.yoko.orb.OB.CharMapInfo.CM_8859_9;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
-/**
- * This test was developed from an older implementation of CharMapInfo and its now deleted adjunct "database" class.
- * This was done to ensure that none of the character conversions was changed during refactoring.
- *
- * The values tested may be incorrect, since this test was developed to preserve behaviour.
- * The reader is encouraged to correct any errors found and document them here.
- */
-public class TestCharMapConversions {
- private static final EnumMap auditLog = new EnumMap<>(CharMapInfo.class);
-
- @BeforeClass
- public static void clearAudit() {
- for (CharMapInfo cmi: CharMapInfo.values()) auditLog.put(cmi, new BitSet());
- }
-
- private static void logCharTested(CharMapInfo cmi, int otherChar) {
- auditLog.get(cmi).set(otherChar);
- }
-
- @AfterClass
- public static void checkAllCasesWereCovered() {
- // every enum member should have been tested with every possible character
- BitSet expected = new BitSet();
- expected.set(Character.MIN_VALUE, Character.MAX_VALUE);
- expected.set(Character.MAX_VALUE);
- for (CharMapInfo cmi : CharMapInfo.values()) {
- BitSet actual = auditLog.get(cmi);
- actual.xor(expected);
- assertThat(cmi + " should have had all its char conversions tested", actual, is(new BitSet()));
- }
- }
-
- private void assertConversion(CharMapInfo cmi, int otherChar, int javaChar) {
- logCharTested(cmi, otherChar);
- String msg = String.format("%s char %x should map to Java char %x", cmi, otherChar, javaChar);
- assertThat(msg, cmi.convertToJava((char)otherChar), is((char)javaChar));
- if (javaChar == 0) return;
- msg = String.format("Java char %x should map to %s char %x", javaChar, cmi, otherChar);
- assertThat(msg, cmi.convertFromJava((char)javaChar), is((char)otherChar));
- }
-
- private void assertNoConversion(CharMapInfo cmi) {
- assertNoConversion(cmi, Character.MIN_VALUE, Character.MAX_VALUE);
- }
-
- private void assertNoConversionBefore(CharMapInfo cmi, int limit) {
- assertNoConversion(cmi, Character.MIN_VALUE, limit - 1);
- }
-
- private void assertNoConversionAfter(CharMapInfo cmi, int limit) {
- assertNoConversion(cmi, limit + 1, Character.MAX_VALUE);
- }
-
- private void assertNoConversion(CharMapInfo cmi, int startChar, int endChar) {
- for (int i = startChar; i <= endChar; i++) {
- logCharTested(cmi, i);
- String msg = String.format("%s char %x should map to Java char %x", cmi, i, i);
- assertThat(msg, cmi.convertToJava((char) i), is((char) i));
- final int i2 = cmi.convertFromJava((char) i);
- if (i2 < startChar) {
- // just check that javaChar2 converts to i again
- msg = String.format("%s char %x should map to Java char %x", cmi, i2, i);
- assertThat(msg, cmi.convertToJava((char) i2), is((char) i));
- } else {
- msg = String.format("Java char %x should map to %s char %x", i, cmi, i);
- assertThat(msg, i2, is(i));
- }
- }
- }
-
-
- @Test
- public void test1() {
- assertNoConversion(CM_IDENTITY);
- }
-
- @Test
- public void test2() {
- assertNoConversionBefore(CM_8859_2, 0x00a1);
- assertConversion(CM_8859_2, 0x00a1, 0x0104);
- assertConversion(CM_8859_2, 0x00a2, 0x02d8);
- assertConversion(CM_8859_2, 0x00a3, 0x0141);
- assertConversion(CM_8859_2, 0x00a4, 0x00a4);
- assertConversion(CM_8859_2, 0x00a5, 0x013d);
- assertConversion(CM_8859_2, 0x00a6, 0x015a);
- assertConversion(CM_8859_2, 0x00a7, 0x00a7);
- assertConversion(CM_8859_2, 0x00a8, 0x00a8);
- assertConversion(CM_8859_2, 0x00a9, 0x0160);
- assertConversion(CM_8859_2, 0x00aa, 0x015e);
- assertConversion(CM_8859_2, 0x00ab, 0x0164);
- assertConversion(CM_8859_2, 0x00ac, 0x0179);
- assertConversion(CM_8859_2, 0x00ad, 0x00ad);
- assertConversion(CM_8859_2, 0x00ae, 0x017d);
- assertConversion(CM_8859_2, 0x00af, 0x017b);
- assertConversion(CM_8859_2, 0x00b0, 0x00b0);
- assertConversion(CM_8859_2, 0x00b1, 0x0105);
- assertConversion(CM_8859_2, 0x00b2, 0x02db);
- assertConversion(CM_8859_2, 0x00b3, 0x0142);
- assertConversion(CM_8859_2, 0x00b4, 0x00b4);
- assertConversion(CM_8859_2, 0x00b5, 0x013e);
- assertConversion(CM_8859_2, 0x00b6, 0x015b);
- assertConversion(CM_8859_2, 0x00b7, 0x02c7);
- assertConversion(CM_8859_2, 0x00b8, 0x00b8);
- assertConversion(CM_8859_2, 0x00b9, 0x0161);
- assertConversion(CM_8859_2, 0x00ba, 0x015f);
- assertConversion(CM_8859_2, 0x00bb, 0x0165);
- assertConversion(CM_8859_2, 0x00bc, 0x017a);
- assertConversion(CM_8859_2, 0x00bd, 0x02dd);
- assertConversion(CM_8859_2, 0x00be, 0x017e);
- assertConversion(CM_8859_2, 0x00bf, 0x017c);
- assertConversion(CM_8859_2, 0x00c0, 0x0154);
- assertConversion(CM_8859_2, 0x00c1, 0x00c1);
- assertConversion(CM_8859_2, 0x00c2, 0x00c2);
- assertConversion(CM_8859_2, 0x00c3, 0x0102);
- assertConversion(CM_8859_2, 0x00c4, 0x00c4);
- assertConversion(CM_8859_2, 0x00c5, 0x0139);
- assertConversion(CM_8859_2, 0x00c6, 0x0106);
- assertConversion(CM_8859_2, 0x00c7, 0x00c7);
- assertConversion(CM_8859_2, 0x00c8, 0x010c);
- assertConversion(CM_8859_2, 0x00c9, 0x00c9);
- assertConversion(CM_8859_2, 0x00ca, 0x0118);
- assertConversion(CM_8859_2, 0x00cb, 0x00cb);
- assertConversion(CM_8859_2, 0x00cc, 0x011a);
- assertConversion(CM_8859_2, 0x00cd, 0x00cd);
- assertConversion(CM_8859_2, 0x00ce, 0x00ce);
- assertConversion(CM_8859_2, 0x00cf, 0x010e);
- assertConversion(CM_8859_2, 0x00d0, 0x0110);
- assertConversion(CM_8859_2, 0x00d1, 0x0143);
- assertConversion(CM_8859_2, 0x00d2, 0x0147);
- assertConversion(CM_8859_2, 0x00d3, 0x00d3);
- assertConversion(CM_8859_2, 0x00d4, 0x00d4);
- assertConversion(CM_8859_2, 0x00d5, 0x0150);
- assertConversion(CM_8859_2, 0x00d6, 0x00d6);
- assertConversion(CM_8859_2, 0x00d7, 0x00d7);
- assertConversion(CM_8859_2, 0x00d8, 0x0158);
- assertConversion(CM_8859_2, 0x00d9, 0x016e);
- assertConversion(CM_8859_2, 0x00da, 0x00da);
- assertConversion(CM_8859_2, 0x00db, 0x0170);
- assertConversion(CM_8859_2, 0x00dc, 0x00dc);
- assertConversion(CM_8859_2, 0x00dd, 0x00dd);
- assertConversion(CM_8859_2, 0x00de, 0x0162);
- assertConversion(CM_8859_2, 0x00df, 0x00df);
- assertConversion(CM_8859_2, 0x00e0, 0x0155);
- assertConversion(CM_8859_2, 0x00e1, 0x00e1);
- assertConversion(CM_8859_2, 0x00e2, 0x00e2);
- assertConversion(CM_8859_2, 0x00e3, 0x0103);
- assertConversion(CM_8859_2, 0x00e4, 0x00e4);
- assertConversion(CM_8859_2, 0x00e5, 0x013a);
- assertConversion(CM_8859_2, 0x00e6, 0x0107);
- assertConversion(CM_8859_2, 0x00e7, 0x00e7);
- assertConversion(CM_8859_2, 0x00e8, 0x010d);
- assertConversion(CM_8859_2, 0x00e9, 0x00e9);
- assertConversion(CM_8859_2, 0x00ea, 0x0119);
- assertConversion(CM_8859_2, 0x00eb, 0x00eb);
- assertConversion(CM_8859_2, 0x00ec, 0x011b);
- assertConversion(CM_8859_2, 0x00ed, 0x00ed);
- assertConversion(CM_8859_2, 0x00ee, 0x00ee);
- assertConversion(CM_8859_2, 0x00ef, 0x010f);
- assertConversion(CM_8859_2, 0x00f0, 0x0111);
- assertConversion(CM_8859_2, 0x00f1, 0x0144);
- assertConversion(CM_8859_2, 0x00f2, 0x0148);
- assertConversion(CM_8859_2, 0x00f3, 0x00f3);
- assertConversion(CM_8859_2, 0x00f4, 0x00f4);
- assertConversion(CM_8859_2, 0x00f5, 0x0151);
- assertConversion(CM_8859_2, 0x00f6, 0x00f6);
- assertConversion(CM_8859_2, 0x00f7, 0x00f7);
- assertConversion(CM_8859_2, 0x00f8, 0x0159);
- assertConversion(CM_8859_2, 0x00f9, 0x016f);
- assertConversion(CM_8859_2, 0x00fa, 0x00fa);
- assertConversion(CM_8859_2, 0x00fb, 0x0171);
- assertConversion(CM_8859_2, 0x00fc, 0x00fc);
- assertConversion(CM_8859_2, 0x00fd, 0x00fd);
- assertConversion(CM_8859_2, 0x00fe, 0x0163);
- assertConversion(CM_8859_2, 0x00ff, 0x02d9);
- assertNoConversionAfter(CM_8859_2, 0x00ff);
- }
-
- @Test
- public void test3() {
- assertNoConversionBefore(CM_8859_3, 0x00a1);
- assertConversion(CM_8859_3, 0x00a1, 0x0126);
- assertConversion(CM_8859_3, 0x00a2, 0x02d8);
- assertConversion(CM_8859_3, 0x00a3, 0x00a3);
- assertConversion(CM_8859_3, 0x00a4, 0x00a4);
- assertConversion(CM_8859_3, 0x00a5, 0x0000);
- assertConversion(CM_8859_3, 0x00a6, 0x0124);
- assertConversion(CM_8859_3, 0x00a7, 0x00a7);
- assertConversion(CM_8859_3, 0x00a8, 0x00a8);
- assertConversion(CM_8859_3, 0x00a9, 0x0130);
- assertConversion(CM_8859_3, 0x00aa, 0x015e);
- assertConversion(CM_8859_3, 0x00ab, 0x011e);
- assertConversion(CM_8859_3, 0x00ac, 0x0134);
- assertConversion(CM_8859_3, 0x00ad, 0x00ad);
- assertConversion(CM_8859_3, 0x00ae, 0x0000);
- assertConversion(CM_8859_3, 0x00af, 0x017b);
- assertConversion(CM_8859_3, 0x00b0, 0x00b0);
- assertConversion(CM_8859_3, 0x00b1, 0x0127);
- assertConversion(CM_8859_3, 0x00b2, 0x00b2);
- assertConversion(CM_8859_3, 0x00b3, 0x00b3);
- assertConversion(CM_8859_3, 0x00b4, 0x00b4);
- assertConversion(CM_8859_3, 0x00b5, 0x00b5);
- assertConversion(CM_8859_3, 0x00b6, 0x0125);
- assertConversion(CM_8859_3, 0x00b7, 0x00b7);
- assertConversion(CM_8859_3, 0x00b8, 0x00b8);
- assertConversion(CM_8859_3, 0x00b9, 0x0131);
- assertConversion(CM_8859_3, 0x00ba, 0x015f);
- assertConversion(CM_8859_3, 0x00bb, 0x011f);
- assertConversion(CM_8859_3, 0x00bc, 0x0135);
- assertConversion(CM_8859_3, 0x00bd, 0x00bd);
- assertConversion(CM_8859_3, 0x00be, 0x0000);
- assertConversion(CM_8859_3, 0x00bf, 0x017c);
- assertConversion(CM_8859_3, 0x00c0, 0x00c0);
- assertConversion(CM_8859_3, 0x00c1, 0x00c1);
- assertConversion(CM_8859_3, 0x00c2, 0x00c2);
- assertConversion(CM_8859_3, 0x00c3, 0x0000);
- assertConversion(CM_8859_3, 0x00c4, 0x00c4);
- assertConversion(CM_8859_3, 0x00c5, 0x010a);
- assertConversion(CM_8859_3, 0x00c6, 0x0108);
- assertConversion(CM_8859_3, 0x00c7, 0x00c7);
- assertConversion(CM_8859_3, 0x00c8, 0x00c8);
- assertConversion(CM_8859_3, 0x00c9, 0x00c9);
- assertConversion(CM_8859_3, 0x00ca, 0x00ca);
- assertConversion(CM_8859_3, 0x00cb, 0x00cb);
- assertConversion(CM_8859_3, 0x00cc, 0x00cc);
- assertConversion(CM_8859_3, 0x00cd, 0x00cd);
- assertConversion(CM_8859_3, 0x00ce, 0x00ce);
- assertConversion(CM_8859_3, 0x00cf, 0x00cf);
- assertConversion(CM_8859_3, 0x00d0, 0x0000);
- assertConversion(CM_8859_3, 0x00d1, 0x00d1);
- assertConversion(CM_8859_3, 0x00d2, 0x00d2);
- assertConversion(CM_8859_3, 0x00d3, 0x00d3);
- assertConversion(CM_8859_3, 0x00d4, 0x00d4);
- assertConversion(CM_8859_3, 0x00d5, 0x0120);
- assertConversion(CM_8859_3, 0x00d6, 0x00d6);
- assertConversion(CM_8859_3, 0x00d7, 0x00d7);
- assertConversion(CM_8859_3, 0x00d8, 0x011c);
- assertConversion(CM_8859_3, 0x00d9, 0x00d9);
- assertConversion(CM_8859_3, 0x00da, 0x00da);
- assertConversion(CM_8859_3, 0x00db, 0x00db);
- assertConversion(CM_8859_3, 0x00dc, 0x00dc);
- assertConversion(CM_8859_3, 0x00dd, 0x016c);
- assertConversion(CM_8859_3, 0x00de, 0x015c);
- assertConversion(CM_8859_3, 0x00df, 0x00df);
- assertConversion(CM_8859_3, 0x00e0, 0x00e0);
- assertConversion(CM_8859_3, 0x00e1, 0x00e1);
- assertConversion(CM_8859_3, 0x00e2, 0x00e2);
- assertConversion(CM_8859_3, 0x00e3, 0x0000);
- assertConversion(CM_8859_3, 0x00e4, 0x00e4);
- assertConversion(CM_8859_3, 0x00e5, 0x010b);
- assertConversion(CM_8859_3, 0x00e6, 0x0109);
- assertConversion(CM_8859_3, 0x00e7, 0x00e7);
- assertConversion(CM_8859_3, 0x00e8, 0x00e8);
- assertConversion(CM_8859_3, 0x00e9, 0x00e9);
- assertConversion(CM_8859_3, 0x00ea, 0x00ea);
- assertConversion(CM_8859_3, 0x00eb, 0x00eb);
- assertConversion(CM_8859_3, 0x00ec, 0x00ec);
- assertConversion(CM_8859_3, 0x00ed, 0x00ed);
- assertConversion(CM_8859_3, 0x00ee, 0x00ee);
- assertConversion(CM_8859_3, 0x00ef, 0x00ef);
- assertConversion(CM_8859_3, 0x00f0, 0x0000);
- assertConversion(CM_8859_3, 0x00f1, 0x00f1);
- assertConversion(CM_8859_3, 0x00f2, 0x00f2);
- assertConversion(CM_8859_3, 0x00f3, 0x00f3);
- assertConversion(CM_8859_3, 0x00f4, 0x00f4);
- assertConversion(CM_8859_3, 0x00f5, 0x0121);
- assertConversion(CM_8859_3, 0x00f6, 0x00f6);
- assertConversion(CM_8859_3, 0x00f7, 0x00f7);
- assertConversion(CM_8859_3, 0x00f8, 0x011d);
- assertConversion(CM_8859_3, 0x00f9, 0x00f9);
- assertConversion(CM_8859_3, 0x00fa, 0x00fa);
- assertConversion(CM_8859_3, 0x00fb, 0x00fb);
- assertConversion(CM_8859_3, 0x00fc, 0x00fc);
- assertConversion(CM_8859_3, 0x00fd, 0x016d);
- assertConversion(CM_8859_3, 0x00fe, 0x015d);
- assertConversion(CM_8859_3, 0x00ff, 0x02d9);
- assertNoConversionAfter(CM_8859_3, 0x00ff);
- }
-
- @Test
- public void test4() {
- assertNoConversionBefore(CM_8859_4, 0x00a1);
- assertConversion(CM_8859_4, 0x00a1, 0x0104);
- assertConversion(CM_8859_4, 0x00a2, 0x0138);
- assertConversion(CM_8859_4, 0x00a3, 0x0156);
- assertConversion(CM_8859_4, 0x00a4, 0x00a4);
- assertConversion(CM_8859_4, 0x00a5, 0x0128);
- assertConversion(CM_8859_4, 0x00a6, 0x013b);
- assertConversion(CM_8859_4, 0x00a7, 0x00a7);
- assertConversion(CM_8859_4, 0x00a8, 0x00a8);
- assertConversion(CM_8859_4, 0x00a9, 0x0160);
- assertConversion(CM_8859_4, 0x00aa, 0x0112);
- assertConversion(CM_8859_4, 0x00ab, 0x0122);
- assertConversion(CM_8859_4, 0x00ac, 0x0166);
- assertConversion(CM_8859_4, 0x00ad, 0x00ad);
- assertConversion(CM_8859_4, 0x00ae, 0x017d);
- assertConversion(CM_8859_4, 0x00af, 0x00af);
- assertConversion(CM_8859_4, 0x00b0, 0x00b0);
- assertConversion(CM_8859_4, 0x00b1, 0x0105);
- assertConversion(CM_8859_4, 0x00b2, 0x02db);
- assertConversion(CM_8859_4, 0x00b3, 0x0157);
- assertConversion(CM_8859_4, 0x00b4, 0x00b4);
- assertConversion(CM_8859_4, 0x00b5, 0x0129);
- assertConversion(CM_8859_4, 0x00b6, 0x013c);
- assertConversion(CM_8859_4, 0x00b7, 0x02c7);
- assertConversion(CM_8859_4, 0x00b8, 0x00b8);
- assertConversion(CM_8859_4, 0x00b9, 0x0161);
- assertConversion(CM_8859_4, 0x00ba, 0x0113);
- assertConversion(CM_8859_4, 0x00bb, 0x0123);
- assertConversion(CM_8859_4, 0x00bc, 0x0167);
- assertConversion(CM_8859_4, 0x00bd, 0x014a);
- assertConversion(CM_8859_4, 0x00be, 0x017e);
- assertConversion(CM_8859_4, 0x00bf, 0x014b);
- assertConversion(CM_8859_4, 0x00c0, 0x0100);
- assertConversion(CM_8859_4, 0x00c1, 0x00c1);
- assertConversion(CM_8859_4, 0x00c2, 0x00c2);
- assertConversion(CM_8859_4, 0x00c3, 0x00c3);
- assertConversion(CM_8859_4, 0x00c4, 0x00c4);
- assertConversion(CM_8859_4, 0x00c5, 0x00c5);
- assertConversion(CM_8859_4, 0x00c6, 0x00c6);
- assertConversion(CM_8859_4, 0x00c7, 0x012e);
- assertConversion(CM_8859_4, 0x00c8, 0x010c);
- assertConversion(CM_8859_4, 0x00c9, 0x00c9);
- assertConversion(CM_8859_4, 0x00ca, 0x0118);
- assertConversion(CM_8859_4, 0x00cb, 0x00cb);
- assertConversion(CM_8859_4, 0x00cc, 0x0116);
- assertConversion(CM_8859_4, 0x00cd, 0x00cd);
- assertConversion(CM_8859_4, 0x00ce, 0x00ce);
- assertConversion(CM_8859_4, 0x00cf, 0x012a);
- assertConversion(CM_8859_4, 0x00d0, 0x0110);
- assertConversion(CM_8859_4, 0x00d1, 0x0145);
- assertConversion(CM_8859_4, 0x00d2, 0x014c);
- assertConversion(CM_8859_4, 0x00d3, 0x0136);
- assertConversion(CM_8859_4, 0x00d4, 0x00d4);
- assertConversion(CM_8859_4, 0x00d5, 0x00d5);
- assertConversion(CM_8859_4, 0x00d6, 0x00d6);
- assertConversion(CM_8859_4, 0x00d7, 0x00d7);
- assertConversion(CM_8859_4, 0x00d8, 0x00d8);
- assertConversion(CM_8859_4, 0x00d9, 0x0172);
- assertConversion(CM_8859_4, 0x00da, 0x00da);
- assertConversion(CM_8859_4, 0x00db, 0x00db);
- assertConversion(CM_8859_4, 0x00dc, 0x00dc);
- assertConversion(CM_8859_4, 0x00dd, 0x0168);
- assertConversion(CM_8859_4, 0x00de, 0x016a);
- assertConversion(CM_8859_4, 0x00df, 0x00df);
- assertConversion(CM_8859_4, 0x00e0, 0x0101);
- assertConversion(CM_8859_4, 0x00e1, 0x00e1);
- assertConversion(CM_8859_4, 0x00e2, 0x00e2);
- assertConversion(CM_8859_4, 0x00e3, 0x00e3);
- assertConversion(CM_8859_4, 0x00e4, 0x00e4);
- assertConversion(CM_8859_4, 0x00e5, 0x00e5);
- assertConversion(CM_8859_4, 0x00e6, 0x00e6);
- assertConversion(CM_8859_4, 0x00e7, 0x012f);
- assertConversion(CM_8859_4, 0x00e8, 0x010d);
- assertConversion(CM_8859_4, 0x00e9, 0x00e9);
- assertConversion(CM_8859_4, 0x00ea, 0x0119);
- assertConversion(CM_8859_4, 0x00eb, 0x00eb);
- assertConversion(CM_8859_4, 0x00ec, 0x0117);
- assertConversion(CM_8859_4, 0x00ed, 0x00ed);
- assertConversion(CM_8859_4, 0x00ee, 0x00ee);
- assertConversion(CM_8859_4, 0x00ef, 0x012b);
- assertConversion(CM_8859_4, 0x00f0, 0x0111);
- assertConversion(CM_8859_4, 0x00f1, 0x0146);
- assertConversion(CM_8859_4, 0x00f2, 0x014d);
- assertConversion(CM_8859_4, 0x00f3, 0x0137);
- assertConversion(CM_8859_4, 0x00f4, 0x00f4);
- assertConversion(CM_8859_4, 0x00f5, 0x00f5);
- assertConversion(CM_8859_4, 0x00f6, 0x00f6);
- assertConversion(CM_8859_4, 0x00f7, 0x00f7);
- assertConversion(CM_8859_4, 0x00f8, 0x00f8);
- assertConversion(CM_8859_4, 0x00f9, 0x0173);
- assertConversion(CM_8859_4, 0x00fa, 0x00fa);
- assertConversion(CM_8859_4, 0x00fb, 0x00fb);
- assertConversion(CM_8859_4, 0x00fc, 0x00fc);
- assertConversion(CM_8859_4, 0x00fd, 0x0169);
- assertConversion(CM_8859_4, 0x00fe, 0x016b);
- assertConversion(CM_8859_4, 0x00ff, 0x02d9);
- assertNoConversionAfter(CM_8859_4, 0x00ff);
- }
-
- @Test
- public void test5() {
- assertNoConversionBefore(CM_8859_5, 0x00a1);
- assertConversion(CM_8859_5, 0x00a1, 0x0401);
- assertConversion(CM_8859_5, 0x00a2, 0x0402);
- assertConversion(CM_8859_5, 0x00a3, 0x0403);
- assertConversion(CM_8859_5, 0x00a4, 0x0404);
- assertConversion(CM_8859_5, 0x00a5, 0x0405);
- assertConversion(CM_8859_5, 0x00a6, 0x0406);
- assertConversion(CM_8859_5, 0x00a7, 0x0407);
- assertConversion(CM_8859_5, 0x00a8, 0x0408);
- assertConversion(CM_8859_5, 0x00a9, 0x0409);
- assertConversion(CM_8859_5, 0x00aa, 0x040a);
- assertConversion(CM_8859_5, 0x00ab, 0x040b);
- assertConversion(CM_8859_5, 0x00ac, 0x040c);
- assertConversion(CM_8859_5, 0x00ad, 0x00ad);
- assertConversion(CM_8859_5, 0x00ae, 0x040e);
- assertConversion(CM_8859_5, 0x00af, 0x040f);
- assertConversion(CM_8859_5, 0x00b0, 0x0410);
- assertConversion(CM_8859_5, 0x00b1, 0x0411);
- assertConversion(CM_8859_5, 0x00b2, 0x0412);
- assertConversion(CM_8859_5, 0x00b3, 0x0413);
- assertConversion(CM_8859_5, 0x00b4, 0x0414);
- assertConversion(CM_8859_5, 0x00b5, 0x0415);
- assertConversion(CM_8859_5, 0x00b6, 0x0416);
- assertConversion(CM_8859_5, 0x00b7, 0x0417);
- assertConversion(CM_8859_5, 0x00b8, 0x0418);
- assertConversion(CM_8859_5, 0x00b9, 0x0419);
- assertConversion(CM_8859_5, 0x00ba, 0x041a);
- assertConversion(CM_8859_5, 0x00bb, 0x041b);
- assertConversion(CM_8859_5, 0x00bc, 0x041c);
- assertConversion(CM_8859_5, 0x00bd, 0x041d);
- assertConversion(CM_8859_5, 0x00be, 0x041e);
- assertConversion(CM_8859_5, 0x00bf, 0x041f);
- assertConversion(CM_8859_5, 0x00c0, 0x0420);
- assertConversion(CM_8859_5, 0x00c1, 0x0421);
- assertConversion(CM_8859_5, 0x00c2, 0x0422);
- assertConversion(CM_8859_5, 0x00c3, 0x0423);
- assertConversion(CM_8859_5, 0x00c4, 0x0424);
- assertConversion(CM_8859_5, 0x00c5, 0x0425);
- assertConversion(CM_8859_5, 0x00c6, 0x0426);
- assertConversion(CM_8859_5, 0x00c7, 0x0427);
- assertConversion(CM_8859_5, 0x00c8, 0x0428);
- assertConversion(CM_8859_5, 0x00c9, 0x0429);
- assertConversion(CM_8859_5, 0x00ca, 0x042a);
- assertConversion(CM_8859_5, 0x00cb, 0x042b);
- assertConversion(CM_8859_5, 0x00cc, 0x042c);
- assertConversion(CM_8859_5, 0x00cd, 0x042d);
- assertConversion(CM_8859_5, 0x00ce, 0x042e);
- assertConversion(CM_8859_5, 0x00cf, 0x042f);
- assertConversion(CM_8859_5, 0x00d0, 0x0430);
- assertConversion(CM_8859_5, 0x00d1, 0x0431);
- assertConversion(CM_8859_5, 0x00d2, 0x0432);
- assertConversion(CM_8859_5, 0x00d3, 0x0433);
- assertConversion(CM_8859_5, 0x00d4, 0x0434);
- assertConversion(CM_8859_5, 0x00d5, 0x0435);
- assertConversion(CM_8859_5, 0x00d6, 0x0436);
- assertConversion(CM_8859_5, 0x00d7, 0x0437);
- assertConversion(CM_8859_5, 0x00d8, 0x0438);
- assertConversion(CM_8859_5, 0x00d9, 0x0439);
- assertConversion(CM_8859_5, 0x00da, 0x043a);
- assertConversion(CM_8859_5, 0x00db, 0x043b);
- assertConversion(CM_8859_5, 0x00dc, 0x043c);
- assertConversion(CM_8859_5, 0x00dd, 0x043d);
- assertConversion(CM_8859_5, 0x00de, 0x043e);
- assertConversion(CM_8859_5, 0x00df, 0x043f);
- assertConversion(CM_8859_5, 0x00e0, 0x0440);
- assertConversion(CM_8859_5, 0x00e1, 0x0441);
- assertConversion(CM_8859_5, 0x00e2, 0x0442);
- assertConversion(CM_8859_5, 0x00e3, 0x0443);
- assertConversion(CM_8859_5, 0x00e4, 0x0444);
- assertConversion(CM_8859_5, 0x00e5, 0x0445);
- assertConversion(CM_8859_5, 0x00e6, 0x0446);
- assertConversion(CM_8859_5, 0x00e7, 0x0447);
- assertConversion(CM_8859_5, 0x00e8, 0x0448);
- assertConversion(CM_8859_5, 0x00e9, 0x0449);
- assertConversion(CM_8859_5, 0x00ea, 0x044a);
- assertConversion(CM_8859_5, 0x00eb, 0x044b);
- assertConversion(CM_8859_5, 0x00ec, 0x044c);
- assertConversion(CM_8859_5, 0x00ed, 0x044d);
- assertConversion(CM_8859_5, 0x00ee, 0x044e);
- assertConversion(CM_8859_5, 0x00ef, 0x044f);
- assertConversion(CM_8859_5, 0x00f0, 0x2116);
- assertConversion(CM_8859_5, 0x00f1, 0x0451);
- assertConversion(CM_8859_5, 0x00f2, 0x0452);
- assertConversion(CM_8859_5, 0x00f3, 0x0453);
- assertConversion(CM_8859_5, 0x00f4, 0x0454);
- assertConversion(CM_8859_5, 0x00f5, 0x0455);
- assertConversion(CM_8859_5, 0x00f6, 0x0456);
- assertConversion(CM_8859_5, 0x00f7, 0x0457);
- assertConversion(CM_8859_5, 0x00f8, 0x0458);
- assertConversion(CM_8859_5, 0x00f9, 0x0459);
- assertConversion(CM_8859_5, 0x00fa, 0x045a);
- assertConversion(CM_8859_5, 0x00fb, 0x045b);
- assertConversion(CM_8859_5, 0x00fc, 0x045c);
- assertConversion(CM_8859_5, 0x00fd, 0x00a7);
- assertConversion(CM_8859_5, 0x00fe, 0x045e);
- assertConversion(CM_8859_5, 0x00ff, 0x045f);
- assertNoConversionAfter(CM_8859_5, 0x00ff);
- }
-
- @Test
- public void test7() {
- assertNoConversionBefore(CM_8859_7, 0x00a1);
- assertConversion(CM_8859_7, 0x00a1, 0x2018);
- assertConversion(CM_8859_7, 0x00a2, 0x2019);
- assertConversion(CM_8859_7, 0x00a3, 0x00a3);
- assertConversion(CM_8859_7, 0x00a4, 0x0000);
- assertConversion(CM_8859_7, 0x00a5, 0x0000);
- assertConversion(CM_8859_7, 0x00a6, 0x00a6);
- assertConversion(CM_8859_7, 0x00a7, 0x00a7);
- assertConversion(CM_8859_7, 0x00a8, 0x00a8);
- assertConversion(CM_8859_7, 0x00a9, 0x00a9);
- assertConversion(CM_8859_7, 0x00aa, 0x0000);
- assertConversion(CM_8859_7, 0x00ab, 0x00ab);
- assertConversion(CM_8859_7, 0x00ac, 0x00ac);
- assertConversion(CM_8859_7, 0x00ad, 0x00ad);
- assertConversion(CM_8859_7, 0x00ae, 0x0000);
- assertConversion(CM_8859_7, 0x00af, 0x2015);
- assertConversion(CM_8859_7, 0x00b0, 0x00b0);
- assertConversion(CM_8859_7, 0x00b1, 0x00b1);
- assertConversion(CM_8859_7, 0x00b2, 0x00b2);
- assertConversion(CM_8859_7, 0x00b3, 0x00b3);
- assertConversion(CM_8859_7, 0x00b4, 0x0384);
- assertConversion(CM_8859_7, 0x00b5, 0x0385);
- assertConversion(CM_8859_7, 0x00b6, 0x0386);
- assertConversion(CM_8859_7, 0x00b7, 0x00b7);
- assertConversion(CM_8859_7, 0x00b8, 0x0388);
- assertConversion(CM_8859_7, 0x00b9, 0x0389);
- assertConversion(CM_8859_7, 0x00ba, 0x038a);
- assertConversion(CM_8859_7, 0x00bb, 0x00bb);
- assertConversion(CM_8859_7, 0x00bc, 0x038c);
- assertConversion(CM_8859_7, 0x00bd, 0x00bd);
- assertConversion(CM_8859_7, 0x00be, 0x038e);
- assertConversion(CM_8859_7, 0x00bf, 0x038f);
- assertConversion(CM_8859_7, 0x00c0, 0x0390);
- assertConversion(CM_8859_7, 0x00c1, 0x0391);
- assertConversion(CM_8859_7, 0x00c2, 0x0392);
- assertConversion(CM_8859_7, 0x00c3, 0x0393);
- assertConversion(CM_8859_7, 0x00c4, 0x0394);
- assertConversion(CM_8859_7, 0x00c5, 0x0395);
- assertConversion(CM_8859_7, 0x00c6, 0x0396);
- assertConversion(CM_8859_7, 0x00c7, 0x0397);
- assertConversion(CM_8859_7, 0x00c8, 0x0398);
- assertConversion(CM_8859_7, 0x00c9, 0x0399);
- assertConversion(CM_8859_7, 0x00ca, 0x039a);
- assertConversion(CM_8859_7, 0x00cb, 0x039b);
- assertConversion(CM_8859_7, 0x00cc, 0x039c);
- assertConversion(CM_8859_7, 0x00cd, 0x039d);
- assertConversion(CM_8859_7, 0x00ce, 0x039e);
- assertConversion(CM_8859_7, 0x00cf, 0x039f);
- assertConversion(CM_8859_7, 0x00d0, 0x03a0);
- assertConversion(CM_8859_7, 0x00d1, 0x03a1);
- assertConversion(CM_8859_7, 0x00d2, 0x0000);
- assertConversion(CM_8859_7, 0x00d3, 0x03a3);
- assertConversion(CM_8859_7, 0x00d4, 0x03a4);
- assertConversion(CM_8859_7, 0x00d5, 0x03a5);
- assertConversion(CM_8859_7, 0x00d6, 0x03a6);
- assertConversion(CM_8859_7, 0x00d7, 0x03a7);
- assertConversion(CM_8859_7, 0x00d8, 0x03a8);
- assertConversion(CM_8859_7, 0x00d9, 0x03a9);
- assertConversion(CM_8859_7, 0x00da, 0x03aa);
- assertConversion(CM_8859_7, 0x00db, 0x03ab);
- assertConversion(CM_8859_7, 0x00dc, 0x03ac);
- assertConversion(CM_8859_7, 0x00dd, 0x03ad);
- assertConversion(CM_8859_7, 0x00de, 0x03ae);
- assertConversion(CM_8859_7, 0x00df, 0x03af);
- assertConversion(CM_8859_7, 0x00e0, 0x03b0);
- assertConversion(CM_8859_7, 0x00e1, 0x03b1);
- assertConversion(CM_8859_7, 0x00e2, 0x03b2);
- assertConversion(CM_8859_7, 0x00e3, 0x03b3);
- assertConversion(CM_8859_7, 0x00e4, 0x03b4);
- assertConversion(CM_8859_7, 0x00e5, 0x03b5);
- assertConversion(CM_8859_7, 0x00e6, 0x03b6);
- assertConversion(CM_8859_7, 0x00e7, 0x03b7);
- assertConversion(CM_8859_7, 0x00e8, 0x03b8);
- assertConversion(CM_8859_7, 0x00e9, 0x03b9);
- assertConversion(CM_8859_7, 0x00ea, 0x03ba);
- assertConversion(CM_8859_7, 0x00eb, 0x03bb);
- assertConversion(CM_8859_7, 0x00ec, 0x03bc);
- assertConversion(CM_8859_7, 0x00ed, 0x03bd);
- assertConversion(CM_8859_7, 0x00ee, 0x03be);
- assertConversion(CM_8859_7, 0x00ef, 0x03bf);
- assertConversion(CM_8859_7, 0x00f0, 0x03c0);
- assertConversion(CM_8859_7, 0x00f1, 0x03c1);
- assertConversion(CM_8859_7, 0x00f2, 0x03c2);
- assertConversion(CM_8859_7, 0x00f3, 0x03c3);
- assertConversion(CM_8859_7, 0x00f4, 0x03c4);
- assertConversion(CM_8859_7, 0x00f5, 0x03c5);
- assertConversion(CM_8859_7, 0x00f6, 0x03c6);
- assertConversion(CM_8859_7, 0x00f7, 0x03c7);
- assertConversion(CM_8859_7, 0x00f8, 0x03c8);
- assertConversion(CM_8859_7, 0x00f9, 0x03c9);
- assertConversion(CM_8859_7, 0x00fa, 0x03ca);
- assertConversion(CM_8859_7, 0x00fb, 0x03cb);
- assertConversion(CM_8859_7, 0x00fc, 0x03cc);
- assertConversion(CM_8859_7, 0x00fd, 0x03cd);
- assertConversion(CM_8859_7, 0x00fe, 0x03ce);
- assertNoConversionAfter(CM_8859_7, 0x00fe);
- }
-
- @Test
- public void test9() {
- assertNoConversionBefore(CM_8859_9, 0x00d0);
- assertConversion(CM_8859_9, 0x00d0, 0x011e);
- assertConversion(CM_8859_9, 0x00d1, 0x00d1);
- assertConversion(CM_8859_9, 0x00d2, 0x00d2);
- assertConversion(CM_8859_9, 0x00d3, 0x00d3);
- assertConversion(CM_8859_9, 0x00d4, 0x00d4);
- assertConversion(CM_8859_9, 0x00d5, 0x00d5);
- assertConversion(CM_8859_9, 0x00d6, 0x00d6);
- assertConversion(CM_8859_9, 0x00d7, 0x00d7);
- assertConversion(CM_8859_9, 0x00d8, 0x00d8);
- assertConversion(CM_8859_9, 0x00d9, 0x00d9);
- assertConversion(CM_8859_9, 0x00da, 0x00da);
- assertConversion(CM_8859_9, 0x00db, 0x00db);
- assertConversion(CM_8859_9, 0x00dc, 0x00dc);
- assertConversion(CM_8859_9, 0x00dd, 0x0130);
- assertConversion(CM_8859_9, 0x00de, 0x015e);
- assertConversion(CM_8859_9, 0x00df, 0x00df);
- assertConversion(CM_8859_9, 0x00e0, 0x00e0);
- assertConversion(CM_8859_9, 0x00e1, 0x00e1);
- assertConversion(CM_8859_9, 0x00e2, 0x00e2);
- assertConversion(CM_8859_9, 0x00e3, 0x00e3);
- assertConversion(CM_8859_9, 0x00e4, 0x00e4);
- assertConversion(CM_8859_9, 0x00e5, 0x00e5);
- assertConversion(CM_8859_9, 0x00e6, 0x00e6);
- assertConversion(CM_8859_9, 0x00e7, 0x00e7);
- assertConversion(CM_8859_9, 0x00e8, 0x00e8);
- assertConversion(CM_8859_9, 0x00e9, 0x00e9);
- assertConversion(CM_8859_9, 0x00ea, 0x00ea);
- assertConversion(CM_8859_9, 0x00eb, 0x00eb);
- assertConversion(CM_8859_9, 0x00ec, 0x00ec);
- assertConversion(CM_8859_9, 0x00ed, 0x00ed);
- assertConversion(CM_8859_9, 0x00ee, 0x00ee);
- assertConversion(CM_8859_9, 0x00ef, 0x00ef);
- assertConversion(CM_8859_9, 0x00f0, 0x011f);
- assertConversion(CM_8859_9, 0x00f1, 0x00f1);
- assertConversion(CM_8859_9, 0x00f2, 0x00f2);
- assertConversion(CM_8859_9, 0x00f3, 0x00f3);
- assertConversion(CM_8859_9, 0x00f4, 0x00f4);
- assertConversion(CM_8859_9, 0x00f5, 0x00f5);
- assertConversion(CM_8859_9, 0x00f6, 0x00f6);
- assertConversion(CM_8859_9, 0x00f7, 0x00f7);
- assertConversion(CM_8859_9, 0x00f8, 0x00f8);
- assertConversion(CM_8859_9, 0x00f9, 0x00f9);
- assertConversion(CM_8859_9, 0x00fa, 0x00fa);
- assertConversion(CM_8859_9, 0x00fb, 0x00fb);
- assertConversion(CM_8859_9, 0x00fc, 0x00fc);
- assertConversion(CM_8859_9, 0x00fd, 0x0131);
- assertConversion(CM_8859_9, 0x00fe, 0x015f);
- assertNoConversionAfter(CM_8859_9, 0x00fe);
- }
-}
diff --git a/yoko-verify/src/test/java/test/codesets/Client.java b/yoko-verify/src/test/java/test/codesets/Client.java
deleted file mode 100644
index 4a2163e37..000000000
--- a/yoko-verify/src/test/java/test/codesets/Client.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2021 IBM Corporation and others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an \"AS IS\" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package test.codesets;
-
-import java.util.Properties;
-
-import org.apache.yoko.util.Assert;
-import org.omg.CORBA.*;
-
-final public class Client {
- public static int run(ORB orb, String[] args)
- throws org.omg.CORBA.UserException {
- org.omg.CORBA.Object obj = orb
- .string_to_object("relfile:TestCodeSets.ref");
- if (obj == null) {
- System.out.println("Can't read IOR from TestCodeSets.ref");
- return 0;
- }
-
- TestCodeSets p = TestCodeSetsHelper.narrow(obj);
- Assert.ensure(p != null);
-
- {
- char wc, wcRet;
-
- wc = 'a';
- wcRet = p.testWChar(wc);
- Assert.ensure(wc == wcRet);
-
- wc = (char) 0x1234;
- wcRet = p.testWChar(wc);
- Assert.ensure(wc == wcRet);
- }
-
- {
- String ws, wsRet;
-
- ws = "Hello, World!";
- wsRet = p.testWString(ws);
- Assert.ensure(ws.equals(wsRet));
- }
-
- p.deactivate();
-
- return 0;
- }
-
- public static void main(String[] args) {
- java.util.Properties props = new Properties();
- props.putAll(System.getProperties());
- props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
- props.put("org.omg.CORBA.ORBSingletonClass",
- "org.apache.yoko.orb.CORBA.ORBSingleton");
-
- int status = 0;
- ORB orb = null;
- try {
- orb = ORB.init(args, props);
- status = run(orb, args);
- } catch (Exception ex) {
- ex.printStackTrace();
- status = 1;
- }
-
- if (orb != null) {
- try {
- orb.destroy();
- } catch (Exception ex) {
- ex.printStackTrace();
- status = 1;
- }
- }
-
- System.exit(status);
- }
-}
diff --git a/yoko-verify/src/test/java/test/codesets/Server.java b/yoko-verify/src/test/java/test/codesets/Server.java
deleted file mode 100644
index 1c4eba017..000000000
--- a/yoko-verify/src/test/java/test/codesets/Server.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2010 IBM Corporation and others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an \"AS IS\" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package test.codesets;
-
-import java.util.Properties;
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
-import java.io.*;
-
-final public class Server {
- public static int run(ORB orb, String[] args)
- throws org.omg.CORBA.UserException {
- //
- // Resolve Root POA
- //
- POA poa = POAHelper.narrow(orb.resolve_initial_references("RootPOA"));
-
- //
- // Activate the POA manager
- //
- POAManager manager = poa.the_POAManager();
- manager.activate();
-
- //
- // Create implementation object
- //
- TestCodeSets_impl i = new TestCodeSets_impl(orb);
- TestCodeSets testCodeSets = i._this(orb);
-
- //
- // Save references. This must be done after POA manager activation,
- // otherwise there is a potential for a race condition between the
- // client sending request and the server not being ready yet.
- //
- String s = orb.object_to_string(testCodeSets);
-
- String refFile = "TestCodeSets.ref";
- try {
- String ref = orb.object_to_string(testCodeSets);
- FileOutputStream file = new FileOutputStream(refFile);
- PrintWriter out = new PrintWriter(file);
- out.println(ref);
- out.flush();
- file.close();
- } catch (IOException ex) {
- System.err.println("Can't write to `" + ex.getMessage() + "'");
- return 1;
- }
-
- //
- // Give up control to the ORB
- //
- orb.run();
-
- File file = new File(refFile);
- file.delete();
-
- return 0;
- }
-
- public static void main(String[] args) {
- java.util.Properties props = new Properties();
- props.putAll(System.getProperties());
- props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
- props.put("org.omg.CORBA.ORBSingletonClass",
- "org.apache.yoko.orb.CORBA.ORBSingleton");
-
- int status = 0;
- ORB orb = null;
-
- try {
- orb = ORB.init(args, props);
- status = run(orb, args);
- } catch (Exception ex) {
- ex.printStackTrace();
- status = 1;
- }
-
- if (orb != null) {
- try {
- orb.destroy();
- } catch (Exception ex) {
- ex.printStackTrace();
- status = 1;
- }
- }
-
- System.exit(status);
- }
-}
diff --git a/yoko-verify/src/test/java/test/codesets/runtest b/yoko-verify/src/test/java/test/codesets/runtest
deleted file mode 100644
index f8736958c..000000000
--- a/yoko-verify/src/test/java/test/codesets/runtest
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Try to find top-level directory
-#
-if test -f ob/src/com/ooc/CORBA/ORB.java
-then
- top_srcdir=ob
-elif test -f src/com/ooc/CORBA/ORB.java
-then
- top_srcdir=.
-elif test -f ../src/com/ooc/CORBA/ORB.java
-then
- top_srcdir=..
-elif test -f ../../src/com/ooc/CORBA/ORB.java
-then
- top_srcdir=../..
-elif test -f ../../../src/com/ooc/CORBA/ORB.java
-then
- top_srcdir=../../..
-elif test -f ../../../../src/com/ooc/CORBA/ORB.java
-then
- top_srcdir=../../../..
-else
- $echo "$0: can't find top-level directory"
- exit
-fi
-
-#
-# Run standard init script
-#
-. $top_srcdir/config/sh.init
-. $top_srcdir/config/testutil.sh
-
-#
-# Set Java CLASSPATH
-#
-CLASSPATH="$top_srcdir/lib${SEPARATOR}$CLASSPATH"
-export CLASSPATH
-
-#
-# Set the "java.endorsed.dirs" property
-#
-set_java_endorsed_dirs
-
-#
-# Delete old log files
-#
-rm -f codeset_client.log
-rm -f codeset_server.log
-
-#
-# Set name of reference file
-#
-ref=TestCodeSets.ref
-
-#
-# Main test function
-#
-runtest()
-{
-$echo
-$echo Client command is \"$client\"
-$echo Server command is \"$server\"
-
-#
-# Start server
-#
-$echo "Waiting for server to start up... \c"
-rm -f $ref
-( $server & echo $! > srvid ) 2>&1 | tee -a codeset_server.log &
-count=0
-while test ! -s $ref -a $count -lt 8
-do
- sleep 1
- count=`expr $count + 1`
-done
-if test ! -s $ref
-then
- $echo "Failed!"
- $echo "(Server was not started)"
- exit
-else
- $echo "Done!"
-fi
-#
-# Start client
-#
-$client 2>&1 | tee -a codeset_client.log
-
-#
-# Wait for server deactivation
-#
-$echo "Waiting for server to deactivate... \c"
-count=0
-while test -r $ref -a $count -lt 3
-do
- sleep 1
- count=`expr $count + 1`
-done
-
-if test -r $ref
-then
- $echo "Failed!"
- $echo "(Server was not deactivated by client - deactivating server now)"
- deactivate
-else
- $echo "Done!"
-fi
-}
-
-#
-# Test with standard code sets
-#
-client="$JAVA test.codesets.Client"
-server="$JAVA test.codesets.Server"
-runtest
-client="$JAVA test.codesets.Client"
-server="$JAVA test.codesets.Server -OAversion 1.1"
-runtest
-
-#
-# Test with other code set for both server and client
-#
-client="$JAVA test.codesets.Client -ORBnative_cs ISO/IEC 8859-5"
-server="$JAVA test.codesets.Server -ORBnative_cs ISO/IEC 8859-5"
-runtest
-client="$JAVA test.codesets.Client -ORBnative_cs ISO/IEC 8859-5"
-server="$JAVA test.codesets.Server -ORBnative_cs ISO/IEC 8859-5 -OAversion 1.1"
-runtest
-client="$JAVA test.codesets.Client -ORBnative_cs ISO 8859-1"
-server="$JAVA test.codesets.Server -ORBnative_cs ISO 8859-4"
-runtest
-client="$JAVA test.codesets.Client -ORBnative_cs ISO 8859-1"
-server="$JAVA test.codesets.Server -ORBnative_cs ISO 8859-4 -OAversion 1.1"
-runtest
-
diff --git a/yoko-verify/src/test/java/test/iiopplugin/Server.java b/yoko-verify/src/test/java/test/iiopplugin/Server.java
index 47cbe5837..cb3792a5b 100644
--- a/yoko-verify/src/test/java/test/iiopplugin/Server.java
+++ b/yoko-verify/src/test/java/test/iiopplugin/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,11 +49,11 @@ private static int run(ORB orb) throws UserException {
String refFile = "Test.ref";
try {
String ref = orb.object_to_string(test);
- FileOutputStream file = new FileOutputStream(
- refFile);
+ FileOutputStream file = new FileOutputStream(refFile);
PrintWriter out = new PrintWriter(file);
out.println(ref);
out.flush();
+ file.getFD().sync();
file.close();
} catch (IOException ex) {
System.err.println("Can't write to `" + ex.getMessage() + "'");
diff --git a/yoko-verify/src/test/java/test/local/Server.java b/yoko-verify/src/test/java/test/local/Server.java
index cc61a645b..5c3e5e717 100644
--- a/yoko-verify/src/test/java/test/local/Server.java
+++ b/yoko-verify/src/test/java/test/local/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
*/
package test.local;
+import java.io.FileOutputStream;
+import java.io.PrintWriter;
import java.util.Properties;
import org.omg.CORBA.*;
import org.omg.PortableServer.*;
@@ -50,11 +52,11 @@ public static int run(ORB orb, String[] args)
String refFile = "Test.ref";
try {
String ref = orb.object_to_string(test);
- java.io.FileOutputStream file = new java.io.FileOutputStream(
- refFile);
- java.io.PrintWriter out = new java.io.PrintWriter(file);
+ FileOutputStream file = new FileOutputStream(refFile);
+ PrintWriter out = new PrintWriter(file);
out.println(ref);
out.flush();
+ file.getFD().sync();
file.close();
} catch (java.io.IOException ex) {
System.err.println("Can't write to `" + ex.getMessage() + "'");
diff --git a/yoko-verify/src/test/java/test/pi/Server.java b/yoko-verify/src/test/java/test/pi/Server.java
index 298533ed8..f3f9f0dc8 100644
--- a/yoko-verify/src/test/java/test/pi/Server.java
+++ b/yoko-verify/src/test/java/test/pi/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,11 +44,11 @@
import org.omg.PortableServer.ServantRetentionPolicyValueHelper;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.PrintWriter;
import java.util.Properties;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
public final class Server {
private static String refFile = "TestInterface.ref";
@@ -60,7 +60,7 @@ static void ServerRegisterInterceptors(Properties props) {
}
static void ServerRun(ORB orb, boolean nonBlocking, String[] args) throws Exception {
- try (PrintWriter out = new PrintWriter(new FileWriter(refFile))) {
+ try (FileOutputStream file = new FileOutputStream(refFile); PrintWriter out = new PrintWriter(file)) {
try {
Object c = Class.forName("test.pi.ServerORBInitializer_impl");
System.out.println("Got class " + c);
@@ -132,6 +132,7 @@ static void ServerRun(ORB orb, boolean nonBlocking, String[] args) throws Except
writeRef(orb, out, objImpl);
writeRef(orb, out, objDSIImpl);
out.flush();
+ file.getFD().sync();
System.out.println("Wrote refs");
diff --git a/yoko-verify/src/test/java/test/poa/TestMultipleOrbsServer.java b/yoko-verify/src/test/java/test/poa/TestMultipleOrbsServer.java
index 0e31d3c65..74e3ed8d8 100644
--- a/yoko-verify/src/test/java/test/poa/TestMultipleOrbsServer.java
+++ b/yoko-verify/src/test/java/test/poa/TestMultipleOrbsServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
final public class TestMultipleOrbsServer {
public static void main(String[] args) {
- java.util.Properties props = new Properties();
+ Properties props = new Properties();
props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass",
@@ -42,28 +42,21 @@ public static void main(String[] args) {
//
// Resolve Root POA and POA Manager
//
- org.omg.CORBA.Object poaObj = orb1
- .resolve_initial_references("RootPOA");
- org.omg.PortableServer.POA rootPOA1 = org.omg.PortableServer.POAHelper
- .narrow(poaObj);
- org.omg.PortableServer.POAManager manager1 = rootPOA1
- .the_POAManager();
+ org.omg.CORBA.Object poaObj = orb1.resolve_initial_references("RootPOA");
+ org.omg.PortableServer.POA rootPOA1 = org.omg.PortableServer.POAHelper.narrow(poaObj);
+ org.omg.PortableServer.POAManager manager1 = rootPOA1.the_POAManager();
poaObj = orb2.resolve_initial_references("RootPOA");
- org.omg.PortableServer.POA rootPOA2 = org.omg.PortableServer.POAHelper
- .narrow(poaObj);
- org.omg.PortableServer.POAManager manager2 = rootPOA2
- .the_POAManager();
+ org.omg.PortableServer.POA rootPOA2 = org.omg.PortableServer.POAHelper.narrow(poaObj);
+ org.omg.PortableServer.POAManager manager2 = rootPOA2.the_POAManager();
//
// Create test implementation object in each ORB
//
Test_impl testImpl1 = new Test_impl(orb1, rootPOA1);
- ;
Test test1 = testImpl1._this(orb1);
Test_impl testImpl2 = new Test_impl(orb2, rootPOA2);
- ;
Test test2 = testImpl2._this(orb2);
//
@@ -91,6 +84,7 @@ public static void main(String[] args) {
out.println(orb1.object_to_string(server1));
out.println(orb2.object_to_string(server2));
out.flush();
+ file.getFD().sync();
file.close();
} catch (IOException ex) {
System.err.println("Can't write to `" + ex.getMessage() + "'");
diff --git a/yoko-verify/src/test/java/test/poa/TestMultipleOrbsThreadedServer.java b/yoko-verify/src/test/java/test/poa/TestMultipleOrbsThreadedServer.java
index 3a01c40a0..f748ad6ac 100644
--- a/yoko-verify/src/test/java/test/poa/TestMultipleOrbsThreadedServer.java
+++ b/yoko-verify/src/test/java/test/poa/TestMultipleOrbsThreadedServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
import java.io.*;
import java.util.Properties;
+import static org.apache.yoko.orb.OBCORBA.ORB_impl.ParseArgs;
+
final public class TestMultipleOrbsThreadedServer {
//
// Define the number of ORB instances to run in separate threads.
@@ -65,18 +67,15 @@ static final class OrbTestThread extends Thread {
props
.put("org.omg.CORBA.ORBClass",
"org.apache.yoko.orb.CORBA.ORB");
- props.put("org.omg.CORBA.ORBSingletonClass",
- "org.apache.yoko.orb.CORBA.ORBSingleton");
+ props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", orb_id); // Use ORB ID passed
try {
String[] args = new String[0];
orb_ = org.omg.CORBA.ORB.init(args, props);
- org.omg.CORBA.Object obj = orb_
- .resolve_initial_references("RootPOA");
- org.omg.PortableServer.POA rootPOA = org.omg.PortableServer.POAHelper
- .narrow(obj);
+ org.omg.CORBA.Object obj = orb_.resolve_initial_references("RootPOA");
+ org.omg.PortableServer.POA rootPOA = org.omg.PortableServer.POAHelper.narrow(obj);
manager_ = rootPOA.the_POAManager();
test_ = new TestOrb_impl(orb_);
@@ -122,31 +121,21 @@ public static void main(String[] args) {
java.util.Properties props = new Properties();
props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
- props.put("org.omg.CORBA.ORBSingletonClass",
- "org.apache.yoko.orb.CORBA.ORBSingleton");
+ props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
props.put("yoko.orb.id", ""); // Use default ORB
org.omg.CORBA.ORB orb = null;
try {
- args = org.apache.yoko.orb.CORBA.ORB.ParseArgs(args, props, null);
+ args = ParseArgs(args, props, null);
props.put("yoko.orb.conc_model", "threaded");
props.put("yoko.orb.oa.conc_model", "threaded");
- //
- // Create ORB
- //
orb = org.omg.CORBA.ORB.init(args, props);
- //
- // Resolve Root POA and POA Manager
- //
- org.omg.CORBA.Object poaObj = orb
- .resolve_initial_references("RootPOA");
- org.omg.PortableServer.POA rootPOA = org.omg.PortableServer.POAHelper
- .narrow(poaObj);
- org.omg.PortableServer.POAManager manager = rootPOA
- .the_POAManager();
+ org.omg.CORBA.Object poaObj = orb.resolve_initial_references("RootPOA");
+ org.omg.PortableServer.POA rootPOA = org.omg.PortableServer.POAHelper.narrow(poaObj);
+ org.omg.PortableServer.POAManager manager = rootPOA.the_POAManager();
//
// Create threads to run other orb instances
@@ -182,6 +171,7 @@ public static void main(String[] args) {
PrintWriter out = new PrintWriter(file);
out.println(orb.object_to_string(server));
out.flush();
+ file.getFD().sync();
file.close();
} catch (IOException ex) {
System.err.println("Can't write to `" + ex.getMessage() + "'");
diff --git a/yoko-verify/src/test/java/test/retry/Server.java b/yoko-verify/src/test/java/test/retry/Server.java
index 7bf49147b..18f558f00 100644
--- a/yoko-verify/src/test/java/test/retry/Server.java
+++ b/yoko-verify/src/test/java/test/retry/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,8 +17,20 @@
*/
package test.retry;
+import org.omg.CORBA.UserException;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.POAHelper;
+import org.omg.PortableServer.POAManager;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.Properties;
+import static org.omg.PortableServer.ImplicitActivationPolicyValue.NO_IMPLICIT_ACTIVATION;
+import static org.omg.PortableServer.RequestProcessingPolicyValue.USE_SERVANT_MANAGER;
+import static org.omg.PortableServer.ServantRetentionPolicyValue.NON_RETAIN;
+
class FwdLocator_impl extends org.omg.CORBA.LocalObject implements
org.omg.PortableServer.ServantLocator {
private org.omg.CORBA.Object obj_;
@@ -28,59 +40,42 @@ public FwdLocator_impl(org.omg.CORBA.Object obj) {
}
public org.omg.PortableServer.Servant preinvoke(byte[] oid,
- org.omg.PortableServer.POA poa, String operation,
+ POA poa, String operation,
org.omg.PortableServer.ServantLocatorPackage.CookieHolder cookie)
throws org.omg.PortableServer.ForwardRequest {
throw new org.omg.PortableServer.ForwardRequest(obj_);
}
- public void postinvoke(byte[] oid, org.omg.PortableServer.POA poa,
+ public void postinvoke(byte[] oid, POA poa,
String operation, java.lang.Object cookie,
org.omg.PortableServer.Servant servant) {
}
}
public class Server {
- public static int run(org.omg.CORBA.ORB orb, String[] args)
- throws org.omg.CORBA.UserException {
- //
- // Resolve Root POA
- //
- org.omg.PortableServer.POA rootPOA = org.omg.PortableServer.POAHelper
- .narrow(orb.resolve_initial_references("RootPOA"));
+ public static int run(org.omg.CORBA.ORB orb, String[] args) throws UserException {
+ POA rootPOA = POAHelper.narrow(orb.resolve_initial_references("RootPOA"));
- //
- // Get a reference to the POA manager and activate it
- //
- org.omg.PortableServer.POAManager manager = rootPOA.the_POAManager();
- manager.activate();
+ rootPOA.the_POAManager().activate();
- org.omg.CORBA.Policy[] policies = new org.omg.CORBA.Policy[3];
- policies[0] = rootPOA
- .create_request_processing_policy(org.omg.PortableServer.RequestProcessingPolicyValue.USE_SERVANT_MANAGER);
- policies[1] = rootPOA
- .create_servant_retention_policy(org.omg.PortableServer.ServantRetentionPolicyValue.NON_RETAIN);
- policies[2] = rootPOA
- .create_implicit_activation_policy(org.omg.PortableServer.ImplicitActivationPolicyValue.NO_IMPLICIT_ACTIVATION);
+ org.omg.CORBA.Policy[] policies = {
+ rootPOA.create_request_processing_policy(USE_SERVANT_MANAGER),
+ rootPOA.create_servant_retention_policy(NON_RETAIN),
+ rootPOA.create_implicit_activation_policy(NO_IMPLICIT_ACTIVATION),
+ };
- //
// Create two POAs with servant locators, each with its own
// POAManager (and therefore, each with unique endpoints).
// The locators will simply raise ForwardRequest for the
// given object, thus creating an infinite loop.
- //
- org.omg.PortableServer.POA poa1 = rootPOA.create_POA("poa1", null,
- policies);
- org.omg.PortableServer.POA poa2 = rootPOA.create_POA("poa2", null,
- policies);
+ POA poa1 = rootPOA.create_POA("poa1", null, policies);
+ POA poa2 = rootPOA.create_POA("poa2", null, policies);
org.omg.CORBA.Object obj1 = poa1.create_reference("IDL:Test:1.0");
org.omg.CORBA.Object obj2 = poa2.create_reference("IDL:Test:1.0");
- org.omg.PortableServer.ServantLocator locator1 = new FwdLocator_impl(
- obj2);
- org.omg.PortableServer.ServantLocator locator2 = new FwdLocator_impl(
- obj1);
+ org.omg.PortableServer.ServantLocator locator1 = new FwdLocator_impl(obj2);
+ org.omg.PortableServer.ServantLocator locator2 = new FwdLocator_impl(obj1);
poa1.set_servant_manager(locator1);
poa2.set_servant_manager(locator2);
@@ -93,30 +88,26 @@ public static int run(org.omg.CORBA.ORB orb, String[] args)
RetryServer_impl serverImpl = new RetryServer_impl(rootPOA, test, retry);
RetryServer server = serverImpl._this(orb);
- //
// Save reference. This must be done after POA manager
// activation, otherwise there is a potential for a race
// condition between the client sending a request and the
// server not being ready yet.
- //
String refFile = "Test.ref";
try {
String ref = orb.object_to_string(server);
- java.io.FileOutputStream file = new java.io.FileOutputStream(
- refFile);
- java.io.PrintWriter out = new java.io.PrintWriter(file);
+ FileOutputStream file = new FileOutputStream(refFile);
+ PrintWriter out = new PrintWriter(file);
out.println(ref);
out.flush();
+ file.getFD().sync();
file.close();
- } catch (java.io.IOException ex) {
+ } catch (IOException ex) {
System.err.println("Can't write to `" + ex.getMessage() + "'");
return 1;
}
- //
// Run implementation
- //
- org.omg.PortableServer.POAManager mgr = poa1.the_POAManager();
+ POAManager mgr = poa1.the_POAManager();
mgr.activate();
mgr = poa2.the_POAManager();
mgr.activate();
diff --git a/yoko-verify/src/test/java/test/tnaming/Server.java b/yoko-verify/src/test/java/test/tnaming/Server.java
index dc1b5330d..55cd7a9bb 100644
--- a/yoko-verify/src/test/java/test/tnaming/Server.java
+++ b/yoko-verify/src/test/java/test/tnaming/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
*/
package test.tnaming;
+import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.PrintWriter;
import java.nio.file.Files;
@@ -100,7 +101,7 @@ void run() throws Exception {
// use a temporary file to avoid the client picking up an empty file when debugging the server
Path tmp = Files.createTempFile(refFile, "");
- try (PrintWriter out = new PrintWriter(new FileWriter(tmp.toFile()))) {
+ try (FileOutputStream file = new FileOutputStream(tmp.toFile()); PrintWriter out = new PrintWriter(file)) {
System.out.println("server opened file for writing");
try {
NamingContext nc1 = rootNamingContext.new_context();
@@ -113,7 +114,6 @@ void run() throws Exception {
NamingContext nc2 = rootNamingContext.bind_new_context(new NameComponent[]{LEVEL1, LEVEL2});
Util.assertNameNotBound(rootNamingContext, TEST1);
-
Util.assertNameNotBound(rootNamingContext, TEST1);
rootNamingContext.bind(new NameComponent[]{TEST1}, test1);
@@ -156,6 +156,7 @@ void run() throws Exception {
RefFiles.writeRef(orb, out, test2, rootNamingContext, new NameComponent[]{LEVEL1, TEST2});
RefFiles.writeRef(orb, out, test3, rootNamingContext, new NameComponent[]{LEVEL1, LEVEL2, TEST3});
out.flush();
+ file.getFD().sync();
System.out.println("IORs written to file");
} catch (java.io.IOException ex) {
System.err.println("Can't write to `" + ex.getMessage() + "'");