Merge pull request hpcc-systems#20758 from jakesmith/HPCC-35531-fix-jlibtests-merge-issues

HPCC-35531 Fix jlibtests merge issues

Reviewed-by: Gavin Halliday <gavin.halliday@lexisnexisrisk.com>
Merged-by: Gavin Halliday <gavin.halliday@lexisnexisrisk.com>

Author: ghalliday

testing/unittests/jlibtests.cpp

@@ -3695,27 +3695,17 @@ class PTreeSerializationDeserializationTest : public CppUnit::TestFixture
             CPPUNIT_ASSERT(areMatchingPTrees(originalTree, memoryBufferDeserialized));
         }
 
-        timer.reset();
-        Owned<IPropertyTree> memoryBufferDeserialized = createPTree(memoryBuffer);
-        __uint64 deserializeElapsedNs = timer.elapsedNs();
-
         // Time deserializeFromStream() method
         __uint64 deserializeFromStreamElapsedNs = 0;
         {
             MemoryBuffer clone(memoryBuffer.length(), memoryBuffer.toByteArray());
             Owned<IBufferedSerialInputStream> in = createBufferedSerialInputStreamFillMemory(clone);
-            Owned<IPropertyTree> streamDeserialized = createPTree();
             timer.reset();
-            streamDeserialized->deserializeFromStream(*in);
+            Owned<IPropertyTree> streamDeserialized = createPTreeFromBinary(*in, ipt_none);
             deserializeFromStreamElapsedNs = timer.elapsedNs();
             CPPUNIT_ASSERT(areMatchingPTrees(originalTree, streamDeserialized));
         }
 
-        Owned<IBufferedSerialInputStream> in = createBufferedSerialInputStream(streamBuffer);
-        timer.reset();
-        Owned<IPropertyTree> streamDeserialized = createPTreeFromBinary(*in, ipt_none);
-        __uint64 deserializeFromStreamElapsedNs = timer.elapsedNs();
-
         // Create PTree from Binary tests
         //
         // Test 1: Call with null nodeCreator (should fall back to createPTree(src, ipt_none))