@finos/legend-graph 20.1.6 → 21.0.0

package/src/graph/metamodel/pure/packageableElements/mapping/MappingTestSuite.ts

@@ -0,0 +1,33 @@
+/**
+ * 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 { hashArray, type Hashable } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../graph/Core_HashUtils.js';
+import { TestSuite } from '../../test/Test.js';
+import type { StoreTestData } from './StoreTestData.js';
+
+export class MappingTestSuite extends TestSuite implements Hashable {
+  storeTestDatas: StoreTestData[] = [];
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.MAPPING_TEST_SUITE,
+      hashArray(this.storeTestDatas),
+      this.id,
+      hashArray(this.tests),
+    ]);
+  }
+}

package/src/graph/metamodel/pure/packageableElements/mapping/StoreTestData.ts

@@ -0,0 +1,34 @@
+/**
+ * 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 { hashArray, type Hashable } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../graph/Core_HashUtils.js';
+import type { EmbeddedData } from '../../data/EmbeddedData.js';
+import type { PackageableElementReference } from '../PackageableElementReference.js';
+import type { Store } from '../store/Store.js';
+
+export class StoreTestData implements Hashable {
+  store!: PackageableElementReference<Store>;
+  data!: EmbeddedData;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.STORE_TEST_DATA,
+      this.store.valueForSerialization ?? '',
+      this.data,
+    ]);
+  }
+}

package/src/graph/metamodel/pure/packageableElements/service/ServiceTest.ts

@@ -22,6 +22,7 @@ import type { ParameterValue } from './ParameterValue.js';
 export class ServiceTest extends AtomicTest implements Hashable {
   serializationFormat: string | undefined;
   parameters: ParameterValue[] = [];
+  keys: string[] = [];
 
   get hashCode(): string {
     return hashArray([
@@ -29,6 +30,7 @@ export class ServiceTest extends AtomicTest implements Hashable {
       this.id,
       hashArray(this.assertions),
       hashArray(this.parameters),
+      hashArray(this.keys),
       this.serializationFormat ?? '',
     ]);
   }

package/src/graphManager/action/changeDetection/DSL_Mapping_ObserverHelper.ts

@@ -39,7 +39,7 @@ import type { LocalMappingPropertyInfo } from '../../../graph/metamodel/pure/pac
 import type { Mapping } from '../../../graph/metamodel/pure/packageableElements/mapping/Mapping.js';
 import type { MappingClass } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingClass.js';
 import type { MappingInclude } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingInclude.js';
-import type { MappingTest } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
+import type { DEPRECATED__MappingTest } from '../../../graph/metamodel/pure/packageableElements/mapping/DEPRECATED__MappingTest.js';
 import type { MappingTestAssert } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingTestAssert.js';
 import type { MergeOperationSetImplementation } from '../../../graph/metamodel/pure/packageableElements/mapping/MergeOperationSetImplementation.js';
 import type { OperationSetImplementation } from '../../../graph/metamodel/pure/packageableElements/mapping/OperationSetImplementation.js';
@@ -116,6 +116,15 @@ import {
   observe_RootRelationalInstanceSetImplementation,
 } from './STO_Relational_ObserverHelper.js';
 import type { FlatDataAssociationPropertyMapping } from '../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataAssociationPropertyMapping.js';
+import type { MappingTest } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
+import {
+  observe_AtomicTest,
+  observe_TestAssertion,
+  observe_TestSuite,
+} from './Testable_ObserverHelper.js';
+import type { MappingTestSuite } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingTestSuite.js';
+import type { StoreTestData } from '../../../graph/metamodel/pure/packageableElements/mapping/StoreTestData.js';
+import { observe_EmbeddedData } from './DSL_Data_ObserverHelper.js';
 
 // ------------------------------------- Store -------------------------------------
 
@@ -129,6 +138,55 @@ export const observe_Abstract_Store = (metamodel: Store): void => {
   metamodel.includes.forEach(observe_PackageableElementReference);
 };
 
+// ------------------------------------- TestSuite -----------------------------------
+
+export const observe_StoreTestData = skipObservedWithContext(
+  (metamodel: StoreTestData, context: ObserverContext): StoreTestData => {
+    makeObservable(metamodel, {
+      store: observable,
+      data: observable,
+      hashCode: computed,
+    });
+
+    observe_EmbeddedData(metamodel.data, context);
+
+    return metamodel;
+  },
+);
+
+export const observe_MappingTest = skipObserved(
+  (metamodel: MappingTest): MappingTest => {
+    makeObservable(metamodel, {
+      id: observable,
+      query: observable,
+      assertions: observable,
+      hashCode: computed,
+    });
+
+    metamodel.assertions.forEach(observe_TestAssertion);
+
+    return metamodel;
+  },
+);
+
+export const observe_MappingTestSuite = skipObservedWithContext(
+  (metamodel: MappingTestSuite, context: ObserverContext): MappingTestSuite => {
+    makeObservable(metamodel, {
+      id: observable,
+      tests: observable,
+      storeTestDatas: observable,
+      hashCode: computed,
+    });
+
+    metamodel.tests.forEach((test) => observe_AtomicTest(test, context));
+    metamodel.storeTestDatas.forEach((testData) =>
+      observe_StoreTestData(testData, context),
+    );
+
+    return metamodel;
+  },
+);
+
 // ------------------------------------- Mapping -------------------------------------
 
 export const observe_EnumerationMappingReference = skipObserved(
@@ -699,8 +757,8 @@ export const observe_MappingTestAssert = (
   return metamodel;
 };
 
-export const observe_MappingTest = skipObservedWithContext(
-  (metamodel: MappingTest, context): MappingTest => {
+export const observe_MappingTest_Legacy = skipObservedWithContext(
+  (metamodel: DEPRECATED__MappingTest, context): DEPRECATED__MappingTest => {
     makeObservable(metamodel, {
       name: observable,
       query: observable,
@@ -728,6 +786,7 @@ export const observe_Mapping = skipObservedWithContext(
       classMappings: observable,
       enumerationMappings: observable,
       associationMappings: observable,
+      test: observable,
       tests: observable,
       _elementHashCode: override,
     });
@@ -740,8 +799,10 @@ export const observe_Mapping = skipObservedWithContext(
     metamodel.associationMappings.forEach((associationMapping) =>
       observe_AssociationImplementation(associationMapping, context),
     );
-    metamodel.tests.forEach((test) => observe_MappingTest(test, context));
-
+    metamodel.test.forEach((t) => observe_MappingTest_Legacy(t, context));
+    metamodel.tests.forEach((testSuite) =>
+      observe_TestSuite(testSuite, context),
+    );
     return metamodel;
   },
 );

package/src/graphManager/action/changeDetection/DSL_Service_ObserverHelper.ts

@@ -105,6 +105,7 @@ export const observe_ServiceTest = skipObserved(
       serializationFormat: observable,
       assertions: observable,
       parameters: observable,
+      keys: observable,
       hashCode: computed,
     });
 

package/src/graphManager/action/changeDetection/Testable_ObserverHelper.ts

@@ -16,6 +16,8 @@
 
 import { computed, makeObservable, observable } from 'mobx';
 import { ServiceTest } from '../../../DSL_Service_Exports.js';
+import { MappingTest } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
+import { MappingTestSuite } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingTestSuite.js';
 import { ServiceTestSuite } from '../../../graph/metamodel/pure/packageableElements/service/ServiceTestSuite.js';
 import { EqualTo } from '../../../graph/metamodel/pure/test/assertion/EqualTo.js';
 import { EqualToJson } from '../../../graph/metamodel/pure/test/assertion/EqualToJson.js';
@@ -28,6 +30,10 @@ import type {
 import type { Testable_PureGraphManagerPlugin_Extension } from '../../Testable_PureGraphManagerPlugin_Extension.js';
 import { type ObserverContext, skipObserved } from './CoreObserverHelper.js';
 import { observe_ExternalFormatData } from './DSL_Data_ObserverHelper.js';
+import {
+  observe_MappingTest,
+  observe_MappingTestSuite,
+} from './DSL_Mapping_ObserverHelper.js';
 import {
   observe_ServiceTest,
   observe_ServiceTestSuite,
@@ -75,6 +81,8 @@ export function observe_AtomicTest(
 ): AtomicTest {
   if (metamodel instanceof ServiceTest) {
     return observe_ServiceTest(metamodel);
+  } else if (metamodel instanceof MappingTest) {
+    return observe_MappingTest(metamodel);
   }
   const extraAtomicTestBuilder = context.plugins.flatMap(
     (plugin) =>
@@ -110,6 +118,8 @@ export function observe_TestSuite(
 ): TestSuite {
   if (metamodel instanceof ServiceTestSuite) {
     return observe_ServiceTestSuite(metamodel, context);
+  } else if (metamodel instanceof MappingTestSuite) {
+    return observe_MappingTestSuite(metamodel, context);
   }
   return metamodel;
 }

package/src/graphManager/action/validation/DSL_Mapping_ValidationHelper.ts

@@ -17,7 +17,7 @@
 import { fromGrammarString, isValidJSONString } from '@finos/legend-shared';
 import { ExpectedOutputMappingTestAssert } from '../../../graph/metamodel/pure/packageableElements/mapping/ExpectedOutputMappingTestAssert.js';
 import type { InputData } from '../../../graph/metamodel/pure/packageableElements/mapping/InputData.js';
-import type { MappingTest } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
+import type { DEPRECATED__MappingTest } from '../../../graph/metamodel/pure/packageableElements/mapping/DEPRECATED__MappingTest.js';
 import type { MappingTestAssert } from '../../../graph/metamodel/pure/packageableElements/mapping/MappingTestAssert.js';
 import { FlatDataInputData } from '../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataInputData.js';
 import {
@@ -88,7 +88,7 @@ export const DEPRECATED__validate_InputData = (
 };
 
 export const DEPRECATED__validate_MappingTest = (
-  metamodel: MappingTest,
+  metamodel: DEPRECATED__MappingTest,
 ): ValidationIssue[] | undefined => {
   let problems: ValidationIssue[] = [];
   // query

package/src/graphManager/protocol/pure/v1/model/packageableElements/fileGeneration/V1_ConfigurationProperty.ts

@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 
-import { hashArray, hashObject, type Hashable } from '@finos/legend-shared';
+import {
+  hashArray,
+  hashObject,
+  hashUnknownValue,
+  isObject,
+  type Hashable,
+} from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
 
 export class V1_ConfigurationProperty implements Hashable {
@@ -25,7 +31,9 @@ export class V1_ConfigurationProperty implements Hashable {
     return hashArray([
       CORE_HASH_STRUCTURE.CONFIGURATION_PROPERTY,
       this.name,
-      hashObject(this.value as object),
+      isObject(this.value)
+        ? hashObject(this.value)
+        : hashUnknownValue(this.value),
     ]);
   }
 }

package/src/graphManager/protocol/pure/v1/model/packageableElements/mapping/V1_DEPRECATED__MappingTest.ts

@@ -0,0 +1,43 @@
+/**
+ * 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 { hashArray, type Hashable } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
+import type { V1_RawLambda } from '../../rawValueSpecification/V1_RawLambda.js';
+import type { V1_MappingTestAssert } from './V1_MappingTestAssert.js';
+import type { V1_InputData } from './V1_InputData.js';
+
+export class V1_DEPRECATED__MappingTest implements Hashable {
+  name!: string;
+  /**
+   * Studio does not process value specification, they are left in raw JSON form
+   *
+   * @discrepancy model
+   */
+  query!: V1_RawLambda;
+  inputData: V1_InputData[] = [];
+  assert!: V1_MappingTestAssert;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.MAPPING_TEST_LEGACY,
+      this.name,
+      this.query,
+      hashArray(this.inputData),
+      this.assert,
+    ]);
+  }
+}

