Bug 36572422 - Validate serialization of 4-byte UTF-8 sequences in C++ client

- pass the bytes from C++ for the string to test instead of having to hard code it in Java

[git-p4: depot-paths = "//dev/main.cpp/": change = 110900]

Author: fryp

tests/common/include/common/TestClasses.hpp

@@ -1252,24 +1252,40 @@ class TestUtf8Processor
          * Default constructor.
          */
         TestUtf8Processor()
+            : m_vabStringInBytes(self())
             { }
 
-    // ----- PortableObject interface -------------------------------------------
+        TestUtf8Processor(Array<octet_t>::View vab)
+            : m_vabStringInBytes(self())
+            {
+            m_vabStringInBytes = cast<Array<octet_t>::View>(vab->clone());
+            }
+
+    // ----- PortableObject interface ---------------------------------------
 
     public:
         /**
          * @inheritDoc
          */
-        void readExternal(PofReader::Handle /* hIn */)
+        void readExternal(PofReader::Handle hIn)
             {
+            m_vabStringInBytes = hIn->readOctetArray(0);
             }
 
         /**
          * @inheritDoc
          */
-        void writeExternal(PofWriter::Handle /* hOut */) const
+        void writeExternal(PofWriter::Handle hOut) const
             {
+            hOut->writeOctetArray(0, m_vabStringInBytes);
             }
+
+    // ----- data members ---------------------------------------------------
+
+    /**
+     * The raw bytes of the UTF-8 string to validate.
+     */
+    MemberView<Array<octet_t> > m_vabStringInBytes;
     };
     COH_REGISTER_PORTABLE_CLASS(1513, TestUtf8Processor);
 

tests/common/src/java/coherence/tests/TestUtf8Processor.java

@@ -46,9 +46,7 @@ public TestUtf8Processor()
     @Override
     public Object process(InvocableMap.Entry entry)
         {
-        // string initialization copied from Java ExternalizableHelperTest
-        String       sExpected   = new String(toBytes(new int[] {0xf0938080, 0xf09f8ebf, 0xf09f8f80, 0xf09f8e89, 0xf09f9294}),
-                                              StandardCharsets.UTF_8);
+        String       sExpected   = new String(m_abStringInBytes, StandardCharsets.UTF_8);
         BinaryEntry  binEntry    = (BinaryEntry) entry;
         Binary       binValue    = ExternalizableHelper.getUndecorated(binEntry.getBinaryValue());
         Binary       binExpected = ExternalizableHelper.getUndecorated((Binary) binEntry.getContext()
@@ -75,27 +73,17 @@ public Object process(InvocableMap.Entry entry)
     public void readExternal(PofReader in)
             throws IOException
         {
+        m_abStringInBytes = in.readByteArray(0);
         }
 
     @Override
     public void writeExternal(PofWriter out)
             throws IOException
         {
-        }
-
-    // ----- helper methods -------------------------------------------------
-
-    private static byte[] toBytes(int[] ai)
-        {
-        ByteBuffer buf = ByteBuffer.allocate(4 * ai.length);
-        for (int n : ai)
-            {
-            buf.putInt(n);
-            }
-        return buf.array();
+        out.writeByteArray(0, m_abStringInBytes);
         }
 
     // ----- data members ---------------------------------------------------
 
-    private int m_nId;
+    private byte[] m_abStringInBytes;
     }

tests/functional/coherence/net/cache/Utf8Test.hpp

@@ -29,10 +29,11 @@ class Utf8Test : public CxxTest::TestSuite
          */
         void test4ByteUtf8()
             {
-            NamedCache::Handle hCache = ensureCleanCache("dist-cache");
+            NamedCache::Handle hCache    = ensureCleanCache("dist-cache");
+            const int          NUM_BYTES = 20; // number of bytes in the byte array to be converted to string
 
             // create UTF-8 4-byte characters: 0xf0938080, 0xf09f8ebf, 0xf09f8f80, 0xf09f8e89, 0xf09f9294
-            char five[21];
+            char five[NUM_BYTES + 1]; // add byte for null
             // 0xf0938080
             five[0]  = (char) 0xf0;
             five[1]  = (char) 0x93;
@@ -66,8 +67,16 @@ class Utf8Test : public CxxTest::TestSuite
 
             hCache->put(vNid, vsTest);
 
+            // do not include the null byte as it will be added as another character on Java
+            // when converting to a String
+            Array<octet_t>::Handle hab = Array<octet_t>::create(NUM_BYTES);
+            for (int i = 0; i < NUM_BYTES; ++i)
+                {
+                hab[i] = five[i];
+                }
+
             // compare the Java serialized value to the C++ serialized value
-            Object::View vResult = hCache->invoke(vNid, TestUtf8Processor::create());
+            Object::View vResult = hCache->invoke(vNid, TestUtf8Processor::create(hab));
 
             TS_ASSERT(vResult->equals(Boolean::valueOf(true)));
             }