@itwin/core-backend 5.3.0-dev.23 → 5.3.0-dev.25

package/lib/esm/test/standalone/ChangesetReader.test.js

@@ -92,13 +92,13 @@ describe("Changeset Reader API", async () => {
         assert.isNotEmpty(rwIModelId);
         const rwIModel = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken });
         // 1. Import schema with class that span overflow table.
-        const schema = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
-        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
-        <ECEntityClass typeName="Test2dElement">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            ${Array(nProps).fill(undefined).map((_, i) => `<ECProperty propertyName="p${i}" typeName="string"/>`).join("\n")}
-        </ECEntityClass>
+        const schema = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+        <ECEntityClass typeName="Test2dElement">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            ${Array(nProps).fill(undefined).map((_, i) => `<ECProperty propertyName="p${i}" typeName="string"/>`).join("\n")}
+        </ECEntityClass>
     </ECSchema>`;
         await rwIModel.importSchemaStrings([schema]);
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
@@ -163,6 +163,7 @@ describe("Changeset Reader API", async () => {
         expect(rwIModel[_nativeDb].executeSql("UPDATE ec_Table SET ExclusiveRootClassId=NULL WHERE Name='bis_GeometricElement2d_Overflow'")).to.be.eq(DbResult.BE_SQLITE_OK);
         const adaptor = new ECChangesetAdaptor(reader);
         let assertOnOverflowTable = false;
+        const classId = getClassIdByName(rwIModel, "GeometricElement2d");
         while (adaptor.step()) {
             if (adaptor.op === "Updated" && adaptor.inserted?.$meta?.tables[0] === "bis_GeometricElement2d_Overflow") {
                 assert.isUndefined(adaptor.inserted.ECClassId);
@@ -170,7 +171,7 @@ describe("Changeset Reader API", async () => {
                 assert.deepEqual(adaptor.inserted.$meta?.tables, ["bis_GeometricElement2d_Overflow"]);
                 assert.equal(adaptor.inserted.$meta?.op, "Updated");
                 assert.equal(adaptor.inserted.$meta?.classFullName, "BisCore:GeometricElement2d");
-                assert.isTrue(adaptor.inserted.$meta.fallbackClassId.startsWith("0x"));
+                assert.equal(adaptor.inserted.$meta.fallbackClassId, classId);
                 assert.deepEqual(adaptor.inserted.$meta?.changeIndexes, [3]);
                 assert.equal(adaptor.inserted.$meta?.stage, "New");
                 assert.equal(adaptor.deleted.ECInstanceId, "");
@@ -178,7 +179,7 @@ describe("Changeset Reader API", async () => {
                 assert.deepEqual(adaptor.deleted.$meta?.tables, ["bis_GeometricElement2d_Overflow"]);
                 assert.equal(adaptor.deleted.$meta?.op, "Updated");
                 assert.equal(adaptor.deleted.$meta?.classFullName, "BisCore:GeometricElement2d");
-                assert.isTrue(adaptor.deleted.$meta.fallbackClassId.startsWith("0x"));
+                assert.equal(adaptor.deleted.$meta.fallbackClassId, classId);
                 assert.deepEqual(adaptor.deleted.$meta?.changeIndexes, [3]);
                 assert.equal(adaptor.deleted.$meta?.stage, "Old");
                 assertOnOverflowTable = true;
@@ -195,19 +196,25 @@ describe("Changeset Reader API", async () => {
             return stmt.getValue(0).getId();
         });
     }
+    async function getClassNameById(iModel, classId) {
+        const reader = iModel.createQueryReader(`select ec_classname(${classId});`);
+        if (await reader.step())
+            return reader.current[0];
+        return undefined;
+    }
     it("Changeset reader / EC adaptor", async () => {
         const adminToken = "super manager token";
         const iModelName = "test";
         const rwIModelId = await HubMock.createNewIModel({ iTwinId, iModelName, description: "TestSubject", accessToken: adminToken });
         assert.isNotEmpty(rwIModelId);
         const rwIModel = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken });
-        const schema = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
-        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
-        <ECEntityClass typeName="Test2dElement">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            <ECProperty propertyName="s" typeName="string"/>
-        </ECEntityClass>
+        const schema = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+        <ECEntityClass typeName="Test2dElement">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            <ECProperty propertyName="s" typeName="string"/>
+        </ECEntityClass>
     </ECSchema>`;
         await rwIModel.importSchemaStrings([schema]);
         rwIModel.saveChanges("user 1: schema changeset");
