Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tests for computeSchemaChecksum #3733

Merged
merged 13 commits into from
Jun 10, 2022
Merged

Add tests for computeSchemaChecksum #3733

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7da17f9
Functionality to generate sha1 hash for schema xml
naveedkhan8067 Jun 2, 2022
16290ac
consuming iModelHost
naveedkhan8067 Jun 7, 2022
95b71dc
Adding static function to the schema class
naveedkhan8067 Jun 7, 2022
e6ac456
Made the hash generation as separate functionality due to circular im…
naveedkhan8067 Jun 8, 2022
c69351c
Merge branch 'imodel02' into io-merge-addon
naveedkhan8067 Jun 8, 2022
2f2152e
removed unnecessary import
naveedkhan8067 Jun 8, 2022
5a07cd6
Merge branch 'io-merge-addon' of https://github.com/iTwin/itwinjs-cor…
naveedkhan8067 Jun 8, 2022
159aa94
function name updated with lint fixes
naveedkhan8067 Jun 8, 2022
90fe227
Moving changes to IModelHost
naveedkhan8067 Jun 10, 2022
c57f2c4
Documentation removed
naveedkhan8067 Jun 10, 2022
9a21eb6
combined test
naveedkhan8067 Jun 10, 2022
a62a684
line space added back
naveedkhan8067 Jun 10, 2022
c3e6ef7
changelogs added
naveedkhan8067 Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions common/api/core-backend.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2506,6 +2506,8 @@ export class IModelHost {
static tileUploader?: CloudStorageTileUploader;
// @internal
static get usingExternalTileCache(): boolean;
// @internal (undocumented)
static computeSchemaChecksum(arg: { schemaXmlPath: string, referencePaths: string[], exactMatch?: boolean }): string;
}

// @public
Expand Down
5 changes: 5 additions & 0 deletions core/backend/src/IModelHost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,11 @@ export class IModelHost {
throw new IModelError(BentleyStatus.ERROR, "Cannot use both Azure and custom cloud storage providers for tile cache.");
}
}

/** @internal */
public static computeSchemaChecksum(arg: { schemaXmlPath: string, referencePaths: string[], exactMatch?: boolean }): string {
kabentley marked this conversation as resolved.
Show resolved Hide resolved
return this.platform.computeSchemaChecksum(arg);
}
}

/** Information about the platform on which the app is running. Also see [[KnownLocations]] and [[IModelJsFs]].
Expand Down
14 changes: 14 additions & 0 deletions core/backend/src/test/IModelHost.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { IModelHost, IModelHostConfiguration, KnownLocations } from "../IModelHo
import { Schemas } from "../Schema";
import { IModelTestUtils, TestUtils } from "./index";
import { AzureBlobStorage } from "../CloudStorageBackend";
import { KnownTestLocations } from "./KnownTestLocations";

describe("IModelHost", () => {

Expand Down Expand Up @@ -197,4 +198,17 @@ describe("IModelHost", () => {
expect(() => IModelHost.hubAccess).throws("IModelHost.hubAccess is undefined. Specify an implementation in your IModelHostConfiguration");
});

it("computeSchemaChecksum", () => {
const assetsDir = path.join(KnownTestLocations.assetsDir, "ECSchemaOps");
const schemaXmlPath = path.join(assetsDir, "SchemaA.ecschema.xml");
let referencePaths = [assetsDir];
let sha1 = IModelHost.computeSchemaChecksum({ schemaXmlPath, referencePaths });
expect(sha1).equal("3ac6578060902aa0b8426b61d62045fdf7fa0b2b");

expect(() => IModelHost.computeSchemaChecksum({ schemaXmlPath, referencePaths, exactMatch: true })).throws("Failed to read schema SchemaA.ecschema");

referencePaths = [path.join(assetsDir, "exact-match")];
sha1 = IModelHost.computeSchemaChecksum({ schemaXmlPath, referencePaths, exactMatch: true });
expect(sha1).equal("2a618664fbba1df7c05f27d7c0e8f58de250003b");
});
});
1 change: 0 additions & 1 deletion core/backend/src/test/TestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,3 @@ before(async () => {
after(async () => {
await TestUtils.shutdownBackend();
});

kabentley marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions core/backend/src/test/assets/ECSchemaOps/SchemaA.ecschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ECSchema schemaName="SchemaA" alias="a" version="1.1.1" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2" displayLabel="SchemaA" description="This is a test Schema.">
<ECSchemaReference name="SchemaC" version="3.3.3" alias="c"/>
<ECSchemaReference name="SchemaB" version="2.2.2" alias="b"/>
</ECSchema>
5 changes: 5 additions & 0 deletions core/backend/src/test/assets/ECSchemaOps/SchemaB.ecschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ECSchema schemaName="SchemaB" alias="b" version="2.2.3" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2" displayLabel="SchemaB" description="This is a test Schema.">
<ECSchemaReference name="SchemaC" version="3.3.3" alias="c"/>
<ECSchemaReference name="SchemaD" version="4.4.4" alias="d"/>
</ECSchema>
4 changes: 4 additions & 0 deletions core/backend/src/test/assets/ECSchemaOps/SchemaC.ecschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ECSchema schemaName="SchemaC" alias="c" version="3.3.4" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2" displayLabel="SchemaC" description="This is a test Schema.">
<ECSchemaReference name="SchemaD" version="4.4.4" alias="d"/>
</ECSchema>
3 changes: 3 additions & 0 deletions core/backend/src/test/assets/ECSchemaOps/SchemaD.ecschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<ECSchema schemaName="SchemaD" alias="d" version="4.4.4" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2" displayLabel="SchemaD" description="This is a test Schema.">
</ECSchema>
5 changes: 5 additions & 0 deletions core/backend/src/test/assets/ECSchemaOps/exact-match/SchemaB.ecschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ECSchema schemaName="SchemaB" alias="b" version="2.2.2" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2" displayLabel="SchemaB" description="This is a test Schema.">
<ECSchemaReference name="SchemaC" version="3.3.3" alias="c"/>
<ECSchemaReference name="SchemaD" version="4.4.4" alias="d"/>
</ECSchema>
4 changes: 4 additions & 0 deletions core/backend/src/test/assets/ECSchemaOps/exact-match/SchemaC.ecschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ECSchema schemaName="SchemaC" alias="c" version="3.3.3" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2" displayLabel="SchemaC" description="This is a test Schema.">
<ECSchemaReference name="SchemaD" version="4.4.4" alias="d"/>
</ECSchema>
3 changes: 3 additions & 0 deletions core/backend/src/test/assets/ECSchemaOps/exact-match/SchemaD.ecschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<ECSchema schemaName="SchemaD" alias="d" version="4.4.4" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2" displayLabel="SchemaD" description="This is a test Schema.">
</ECSchema>