package/src/graphManager/protocol/pure/v1/model/packageableElements/mapping/V1_Mapping.ts

@@ -24,14 +24,16 @@ import {
   type V1_PackageableElementVisitor,
   V1_PackageableElement,
 } from '../../../model/packageableElements/V1_PackageableElement.js';
-import type { V1_MappingTest } from '../../../model/packageableElements/mapping/V1_MappingTest.js';
+import type { V1_DEPRECATED__MappingTest } from './V1_DEPRECATED__MappingTest.js';
+import type { V1_TestSuite } from '../../test/V1_TestSuite.js';
 
 export class V1_Mapping extends V1_PackageableElement implements Hashable {
   includedMappings: V1_MappingInclude[] = [];
   enumerationMappings: V1_EnumerationMapping[] = [];
   classMappings: V1_ClassMapping[] = [];
   associationMappings: V1_AssociationMapping[] = [];
-  tests: V1_MappingTest[] = [];
+  tests: V1_DEPRECATED__MappingTest[] = [];
+  testSuites: V1_TestSuite[] = [];
 
   override get hashCode(): string {
     return hashArray([
@@ -42,6 +44,7 @@ export class V1_Mapping extends V1_PackageableElement implements Hashable {
       hashArray(this.associationMappings),
       hashArray(this.tests),
       hashArray(this.includedMappings),
+      hashArray(this.testSuites),
     ]);
   }
 

package/src/graphManager/protocol/pure/v1/model/packageableElements/mapping/V1_MappingTest.ts

@@ -16,28 +16,18 @@
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
-import type { V1_RawLambda } from '../../../model/rawValueSpecification/V1_RawLambda.js';
-import type { V1_MappingTestAssert } from './V1_MappingTestAssert.js';
-import type { V1_InputData } from './V1_InputData.js';
+import type { V1_RawLambda } from '../../rawValueSpecification/V1_RawLambda.js';
+import { V1_AtomicTest } from '../../test/V1_AtomicTest.js';
 
-export class V1_MappingTest implements Hashable {
-  name!: string;
-  /**
-   * Studio does not process value specification, they are left in raw JSON form
-   *
-   * @discrepancy model
-   */
+export class V1_MappingTest extends V1_AtomicTest implements Hashable {
   query!: V1_RawLambda;
-  inputData: V1_InputData[] = [];
-  assert!: V1_MappingTestAssert;
 
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.MAPPING_TEST,
-      this.name,
       this.query,
-      hashArray(this.inputData),
-      this.assert,
+      this.id,
+      hashArray(this.assertions),
     ]);
   }
 }