@@ -278,7 +285,7 @@ describe("Changeset Reader API", async () => {
         };
         rwIModel.saveChanges("user 1: data");
         if (true || "test local changes") {
-            const testChanges = (changes) => {
+            const testChanges = async (changes) => {
                 assert.equal(changes.length, 3);
                 assert.equal(changes[0].ECInstanceId, "0x20000000001");
                 assert.equal(changes[0].$meta?.classFullName, "BisCore:DrawingModel");
@@ -306,7 +313,9 @@ describe("Changeset Reader API", async () => {
                 assert.deepEqual(el.BBoxHigh, { X: 15, Y: 15 });
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 assert.equal(el.Category.Id, "0x20000000002");
-                assert.isTrue(el.Category.RelECClassId.startsWith("0x"));
+                assert.isNotEmpty(el.Category.RelECClassId);
+                const categoryRelClass = await getClassNameById(rwIModel, el.Category.RelECClassId);
+                assert.equal("BisCore:GeometricElement2dIsInCategory", categoryRelClass);
                 assert.equal(el.s, "xxxxxxxxx");
                 assert.isNull(el.CodeValue);
                 assert.isNull(el.UserLabel);
@@ -319,14 +328,15 @@ describe("Changeset Reader API", async () => {
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 assert.deepEqual(el.TypeDefinition, { Id: null, RelECClassId: null });
                 // eslint-disable-next-line @typescript-eslint/naming-convention
-                assert.equal(el.Category.Id, "0x20000000002");
-                assert.isTrue(el.Category.RelECClassId.startsWith("0x"));
-                // eslint-disable-next-line @typescript-eslint/naming-convention
                 assert.equal(el.CodeSpec.Id, "0x1");
-                assert.isTrue(el.CodeSpec.RelECClassId.startsWith("0x"));
+                assert.isNotEmpty(el.CodeSpec.RelECClassId);
+                const codeSpecRelClass = await getClassNameById(rwIModel, el.CodeSpec.RelECClassId);
+                assert.equal("BisCore:CodeSpecSpecifiesCode", codeSpecRelClass);
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 assert.equal(el.CodeScope.Id, "0x1");
-                assert.isTrue(el.CodeScope.RelECClassId.startsWith("0x"));
+                assert.isNotEmpty(el.CodeScope.RelECClassId);
+                const codeScopeRelClass = await getClassNameById(rwIModel, el.CodeScope.RelECClassId);
+                assert.equal("BisCore:ElementScopesCode", codeScopeRelClass);
                 assert.deepEqual(el.$meta, {
                     tables: [
                         "bis_GeometricElement2d",
@@ -350,7 +360,7 @@ describe("Changeset Reader API", async () => {
                     while (adaptor.step()) {
                         pcu.appendFrom(adaptor);
                     }
-                    testChanges(Array.from(pcu.instances));
+                    await testChanges(Array.from(pcu.instances));
                 }
                 catch (e_1) {
                     env_1.error = e_1;
@@ -369,7 +379,7 @@ describe("Changeset Reader API", async () => {
                     while (adaptor.step()) {
                         pcu.appendFrom(adaptor);
                     }
-                    testChanges(Array.from(pcu.instances));
+                    await testChanges(Array.from(pcu.instances));
                 }
                 catch (e_2) {
                     env_2.error = e_2;
@@ -505,7 +515,7 @@ describe("Changeset Reader API", async () => {
             }
         }
         if (true || "test changeset file") {
-            const testChanges = (changes) => {
+            const testChanges = async (changes) => {
                 assert.equal(changes.length, 3);
                 assert.equal(changes[0].ECInstanceId, "0x20000000001");
                 assert.equal(changes[0].$meta?.classFullName, "BisCore:DrawingModel");
@@ -533,7 +543,9 @@ describe("Changeset Reader API", async () => {
                 assert.deepEqual(el.BBoxHigh, { X: 15, Y: 15 });
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 assert.equal(el.Category.Id, "0x20000000002");
-                assert.isTrue(el.Category.RelECClassId.startsWith("0x"));
+                assert.isNotEmpty(el.Category.RelECClassId);
+                const categoryRelClass = await getClassNameById(rwIModel, el.Category.RelECClassId);
+                assert.equal("BisCore:GeometricElement2dIsInCategory", categoryRelClass);
                 assert.equal(el.s, "xxxxxxxxx");
                 assert.isNull(el.CodeValue);
                 assert.isNull(el.UserLabel);
@@ -546,14 +558,15 @@ describe("Changeset Reader API", async () => {
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 assert.deepEqual(el.TypeDefinition, { Id: null, RelECClassId: null });
                 // eslint-disable-next-line @typescript-eslint/naming-convention
-                assert.equal(el.Category.Id, "0x20000000002");
-                assert.isTrue(el.Category.RelECClassId.startsWith("0x"));
-                // eslint-disable-next-line @typescript-eslint/naming-convention
                 assert.equal(el.CodeSpec.Id, "0x1");
-                assert.isTrue(el.CodeSpec.RelECClassId.startsWith("0x"));
+                assert.isNotEmpty(el.CodeSpec.RelECClassId);
+                const codeSpecRelClass = await getClassNameById(rwIModel, el.CodeSpec.RelECClassId);
+                assert.equal("BisCore:CodeSpecSpecifiesCode", codeSpecRelClass);
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 assert.equal(el.CodeScope.Id, "0x1");
-                assert.isTrue(el.CodeScope.RelECClassId.startsWith("0x"));
+                assert.isNotEmpty(el.CodeScope.RelECClassId);
+                const codeScopeRelClass = await getClassNameById(rwIModel, el.CodeScope.RelECClassId);
+                assert.equal("BisCore:ElementScopesCode", codeScopeRelClass);
                 assert.deepEqual(el.$meta, {
                     tables: [
                         "bis_GeometricElement2d",
@@ -577,7 +590,7 @@ describe("Changeset Reader API", async () => {
                     while (adaptor.step()) {
                         pcu.appendFrom(adaptor);
                     }
-                    testChanges(Array.from(pcu.instances));
+                    await testChanges(Array.from(pcu.instances));
                 }
                 catch (e_7) {
                     env_7.error = e_7;
@@ -596,7 +609,7 @@ describe("Changeset Reader API", async () => {
                     while (adaptor.step()) {
                         pcu.appendFrom(adaptor);
                     }
-                    testChanges(Array.from(pcu.instances));
+                    await testChanges(Array.from(pcu.instances));
                 }
                 catch (e_8) {
                     env_8.error = e_8;
@@ -719,13 +732,13 @@ describe("Changeset Reader API", async () => {
         const addPropertyAndImportSchema = async () => {
             await rwIModel.acquireSchemaLock();
             ++nProps;
-            const schema = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.00.${nProps}" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
-        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
-        <ECEntityClass typeName="Test2dElement">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            ${Array(nProps).fill(undefined).map((_, i) => `<ECProperty propertyName="p${i + 1}" typeName="string"/>`).join("\n")}
-        </ECEntityClass>
+            const schema = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.00.${nProps}" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+        <ECEntityClass typeName="Test2dElement">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            ${Array(nProps).fill(undefined).map((_, i) => `<ECProperty propertyName="p${i + 1}" typeName="string"/>`).join("\n")}
+        </ECEntityClass>
     </ECSchema>`;
             await rwIModel.importSchemaStrings([schema]);
         };
@@ -862,13 +875,13 @@ describe("Changeset Reader API", async () => {
         assert.isNotEmpty(rwIModelId);
         const rwIModel = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken });
         // 1. Import schema with class that span overflow table.
-        const schema = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
-        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
-        <ECEntityClass typeName="Test2dElement">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            <ECProperty propertyName="p1" typeName="string"/>
-        </ECEntityClass>
+        const schema = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+        <ECEntityClass typeName="Test2dElement">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            <ECProperty propertyName="p1" typeName="string"/>
+        </ECEntityClass>
     </ECSchema>`;
         await rwIModel.importSchemaStrings([schema]);
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
@@ -1065,18 +1078,18 @@ describe("Changeset Reader API", async () => {
         ]);
         // Enable shared channel for both
         [firstBriefCase, secondBriefCase].forEach(briefcase => briefcase.channels.addAllowedChannel(ChannelControl.sharedChannelName));
-        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-          <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-          <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-          <ECCustomAttributes>
-              <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-          </ECCustomAttributes>
-
-          <ECEntityClass typeName="TestClass">
-              <BaseClass>bis:PhysicalElement</BaseClass>
-          </ECEntityClass>
+        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+          <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+          <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+          <ECCustomAttributes>
+              <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+          </ECCustomAttributes>
+
+          <ECEntityClass typeName="TestClass">
+              <BaseClass>bis:PhysicalElement</BaseClass>
+          </ECEntityClass>
       </ECSchema>`]);
         firstBriefCase.saveChanges("import initial schema");
         // Push the changes to the hub
@@ -1085,13 +1098,13 @@ describe("Changeset Reader API", async () => {
         await secondBriefCase.pullChanges({ accessToken: adminToken });
         checkClass(firstBriefCase, true, secondBriefCase, true);
         // Import the schema
-        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
+        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
       </ECSchema>`]);
         firstBriefCase.saveChanges("imported schema");
         // Push the changeset to the hub
@@ -1132,18 +1145,18 @@ describe("Changeset Reader API", async () => {
         ]);
         // Enable shared channel for both
         [firstBriefCase, secondBriefCase].forEach(briefcase => briefcase.channels.addAllowedChannel(ChannelControl.sharedChannelName));
-        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-          <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-          <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-          <ECCustomAttributes>
-              <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-          </ECCustomAttributes>
-
-          <ECEntityClass typeName="TestClass">
-              <BaseClass>bis:PhysicalElement</BaseClass>
-          </ECEntityClass>
+        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+          <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+          <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+          <ECCustomAttributes>
+              <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+          </ECCustomAttributes>
+
+          <ECEntityClass typeName="TestClass">
+              <BaseClass>bis:PhysicalElement</BaseClass>
+          </ECEntityClass>
       </ECSchema>`]);
         firstBriefCase.saveChanges("import initial schema");
         // Push the changes to the hub
@@ -1152,22 +1165,22 @@ describe("Changeset Reader API", async () => {
         await secondBriefCase.pullChanges({ accessToken: adminToken });
         checkClass("TestClass", firstBriefCase, true, secondBriefCase, true);
         // Import the schema
-        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.1" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
-
-        <ECEntityClass typeName="TestClass">
-          <BaseClass>bis:PhysicalElement</BaseClass>
-        </ECEntityClass>
-
-        <ECEntityClass typeName="AnotherTestClass">
-          <BaseClass>bis:PhysicalElement</BaseClass>
-        </ECEntityClass>
+        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.1" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
+
+        <ECEntityClass typeName="TestClass">
+          <BaseClass>bis:PhysicalElement</BaseClass>
+        </ECEntityClass>
+
+        <ECEntityClass typeName="AnotherTestClass">
+          <BaseClass>bis:PhysicalElement</BaseClass>
+        </ECEntityClass>
       </ECSchema>`]);
         firstBriefCase.saveChanges("imported schema");
         // Push the changeset to the hub
@@ -1207,18 +1220,18 @@ describe("Changeset Reader API", async () => {
             HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken })
         ]);
         [firstBriefcase, secondBriefcase].forEach(briefcase => briefcase.channels.addAllowedChannel(ChannelControl.sharedChannelName));
-        await firstBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
-
-        <ECEntityClass typeName="TestClass">
-          <BaseClass>bis:PhysicalElement</BaseClass>
-        </ECEntityClass>
+        await firstBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
+
+        <ECEntityClass typeName="TestClass">
+          <BaseClass>bis:PhysicalElement</BaseClass>
+        </ECEntityClass>
       </ECSchema>`]);
         firstBriefcase.saveChanges("import initial schema");
         // Enable changeset tracking for both briefcases
@@ -1226,41 +1239,41 @@ describe("Changeset Reader API", async () => {
         await firstBriefcase.pushChanges({ description: "push initial schema changeset", accessToken: adminToken });
         await secondBriefcase.pullChanges({ accessToken: adminToken });
         // Schema upgrade
-        await secondBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
-
-        <ECEntityClass typeName="TestClass">
-          <BaseClass>bis:PhysicalElement</BaseClass>
-          <ECProperty propertyName="TestProperty" typeName="string"/>
-        </ECEntityClass>
-
-        <ECEnumeration typeName="TestEnum" backingTypeName="int" isStrict="true">
-          <ECEnumerator name="Enumerator1" value="1" displayLabel="TestEnumerator1"/>
-          <ECEnumerator name="Enumerator2" value="2" displayLabel="TestEnumerator2"/>
-        </ECEnumeration>
+        await secondBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
+
+        <ECEntityClass typeName="TestClass">
+          <BaseClass>bis:PhysicalElement</BaseClass>
+          <ECProperty propertyName="TestProperty" typeName="string"/>
+        </ECEntityClass>
+
+        <ECEnumeration typeName="TestEnum" backingTypeName="int" isStrict="true">
+          <ECEnumerator name="Enumerator1" value="1" displayLabel="TestEnumerator1"/>
+          <ECEnumerator name="Enumerator2" value="2" displayLabel="TestEnumerator2"/>
+        </ECEnumeration>
       </ECSchema>`]);
         secondBriefcase.saveChanges("imported schema");
         await secondBriefcase.pushChanges({ description: "Added a property to TestClass and an enum", accessToken: adminToken });
         await firstBriefcase.pullChanges({ accessToken: adminToken });
         // Major schema change
-        await firstBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
-
-        <ECEnumeration typeName="TestEnum" backingTypeName="int" isStrict="true">
-          <ECEnumerator name="Enumerator1" value="1" displayLabel="TestEnumerator1"/>
-          <ECEnumerator name="Enumerator2" value="2" displayLabel="TestEnumerator2"/>
-        </ECEnumeration>
+        await firstBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
+
+        <ECEnumeration typeName="TestEnum" backingTypeName="int" isStrict="true">
+          <ECEnumerator name="Enumerator1" value="1" displayLabel="TestEnumerator1"/>
+          <ECEnumerator name="Enumerator2" value="2" displayLabel="TestEnumerator2"/>
+        </ECEnumeration>
       </ECSchema>`]);
         firstBriefcase.saveChanges("imported schema");
         await firstBriefcase.pushChanges({ description: "Deleted TestClass", accessToken: adminToken });
@@ -1299,13 +1312,13 @@ describe("Changeset Reader API", async () => {
         assert.isNotEmpty(rwIModelId);
         const rwIModel = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken });
         // 1. Import schema with class that span overflow table.
-        const schema = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
-        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
-        <ECEntityClass typeName="Test2dElement">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            <ECProperty propertyName="p1" typeName="string"/>
-        </ECEntityClass>
+        const schema = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+        <ECEntityClass typeName="Test2dElement">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            <ECProperty propertyName="p1" typeName="string"/>
+        </ECEntityClass>
     </ECSchema>`;
         await rwIModel.importSchemaStrings([schema]);
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
@@ -1341,6 +1354,7 @@ describe("Changeset Reader API", async () => {
         await rwIModel.locks.acquireLocks({ shared: drawingModelId });
         const e1id = rwIModel.elements.insertElement(e1);
         assert.isTrue(Id64.isValidId64(e1id), "insert worked");
+        const testElClassId = getClassIdByName(rwIModel, "Test2dElement");
         if (true) {
             const reader = SqliteChangesetReader.openInMemory({ db: rwIModel, disableSchemaCheck: true });
             const adaptor = new ChangesetECAdaptor(reader);
@@ -1356,7 +1370,7 @@ describe("Changeset Reader API", async () => {
             expect(testEl.$meta?.op).to.equals("Inserted");
             expect(testEl.$meta?.classFullName).to.equals("TestDomain:Test2dElement");
             expect(testEl.$meta?.stage).to.equals("New");
-            expect(testEl.ECClassId.startsWith("0x")).to.be.true;
+            expect(testEl.ECClassId).to.equals(testElClassId);
             expect(testEl.ECInstanceId).to.equals(e1id);
             expect(testEl.Model.Id).to.equals(drawingModelId);
             expect(testEl.Category.Id).to.equals(drawingCategoryId);
@@ -1384,12 +1398,13 @@ describe("Changeset Reader API", async () => {
             // verify the inserted element's properties
             const instances = Array.from(unifier.instances);
             expect(instances.length).to.equals(3);
+            const drawingModelClassId = getClassIdByName(rwIModel, "DrawingModel");
             // DrawingModel new instance
             const drawingModelElNew = instances[0];
             expect(drawingModelElNew.$meta?.op).to.equals("Updated");
             expect(drawingModelElNew.$meta?.classFullName).to.equals("BisCore:DrawingModel");
             expect(drawingModelElNew.$meta?.stage).to.equals("New");
-            expect(drawingModelElNew.ECClassId.startsWith("0x")).to.be.true;
+            expect(drawingModelElNew.ECClassId).to.equals(drawingModelClassId);
             expect(drawingModelElNew.ECInstanceId).to.equals(drawingModelId);
             expect(drawingModelElNew.LastMod).to.exist;
             expect(drawingModelElNew.GeometryGuid).to.exist;
@@ -1398,7 +1413,7 @@ describe("Changeset Reader API", async () => {
             expect(drawingModelElOld.$meta?.op).to.equals("Updated");
             expect(drawingModelElOld.$meta?.classFullName).to.equals("BisCore:DrawingModel");
             expect(drawingModelElOld.$meta?.stage).to.equals("Old");
-            expect(drawingModelElOld.ECClassId.startsWith("0x")).to.be.true;
+            expect(drawingModelElOld.ECClassId).to.equals(drawingModelClassId);
             expect(drawingModelElOld.ECInstanceId).to.equals(drawingModelId);
             expect(drawingModelElOld.LastMod).to.null;
             expect(drawingModelElOld.GeometryGuid).to.null;
@@ -1407,7 +1422,7 @@ describe("Changeset Reader API", async () => {
             expect(testEl.$meta?.op).to.equals("Inserted");
             expect(testEl.$meta?.classFullName).to.equals("TestDomain:Test2dElement");
             expect(testEl.$meta?.stage).to.equals("New");
-            expect(testEl.ECClassId.startsWith("0x")).to.be.true;
+            expect(testEl.ECClassId).to.equals(testElClassId);
             expect(testEl.ECInstanceId).to.equals(e1id);
             expect(testEl.Model.Id).to.equals(drawingModelId);
             expect(testEl.Category.Id).to.equals(drawingCategoryId);