@finos/legend-graph 22.2.2 → 22.2.4

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TestSerializationHelper.ts

@@ -26,6 +26,7 @@ import {
   custom,
   deserialize,
   list,
+  optional,
   primitive,
   serialize,
   SKIP,
@@ -49,12 +50,11 @@ import type { V1_TestAssertion } from '../../../model/test/assertion/V1_TestAsse
 import {
   type V1_TestResult,
   V1_TestError,
-  V1_TestFailed,
-  V1_TestPassed,
+  V1_TestExecuted,
 } from '../../../model/test/result/V1_TestResult.js';
 import type { V1_AtomicTest } from '../../../model/test/V1_AtomicTest.js';
-import { V1_AtomicTestId } from '../../../model/test/V1_AtomicTestId.js';
 import type { V1_TestSuite } from '../../../model/test/V1_TestSuite.js';
+import { V1_UniqueTestId } from '../../../model/test/V1_UniqueTestId.js';
 import { V1_externalFormatDataModelSchema } from './V1_DataElementSerializationHelper.js';
 import {
   V1_mappingTestModelSchema,
@@ -79,8 +79,7 @@ export enum V1_TestAssertionType {
 
 enum V1_TestResultType {
   TEST_ERROR = 'testError',
-  TEST_PASSED = 'testPassed',
-  TEST_FAILED = 'testFailed',
+  TEST_EXECUTED = 'testExecuted',
   MULTI_EXECUTION_TEST_RESULT = 'multiExecutionTestResult',
   // Remove once https://github.com/finos/legend-engine/pull/808 is released
   TEMPROARY_MULTI_EXECUTION_TEST_RESULT = 'MultiExecutionServiceTestResult',
@@ -91,7 +90,7 @@ export enum V1_TestSuiteType {
   MAPPING_TEST_SUITE = 'mappingTestSuite',
 }
 
-export const V1_atomicTestIdModelSchema = createModelSchema(V1_AtomicTestId, {
+export const V1_uniqueTestIdModelSchema = createModelSchema(V1_UniqueTestId, {
   atomicTestId: primitive(),
   testSuiteId: primitive(),
 });
@@ -172,26 +171,29 @@ const V1_equalToTDSModelSchema = createModelSchema(V1_EqualToTDS, {
 });
 
 export const V1_testErrorModelSchema = createModelSchema(V1_TestError, {
-  atomicTestId: usingModelSchema(V1_atomicTestIdModelSchema),
+  atomicTestId: primitive(),
   error: primitive(),
   testable: primitive(),
+  testSuiteId: primitive(),
 });
 
-export const V1_testFailedModelSchema = createModelSchema(V1_TestFailed, {
+export const V1_testExecutedModelSchema = createModelSchema(V1_TestExecuted, {
   assertStatuses: list(
     custom(
       (val) => V1_serializeAssertionStatus(val),
       (val) => V1_deserializeAssertionStatus(val),
     ),
   ),
-  atomicTestId: usingModelSchema(V1_atomicTestIdModelSchema),
+  atomicTestId: primitive(),
   testable: primitive(),
+  testExecutionStatus: primitive(),
+  testSuiteId: optional(primitive()),
 });
 
 export const V1_MultiExecutionServiceTestResultModelSchema = createModelSchema(
   V1_MultiExecutionServiceTestResult,
   {
-    atomicTestId: usingModelSchema(V1_atomicTestIdModelSchema),
+    atomicTestId: primitive(),
     keyIndexedTestResults: custom(
       () => SKIP,
       (val) =>
@@ -200,24 +202,18 @@ export const V1_MultiExecutionServiceTestResultModelSchema = createModelSchema(
         ),
     ),
     testable: primitive(),
+    testSuiteId: primitive(),
   },
 );
 
-export const V1_testPassedModelSchema = createModelSchema(V1_TestPassed, {
-  atomicTestId: usingModelSchema(V1_atomicTestIdModelSchema),
-  testable: primitive(),
-});
-
 export function V1_deserializeTestResult(
   json: PlainObject<V1_TestResult>,
 ): V1_TestResult {
   switch (json._type) {
     case V1_TestResultType.TEST_ERROR:
       return deserialize(V1_testErrorModelSchema, json);
-    case V1_TestResultType.TEST_FAILED:
-      return deserialize(V1_testFailedModelSchema, json);
-    case V1_TestResultType.TEST_PASSED:
-      return deserialize(V1_testPassedModelSchema, json);
+    case V1_TestResultType.TEST_EXECUTED:
+      return deserialize(V1_testExecutedModelSchema, json);
     case V1_TestResultType.MULTI_EXECUTION_TEST_RESULT:
     case V1_TestResultType.TEMPROARY_MULTI_EXECUTION_TEST_RESULT:
       return deserialize(V1_MultiExecutionServiceTestResultModelSchema, json);

package/src/index.ts

@@ -310,13 +310,11 @@ export * from './graph/metamodel/pure/test/assertion/status/AssertPass.js';
 export * from './graph/metamodel/pure/test/assertion/status/EqualToJsonAssertFail.js';
 export * from './graph/metamodel/pure/test/assertion/TestAssertion.js';
 export * from './graph/metamodel/pure/test/Test.js';
-export * from './graph/metamodel/pure/test/TestBatch.js';
 export * from './graph/metamodel/pure/test/assertion/EqualTo.js';
 export * from './graph/metamodel/pure/test/assertion/EqualToJson.js';
 export * from './graph/metamodel/pure/test/assertion/EqualToTDS.js';
-export * from './graph/metamodel/pure/test/result/AtomicTestId.js';
+export * from './graph/metamodel/pure/test/result/UniqueTestId.js';
 export * from './graphManager/protocol/pure/v1/model/test/V1_AtomicTest.js';
-export * from './graphManager/protocol/pure/v1/model/test/V1_TestBatch.js';
 export * from './graphManager/protocol/pure/v1/model/test/assertion/V1_EqualToJson.js';
 export * from './graphManager/protocol/pure/v1/model/test/assertion/V1_TestAssertion.js';
 export * from './graphManager/protocol/pure/v1/model/test/assertion/status/V1_AssertionStatus.js';

package/tsconfig.json

@@ -240,7 +240,6 @@
     "./src/graph/metamodel/pure/rawValueSpecification/RawValueSpecification.ts",
     "./src/graph/metamodel/pure/rawValueSpecification/RawVariableExpression.ts",
     "./src/graph/metamodel/pure/test/Test.ts",
-    "./src/graph/metamodel/pure/test/TestBatch.ts",
     "./src/graph/metamodel/pure/test/Testable.ts",
     "./src/graph/metamodel/pure/test/assertion/EqualTo.ts",
     "./src/graph/metamodel/pure/test/assertion/EqualToJson.ts",
@@ -250,9 +249,9 @@
     "./src/graph/metamodel/pure/test/assertion/status/AssertPass.ts",
     "./src/graph/metamodel/pure/test/assertion/status/AssertionStatus.ts",
     "./src/graph/metamodel/pure/test/assertion/status/EqualToJsonAssertFail.ts",
-    "./src/graph/metamodel/pure/test/result/AtomicTestId.ts",
     "./src/graph/metamodel/pure/test/result/RunTestsTestableInput.ts",
     "./src/graph/metamodel/pure/test/result/TestResult.ts",
+    "./src/graph/metamodel/pure/test/result/UniqueTestId.ts",
     "./src/graph/metamodel/pure/valueSpecification/Expression.ts",
     "./src/graph/metamodel/pure/valueSpecification/GraphFetchTree.ts",
     "./src/graph/metamodel/pure/valueSpecification/INTERNAL__PropagatedValue.ts",
@@ -515,10 +514,9 @@
     "./src/graphManager/protocol/pure/v1/model/rawValueSpecification/V1_RawValueSpecification.ts",
     "./src/graphManager/protocol/pure/v1/model/rawValueSpecification/V1_RawVariable.ts",
     "./src/graphManager/protocol/pure/v1/model/test/V1_AtomicTest.ts",
-    "./src/graphManager/protocol/pure/v1/model/test/V1_AtomicTestId.ts",
     "./src/graphManager/protocol/pure/v1/model/test/V1_Test.ts",
-    "./src/graphManager/protocol/pure/v1/model/test/V1_TestBatch.ts",
     "./src/graphManager/protocol/pure/v1/model/test/V1_TestSuite.ts",
+    "./src/graphManager/protocol/pure/v1/model/test/V1_UniqueTestId.ts",
     "./src/graphManager/protocol/pure/v1/model/test/assertion/V1_EqualTo.ts",
     "./src/graphManager/protocol/pure/v1/model/test/assertion/V1_EqualToJson.ts",
     "./src/graphManager/protocol/pure/v1/model/test/assertion/V1_EqualToTDS.ts",

package/lib/graph/metamodel/pure/test/TestBatch.d.ts

@@ -1,24 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * 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.
- */
-import type { Hashable } from '@finos/legend-shared';
-import type { TestAssertion } from './assertion/TestAssertion.js';
-export declare abstract class TestBatch implements Hashable {
-    id: string;
-    batchId: string;
-    assertions: TestAssertion[];
-    abstract get hashCode(): string;
-}
-//# sourceMappingURL=TestBatch.d.ts.map

package/lib/graph/metamodel/pure/test/TestBatch.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TestBatch.d.ts","sourceRoot":"","sources":["../../../../../src/graph/metamodel/pure/test/TestBatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,8BAAsB,SAAU,YAAW,QAAQ;IACjD,EAAE,EAAG,MAAM,CAAC;IACZ,OAAO,EAAG,MAAM,CAAC;IACjB,UAAU,EAAE,aAAa,EAAE,CAAM;IAEjC,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;CACjC"}

package/lib/graph/metamodel/pure/test/TestBatch.js

@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * 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.
- */
-export class TestBatch {
-    id;
-    batchId;
-    assertions = [];
-}
-//# sourceMappingURL=TestBatch.js.map

package/lib/graph/metamodel/pure/test/TestBatch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TestBatch.js","sourceRoot":"","sources":["../../../../../src/graph/metamodel/pure/test/TestBatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,MAAM,OAAgB,SAAS;IAC7B,EAAE,CAAU;IACZ,OAAO,CAAU;IACjB,UAAU,GAAoB,EAAE,CAAC;CAGlC"}

package/lib/graph/metamodel/pure/test/result/AtomicTestId.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AtomicTestId.d.ts","sourceRoot":"","sources":["../../../../../../src/graph/metamodel/pure/test/result/AtomicTestId.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAExD,qBAAa,YAAY;IACvB,WAAW,EAAE,SAAS,GAAG,SAAS,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC;gBAEX,SAAS,EAAE,SAAS,GAAG,SAAS,EAAE,YAAY,EAAE,UAAU;CAIvE"}

package/lib/graphManager/protocol/pure/v1/model/test/V1_AtomicTestId.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_AtomicTestId.d.ts","sourceRoot":"","sources":["../../../../../../../src/graphManager/protocol/pure/v1/model/test/V1_AtomicTestId.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,qBAAa,eAAe;IAC1B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,EAAG,MAAM,CAAC;CACvB"}

package/lib/graphManager/protocol/pure/v1/model/test/V1_AtomicTestId.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_AtomicTestId.js","sourceRoot":"","sources":["../../../../../../../src/graphManager/protocol/pure/v1/model/test/V1_AtomicTestId.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,OAAO,eAAe;IAC1B,WAAW,CAAqB;IAChC,YAAY,CAAU;CACvB"}

package/lib/graphManager/protocol/pure/v1/model/test/V1_TestBatch.d.ts

@@ -1,24 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * 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.
- */
-import type { Hashable } from '@finos/legend-shared';
-import type { V1_TestAssertion } from './assertion/V1_TestAssertion.js';
-export declare abstract class V1_TestBatch implements Hashable {
-    id: string;
-    batchId: string;
-    assertions: V1_TestAssertion[];
-    abstract get hashCode(): string;
-}
-//# sourceMappingURL=V1_TestBatch.d.ts.map

package/lib/graphManager/protocol/pure/v1/model/test/V1_TestBatch.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_TestBatch.d.ts","sourceRoot":"","sources":["../../../../../../../src/graphManager/protocol/pure/v1/model/test/V1_TestBatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,8BAAsB,YAAa,YAAW,QAAQ;IACpD,EAAE,EAAG,MAAM,CAAC;IACZ,OAAO,EAAG,MAAM,CAAC;IACjB,UAAU,EAAE,gBAAgB,EAAE,CAAM;IAEpC,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;CACjC"}

package/lib/graphManager/protocol/pure/v1/model/test/V1_TestBatch.js

@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * 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.
- */
-export class V1_TestBatch {
-    id;
-    batchId;
-    assertions = [];
-}
-//# sourceMappingURL=V1_TestBatch.js.map

package/lib/graphManager/protocol/pure/v1/model/test/V1_TestBatch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_TestBatch.js","sourceRoot":"","sources":["../../../../../../../src/graphManager/protocol/pure/v1/model/test/V1_TestBatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,MAAM,OAAgB,YAAY;IAChC,EAAE,CAAU;IACZ,OAAO,CAAU;IACjB,UAAU,GAAuB,EAAE,CAAC;CAGrC"}

package/src/graph/metamodel/pure/test/TestBatch.ts

@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * 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.
- */
-
-import type { Hashable } from '@finos/legend-shared';
-import type { TestAssertion } from './assertion/TestAssertion.js';
-
-export abstract class TestBatch implements Hashable {
-  id!: string;
-  batchId!: string;
-  assertions: TestAssertion[] = [];
-
-  abstract get hashCode(): string;
-}

package/src/graphManager/protocol/pure/v1/model/test/V1_TestBatch.ts

@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * 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.
- */
-
-import type { Hashable } from '@finos/legend-shared';
-import type { V1_TestAssertion } from './assertion/V1_TestAssertion.js';
-
-export abstract class V1_TestBatch implements Hashable {
-  id!: string;
-  batchId!: string;
-  assertions: V1_TestAssertion[] = [];
-
-  abstract get hashCode(): string;
-}