package/src/graphManager/protocol/pure/v1/model/packageableElements/mapping/V1_MappingTestSuite.ts

@@ -0,0 +1,33 @@
+/**
+ * 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 { hashArray, type Hashable } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
+import { V1_TestSuite } from '../../test/V1_TestSuite.js';
+import type { V1_StoreTestData } from './V1_StoreTestData.js';
+
+export class V1_MappingTestSuite extends V1_TestSuite implements Hashable {
+  storeTestDatas: V1_StoreTestData[] = [];
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.MAPPING_TEST_SUITE,
+      hashArray(this.storeTestDatas),
+      this.id,
+      hashArray(this.tests),
+    ]);
+  }
+}

package/src/graphManager/protocol/pure/v1/model/packageableElements/mapping/V1_StoreTestData.ts

@@ -0,0 +1,32 @@
+/**
+ * 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 { hashArray, type Hashable } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
+import type { V1_EmbeddedData } from '../../data/V1_EmbeddedData.js';
+
+export class V1_StoreTestData implements Hashable {
+  store!: string;
+  data!: V1_EmbeddedData;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.STORE_TEST_DATA,
+      this.store,
+      this.data,
+    ]);
+  }
+}

package/src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_ServiceTest.ts

@@ -22,6 +22,7 @@ import type { V1_ParameterValue } from './V1_ParameterValue.js';
 export class V1_ServiceTest extends V1_AtomicTest implements Hashable {
   serializationFormat: string | undefined;
   parameters: V1_ParameterValue[] = [];
+  keys: string[] = [];
 
   get hashCode(): string {
     return hashArray([
@@ -29,6 +30,7 @@ export class V1_ServiceTest extends V1_AtomicTest implements Hashable {
       this.id,
       hashArray(this.assertions),
       hashArray(this.parameters),
+      hashArray(this.keys),
       this.serializationFormat ?? '',
     ]);
   }

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_MappingTransformer.ts

@@ -58,7 +58,7 @@ import type { InlineEmbeddedRelationalInstanceSetImplementation } from '../../..
 import type { OtherwiseEmbeddedRelationalInstanceSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/mapping/OtherwiseEmbeddedRelationalInstanceSetImplementation.js';
 import type { InferableMappingElementIdValue } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/InferableMappingElementId.js';
 import type { MappingInclude } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingInclude.js';
-import type { MappingTest } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
+import type { DEPRECATED__MappingTest } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/DEPRECATED__MappingTest.js';
 import type { AssociationImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/AssociationImplementation.js';
 import { RelationalAssociationImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/RelationalAssociationImplementation.js';
 import type { PropertyReference } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/PropertyReference.js';
@@ -93,7 +93,7 @@ import {
 } from '../../../model/packageableElements/store/modelToModel/mapping/V1_ObjectInputData.js';
 import { V1_FlatDataInputData } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataInputData.js';
 import { V1_ExpectedOutputMappingTestAssert } from '../../../model/packageableElements/mapping/V1_ExpectedOutputMappingTestAssert.js';
-import { V1_MappingTest } from '../../../model/packageableElements/mapping/V1_MappingTest.js';
+import { V1_DEPRECATED__MappingTest } from '../../../model/packageableElements/mapping/V1_DEPRECATED__MappingTest.js';
 import { V1_RawValueSpecificationTransformer } from './V1_RawValueSpecificationTransformer.js';
 import { V1_MappingInclude } from '../../../model/packageableElements/mapping/V1_MappingInclude.js';
 import { V1_EnumerationMapping } from '../../../model/packageableElements/mapping/V1_EnumerationMapping.js';
@@ -152,6 +152,18 @@ import { FlatDataAssociationImplementation } from '../../../../../../../graph/me
 import { V1_FlatDataAssociationMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationMapping.js';
 import type { FlatDataAssociationPropertyMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataAssociationPropertyMapping.js';
 import { V1_FlatDataAssociationPropertyMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationPropertyMapping.js';
+import { V1_MappingTest } from '../../../model/packageableElements/mapping/V1_MappingTest.js';
+import {
+  V1_transformAtomicTest,
+  V1_transformTestAssertion,
+  V1_transformTestSuite,
+} from './V1_TestTransformer.js';
+import type { MappingTest } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
+import type { MappingTestSuite } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTestSuite.js';
+import { V1_MappingTestSuite } from '../../../model/packageableElements/mapping/V1_MappingTestSuite.js';
+import type { StoreTestData } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/StoreTestData.js';
+import { V1_StoreTestData } from '../../../model/packageableElements/mapping/V1_StoreTestData.js';
+import { V1_transformEmbeddedData } from './V1_DataElementTransformer.js';
 
 export const V1_transformPropertyReference = (
   element: PropertyReference,
@@ -310,11 +322,11 @@ const transformTestAssert = (
   );
 };
 
-const transformMappingTest = (
-  element: MappingTest,
+const transformMappingTestLegacy = (
+  element: DEPRECATED__MappingTest,
   context: V1_GraphTransformerContext,
-): V1_MappingTest => {
-  const test = new V1_MappingTest();
+): V1_DEPRECATED__MappingTest => {
+  const test = new V1_DEPRECATED__MappingTest();
   test.assert = transformTestAssert(element.assert);
   test.inputData = element.inputData.map(transformMappingTestInputData);
   test.name = element.name;
@@ -324,6 +336,46 @@ const transformMappingTest = (
   return test;
 };
 
+const transformStoreTestData = (
+  element: StoreTestData,
+  context: V1_GraphTransformerContext,
+): V1_StoreTestData => {
+  const testData = new V1_StoreTestData();
+  testData.data = V1_transformEmbeddedData(element.data, context);
+  testData.store = element.store.valueForSerialization ?? '';
+  return testData;
+};
+
+export const V1_transformMappingTest = (
+  element: MappingTest,
+  context: V1_GraphTransformerContext,
+): V1_MappingTest => {
+  const mappingTest = new V1_MappingTest();
+  mappingTest.id = element.id;
+  mappingTest.assertions = element.assertions.map((assertion) =>
+    V1_transformTestAssertion(assertion),
+  );
+  mappingTest.query = element.query.accept_RawValueSpecificationVisitor(
+    new V1_RawValueSpecificationTransformer(context),
+  ) as V1_RawLambda;
+  return mappingTest;
+};
+
+export const V1_transformMappingTestSuite = (
+  element: MappingTestSuite,
+  context: V1_GraphTransformerContext,
+): V1_MappingTestSuite => {
+  const mappingTestSuite = new V1_MappingTestSuite();
+  mappingTestSuite.id = element.id;
+  mappingTestSuite.storeTestDatas = element.storeTestDatas.map((testData) =>
+    transformStoreTestData(testData, context),
+  );
+  mappingTestSuite.tests = element.tests.map((test) =>
+    V1_transformAtomicTest(test, context),
+  );
+  return mappingTestSuite;
+};
+
 // Include Mapping
 
 const transformMappingInclude = (
@@ -1269,8 +1321,11 @@ export const V1_transformMapping = (
     (associationMapping) =>
       transformAssociationImplementation(associationMapping, context),
   );
-  mapping.tests = element.tests.map((test) =>
-    transformMappingTest(test, context),
+  mapping.tests = element.test.map((test) =>
+    transformMappingTestLegacy(test, context),
+  );
+  mapping.testSuites = element.tests.map((testSuite) =>
+    V1_transformTestSuite(testSuite, context),
   );
   return mapping;
 };

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_ServiceTransformer.ts

@@ -109,6 +109,7 @@ export const V1_transformServiceTest = (
   serviceTest.parameters = element.parameters.map((parameter) =>
     V1_transformParameterValue(parameter),
   );
+  serviceTest.keys = element.keys;
   serviceTest.assertions = element.assertions.map((assertion) =>
     V1_transformTestAssertion(assertion),
   );

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_TestTransformer.ts

@@ -38,6 +38,12 @@ import type {
 import { EqualToTDS } from '../../../../../../../graph/metamodel/pure/test/assertion/EqualToTDS.js';
 import { V1_EqualToTDS } from '../../../model/test/assertion/V1_EqualToTDS.js';
 import type { Testable_PureProtocolProcessorPlugin_Extension } from '../../../../Testable_PureProtocolProcessorPlugin_Extension.js';
+import {
+  V1_transformMappingTest,
+  V1_transformMappingTestSuite,
+} from './V1_MappingTransformer.js';
+import { MappingTestSuite } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTestSuite.js';
+import { MappingTest } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
 
 const transformEqualTo = (element: EqualTo): V1_EqualTo => {
   const equalTo = new V1_EqualTo();
@@ -66,6 +72,8 @@ export const V1_transformAtomicTest = (
 ): V1_AtomicTest => {
   if (value instanceof ServiceTest) {
     return V1_transformServiceTest(value);
+  } else if (value instanceof MappingTest) {
+    return V1_transformMappingTest(value, context);
   }
 
   const extraAtomicTestTransformers = context.plugins.flatMap(
@@ -106,6 +114,8 @@ export const V1_transformTestSuite = (
 ): V1_TestSuite => {
   if (value instanceof ServiceTestSuite) {
     return V1_transformServiceTestSuite(value, context);
+  } else if (value instanceof MappingTestSuite) {
+    return V1_transformMappingTestSuite(value, context);
   }
   throw new UnsupportedOperationError(`Can't transform test suite`, value);
 };