From 387015f7b95577d61504f940f9c14adfda28b107 Mon Sep 17 00:00:00 2001 From: Bernd Kolb Date: Fri, 16 Nov 2018 16:17:09 +0100 Subject: [PATCH] MPS-28915: Making GeneratorTests extensible * refactored Generator * added new assertion concept to allow for custom assertions on the model using a code block * adapted build script --- build/mpsTesting.xml | 2 + build/tests/mpsSModel.xml | 16 +- .../solutions/mpsBuild/models/build.mps | 17 +- .../jetbrains/mps/ide/build/generated | 3 - .../jetbrains/mps/ide/build/mpsTesting.xml | 2 + .../mps/ide/build/tests/mpsSModel.xml | 16 +- .../jetbrains/mps/ide/build/tests/trace.info | 109 - .../jetbrains/mps/ide/build/trace.info | 159 - .../mps/lang/test/generator/generated | 2 +- .../source_gen.caches/main/generated | 2 +- .../mps/lang/test/generator/Generator.java | 5 +- .../mps/lang/test/generator/trace.info | 2 +- .../source_gen/main/QueriesGenerated.java | 127 +- .../generator/source_gen/main/trace.info | 366 +- .../generator/template/main@generator.mps | 1317 ++++--- .../jetbrains.mps.lang.test.generator.mpl | 5 +- .../languages/gentest/models/behavior.mps | 202 +- .../languages/gentest/models/constraints.mps | 109 + .../languages/gentest/models/editor.mps | 24 + .../languages/gentest/models/structure.mps | 46 + .../lang/test/generator/behavior/dependencies | 56 + .../lang/test/generator/behavior/generated | 2 +- .../test/generator/constraints/dependencies | 19 + .../lang/test/generator/constraints/generated | 2 +- .../mps/lang/test/generator/dependencies | 1 + .../lang/test/generator/editor/dependencies | 29 + .../mps/lang/test/generator/editor/generated | 2 +- .../mps/lang/test/generator/generated | 2 +- .../test/generator/structure/dependencies | 2 + .../lang/test/generator/structure/generated | 2 +- .../mps/lang/test/generator/Language.java | 2 + .../behavior/BehaviorAspectDescriptor.java | 15 +- ...tomAssertionBlock__BehaviorDescriptor.java | 103 + ...FunctionParameter__BehaviorDescriptor.java | 92 + .../lang/test/generator/behavior/trace.info | 194 +- .../ConstraintsAspectDescriptor.java | 4 +- ...tionMatchCustomConditions_Constraints.java | 52 + .../aspectcps-descriptorclasses.mps | 3112 ++++++++++----- .../test/generator/constraints/trace.info | 51 +- .../editor/EditorAspectDescriptorImpl.java | 4 +- ...formationMatchCustomConditions_Editor.java | 14 + ...MatchCustomConditions_EditorBuilder_a.java | 238 ++ .../mps/lang/test/generator/editor/trace.info | 278 +- .../ConceptPresentationAspectImpl.java | 25 + .../structure/LanguageConceptSwitch.java | 18 +- .../structure/StructureAspectDescriptor.java | 42 +- .../structure/aspectcps-descriptorclasses.mps | 3426 +++++++++++------ .../lang/test/generator/structure/trace.info | 440 ++- .../mps/lang/test/generator/trace.info | 2 +- .../smodel/jetbrains.mps.test.smodel.msd | 1 + .../jetbrains.mps.test.smodel@tests.mps | 57 + .../jetbrains/mps/test/smodel/dependencies | 4 + .../jetbrains/mps/test/smodel/generated | 2 +- .../jetbrains/mps/test/smodel/BasicTest1.java | 16 + .../jetbrains/mps/test/smodel/trace.info | 80 +- 55 files changed, 7481 insertions(+), 3439 deletions(-) create mode 100644 plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/CustomAssertionBlock__BehaviorDescriptor.java create mode 100644 plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/Model_ConceptFunctionParameter__BehaviorDescriptor.java create mode 100644 plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/TransformationMatchCustomConditions_Constraints.java create mode 100644 plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/TransformationMatchCustomConditions_Editor.java create mode 100644 plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/editor/TransformationMatchCustomConditions_EditorBuilder_a.java diff --git a/build/mpsTesting.xml b/build/mpsTesting.xml index a7e4744a3ff5..74186adadf99 100644 --- a/build/mpsTesting.xml +++ b/build/mpsTesting.xml @@ -364,6 +364,7 @@ + @@ -506,6 +507,7 @@ + diff --git a/build/tests/mpsSModel.xml b/build/tests/mpsSModel.xml index 3f06c9b42b73..d0d02d95e0fa 100644 --- a/build/tests/mpsSModel.xml +++ b/build/tests/mpsSModel.xml @@ -130,8 +130,16 @@ + + + + + + + + @@ -398,16 +406,16 @@ + + + + - - - - diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index 24cd5e590b89..2b72c4f32747 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -30131,6 +30131,11 @@ + + + + + @@ -33078,11 +33083,11 @@ - + - + @@ -33099,11 +33104,11 @@ - + - + @@ -33120,11 +33125,11 @@ - + - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated index 0e909634a056..e69de29bb2d1 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated +++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated @@ -1,3 +0,0 @@ - - - diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml index a7e4744a3ff5..74186adadf99 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml @@ -364,6 +364,7 @@ + @@ -506,6 +507,7 @@ + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml index 3f06c9b42b73..d0d02d95e0fa 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml @@ -130,8 +130,16 @@ + + + + + + + + @@ -398,16 +406,16 @@ + + + + - - - - diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info index af06c111ee78..e69de29bb2d1 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info index b44dba6e4ff7..e69de29bb2d1 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen.caches/jetbrains/mps/lang/test/generator/generated b/plugins/mps-testing/languages/gentest/generator/source_gen.caches/jetbrains/mps/lang/test/generator/generated index cc7889b9294f..8b29412fe3b9 100644 --- a/plugins/mps-testing/languages/gentest/generator/source_gen.caches/jetbrains/mps/lang/test/generator/generated +++ b/plugins/mps-testing/languages/gentest/generator/source_gen.caches/jetbrains/mps/lang/test/generator/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen.caches/main/generated b/plugins/mps-testing/languages/gentest/generator/source_gen.caches/main/generated index d8a0db38eaac..1921d5f54039 100644 --- a/plugins/mps-testing/languages/gentest/generator/source_gen.caches/main/generated +++ b/plugins/mps-testing/languages/gentest/generator/source_gen.caches/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/Generator.java b/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/Generator.java index 379bf0f1ba40..c6ebebcb1c63 100644 --- a/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/Generator.java +++ b/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/Generator.java @@ -34,9 +34,10 @@ protected void fillTemplateModels(TemplateModuleInterpreted2.TemplateModels mode @Override public Collection getTargetLanguages() { - SLanguage[] rv = new SLanguage[2]; + SLanguage[] rv = new SLanguage[3]; rv[0] = MetaAdapterFactory.getLanguage(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, "jetbrains.mps.baseLanguage"); - rv[1] = MetaAdapterFactory.getLanguage(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, "jetbrains.mps.lang.smodel"); + rv[1] = MetaAdapterFactory.getLanguage(0x63650c5916c8498aL, 0x99c8005c7ee9515dL, "jetbrains.mps.lang.access"); + rv[2] = MetaAdapterFactory.getLanguage(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, "jetbrains.mps.lang.smodel"); return Arrays.asList(rv); } diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/trace.info b/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/trace.info index 7bb3463325b5..36e76cc42e05 100644 --- a/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/trace.info +++ b/plugins/mps-testing/languages/gentest/generator/source_gen/jetbrains/mps/lang/test/generator/trace.info @@ -2,7 +2,7 @@ - + diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen/main/QueriesGenerated.java b/plugins/mps-testing/languages/gentest/generator/source_gen/main/QueriesGenerated.java index 75282e1d8f2b..2f3489d0a243 100644 --- a/plugins/mps-testing/languages/gentest/generator/source_gen/main/QueriesGenerated.java +++ b/plugins/mps-testing/languages/gentest/generator/source_gen/main/QueriesGenerated.java @@ -36,20 +36,28 @@ public class QueriesGenerated extends QueryProviderBase { public QueriesGenerated() { super(1); } - public static Object propertyMacro_GetValue_1_0(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_0_0(final PropertyMacroContext _context) { // XXX would prefer template.input to reference GeneratorTest instead of node.parent return _context.createIndexedName(_context.getTemplateValue(), SNodeOperations.getParent(_context.getNode()), false); } - public static Object propertyMacro_GetValue_1_1(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_0_1(final PropertyMacroContext _context) { return ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d060L, "referenceModels"))).count(); } - public static Object propertyMacro_GetValue_1_2(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_0_2(final PropertyMacroContext _context) { // XXX would prefer template.input to reference GeneratorTest instead of node.parent // XXX don't use templateValue as I'd like the name of the method to be the same for both single and multiple match // Just to avoid complicated hack with method name in GneratorTestWrapper return _context.createIndexedName("testTransformAndMatch", SNodeOperations.getParent(_context.getNode()), false); } - public static Object propertyMacro_GetValue_1_3(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_0_3(final PropertyMacroContext _context) { + // XXX would prefer template.input to reference GeneratorTest instead of node.parent + return _context.createIndexedName(_context.getTemplateValue(), SNodeOperations.getParent(_context.getNode()), false); + } + public static Object propertyMacro_GetValue_1_0(final PropertyMacroContext _context) { + // XXX would prefer template.input to reference GeneratorTest instead of node.parent + return _context.createIndexedName(_context.getTemplateValue(), SNodeOperations.getParent(_context.getNode()), false); + } + public static Object propertyMacro_GetValue_1_1(final PropertyMacroContext _context) { return SPropertyOperations.getString(_context.getNode(), MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name")); } public static Object propertyMacro_GetValue_2_0(final PropertyMacroContext _context) { @@ -59,35 +67,51 @@ public static Object propertyMacro_GetValue_2_0(final PropertyMacroContext _cont public static Object propertyMacro_GetValue_3_0(final PropertyMacroContext _context) { return PersistenceFacade.getInstance().asString(ModelIdentity__BehaviorDescriptor.toModelReference_id1Bs_61$mvvu.invoke(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf09c6eL, 0x7b1db36ecf09c72L, "param")))); } - public static Object referenceMacro_GetReferent_1_0(final ReferenceMacroContext _context) { + public static Object referenceMacro_GetReferent_0_0(final ReferenceMacroContext _context) { return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, 0x7b1db36ecf0d05eL, "inputModel")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field"); } - public static Object referenceMacro_GetReferent_1_1(final ReferenceMacroContext _context) { + public static Object referenceMacro_GetReferent_0_1(final ReferenceMacroContext _context) { return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, 0x7b1db36ecf0d063L, "transformationPlan")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field"); } - public static Object referenceMacro_GetReferent_1_2(final ReferenceMacroContext _context) { + public static Object referenceMacro_GetReferent_0_2(final ReferenceMacroContext _context) { return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, 0x7b1db36ecf0d060L, "referenceModel")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field"); } - public static Object referenceMacro_GetReferent_1_3(final ReferenceMacroContext _context) { + public static Object referenceMacro_GetReferent_0_3(final ReferenceMacroContext _context) { return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d05eL, "inputModel")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field"); } - public static Object referenceMacro_GetReferent_1_4(final ReferenceMacroContext _context) { + public static Object referenceMacro_GetReferent_0_4(final ReferenceMacroContext _context) { return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d063L, "transformationPlan")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field"); } - public static Object referenceMacro_GetReferent_1_5(final ReferenceMacroContext _context) { + public static Object referenceMacro_GetReferent_0_5(final ReferenceMacroContext _context) { return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field"); } + public static Object referenceMacro_GetReferent_0_6(final ReferenceMacroContext _context) { + return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field"); + } + public static Object referenceMacro_GetReferent_0_7(final ReferenceMacroContext _context) { + return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")), "TestArg2Field"); + + } public static Object referenceMacro_GetReferent_3_0(final ReferenceMacroContext _context) { return _context.getOutputNodeByInputNodeAndMappingLabel(_context.getNode(), "TestArg2Field"); } - public static boolean ifMacro_Condition_1_0(final IfMacroContext _context) { + public static boolean ifMacro_Condition_0_0(final IfMacroContext _context) { return (SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, 0x7b1db36ecf0d063L, "transformationPlan")) != null); } - public static boolean ifMacro_Condition_1_1(final IfMacroContext _context) { + public static boolean ifMacro_Condition_0_1(final IfMacroContext _context) { return (SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d063L, "transformationPlan")) != null); } + public static boolean ifMacro_Condition_0_2(final IfMacroContext _context) { + return (SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan")) != null); + } + public static Iterable sourceNodesQuery_0_0(final SourceSubstituteMacroNodesContext _context) { + return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d060L, "referenceModels")); + } + public static Iterable sourceNodesQuery_0_1(final SourceSubstituteMacroNodesContext _context) { + return SLinkOperations.getChildren(SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d36ef9L, "assertions")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x108bbca0f48L, 0x108bbd29b4aL, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); + } public static Iterable sourceNodesQuery_1_0(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf09c67L, "arguments")); } @@ -95,22 +119,16 @@ public static Iterable sourceNodesQuery_1_1(final SourceSubstituteMacroNo return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf09c67L, "arguments")); } public static Iterable sourceNodesQuery_1_2(final SourceSubstituteMacroNodesContext _context) { - return SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf0d067L, "tests")), MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L, "jetbrains.mps.lang.test.generator.structure.TransformationMatchAssertion")); - } - public static Iterable sourceNodesQuery_1_3(final SourceSubstituteMacroNodesContext _context) { - return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, 0x7b1db36ecf0d060L, "referenceModels")); - } - public static Iterable sourceNodesQuery_1_4(final SourceSubstituteMacroNodesContext _context) { - return SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf0d067L, "tests")), MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L, "jetbrains.mps.lang.test.generator.structure.TransformationMatchManyAssertion")); + return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf092beL, 0x7b1db36ecf0d067L, "tests")); } private final Map snsqMethods = new HashMap(); { int i = 0; + snsqMethods.put("6346338635721396810", new QueriesGenerated.SNsQ(i++)); + snsqMethods.put("7812943990232824646", new QueriesGenerated.SNsQ(i++)); snsqMethods.put("7985317431307037803", new QueriesGenerated.SNsQ(i++)); snsqMethods.put("7985317431307068138", new QueriesGenerated.SNsQ(i++)); - snsqMethods.put("7985317431306988014", new QueriesGenerated.SNsQ(i++)); - snsqMethods.put("6346338635721396810", new QueriesGenerated.SNsQ(i++)); - snsqMethods.put("6346338635721222539", new QueriesGenerated.SNsQ(i++)); + snsqMethods.put("7812943990232109188", new QueriesGenerated.SNsQ(i++)); } @NotNull @Override @@ -130,15 +148,15 @@ public SNsQ(int methodKey) { public Collection evaluate(@NotNull SourceSubstituteMacroNodesContext ctx) throws GenerationFailureException { switch (methodKey) { case 0: - return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_0(ctx)); + return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_0_0(ctx)); case 1: - return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_1(ctx)); + return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_0_1(ctx)); case 2: - return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_2(ctx)); + return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_0(ctx)); case 3: - return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_3(ctx)); + return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_1(ctx)); case 4: - return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_4(ctx)); + return IterableUtil.asCollection(QueriesGenerated.sourceNodesQuery_1_2(ctx)); default: throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey)); } @@ -147,9 +165,11 @@ public Collection evaluate(@NotNull SourceSubstituteMacroNodesContext ctx private final Map pvqMethods = new HashMap(); { int i = 0; - pvqMethods.put("7985317431306989793", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatch")); + pvqMethods.put("7812943990232128388", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatch")); pvqMethods.put("6346338635721331627", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc59b314L, 0xf8cc59b315L, "value"), "3")); pvqMethods.put("6346338635721222548", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatchMany")); + pvqMethods.put("7812943990232644236", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatch")); + pvqMethods.put("7812943990232097779", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "testTransformAndMatch")); pvqMethods.put("2681075272524333361", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "GeneratorTestClass")); pvqMethods.put("7985317431307070194", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "myArg")); pvqMethods.put("7985317431307775128", new QueriesGenerated.PVQ(i++, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf93d565d10L, 0xf93d565d11L, "value"), "")); @@ -173,16 +193,20 @@ private static class PVQ extends PropertyValueQuery.Base { public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailureException { switch (methodKey) { case 0: - return QueriesGenerated.propertyMacro_GetValue_1_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_0_0(ctx); case 1: - return QueriesGenerated.propertyMacro_GetValue_1_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_0_1(ctx); case 2: - return QueriesGenerated.propertyMacro_GetValue_1_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_0_2(ctx); case 3: - return QueriesGenerated.propertyMacro_GetValue_1_3(ctx); + return QueriesGenerated.propertyMacro_GetValue_0_3(ctx); case 4: - return QueriesGenerated.propertyMacro_GetValue_2_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_1_0(ctx); case 5: + return QueriesGenerated.propertyMacro_GetValue_1_1(ctx); + case 6: + return QueriesGenerated.propertyMacro_GetValue_2_0(ctx); + case 7: return QueriesGenerated.propertyMacro_GetValue_3_0(ctx); default: throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey)); @@ -192,8 +216,9 @@ public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailu private final Map imcMethods = new HashMap(); { int i = 0; - imcMethods.put("7985317431307213918", new QueriesGenerated.IfMC(i++)); + imcMethods.put("7812943990232128342", new QueriesGenerated.IfMC(i++)); imcMethods.put("6346338635721222502", new QueriesGenerated.IfMC(i++)); + imcMethods.put("7812943990232644200", new QueriesGenerated.IfMC(i++)); } @NotNull @Override @@ -213,9 +238,11 @@ public IfMC(int methodKey) { public boolean check(@NotNull IfMacroContext ctx) throws GenerationFailureException { switch (methodKey) { case 0: - return QueriesGenerated.ifMacro_Condition_1_0(ctx); + return QueriesGenerated.ifMacro_Condition_0_0(ctx); case 1: - return QueriesGenerated.ifMacro_Condition_1_1(ctx); + return QueriesGenerated.ifMacro_Condition_0_1(ctx); + case 2: + return QueriesGenerated.ifMacro_Condition_0_2(ctx); default: throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no condition method for if macro %s (key: #%d)", ctx.getTemplateReference(), methodKey)); } @@ -223,13 +250,15 @@ public boolean check(@NotNull IfMacroContext ctx) throws GenerationFailureExcept } private final Map rtqMethods = new HashMap(); { - rtqMethods.put("7985317431307113950", new QueriesGenerated.RTQ(0, "f")); - rtqMethods.put("7985317431307194769", new QueriesGenerated.RTQ(1, "f")); - rtqMethods.put("7985317431307179476", new QueriesGenerated.RTQ(2, "f")); - rtqMethods.put("6346338635721222466", new QueriesGenerated.RTQ(3, "f")); + rtqMethods.put("7812943990232128306", new QueriesGenerated.RTQ(0, "mdl")); + rtqMethods.put("7812943990232128329", new QueriesGenerated.RTQ(1, "f")); + rtqMethods.put("7812943990232128359", new QueriesGenerated.RTQ(2, "mdl")); + rtqMethods.put("6346338635721222466", new QueriesGenerated.RTQ(3, "mdl")); rtqMethods.put("6346338635721222489", new QueriesGenerated.RTQ(4, "f")); rtqMethods.put("6346338635721388511", new QueriesGenerated.RTQ(5, "f")); - rtqMethods.put("7985317431307754088", new QueriesGenerated.RTQ(6, "f")); + rtqMethods.put("7812943990232644164", new QueriesGenerated.RTQ(6, "mdl")); + rtqMethods.put("7812943990232644187", new QueriesGenerated.RTQ(7, "f")); + rtqMethods.put("7985317431307754088", new QueriesGenerated.RTQ(8, "f")); } @NotNull @Override @@ -250,18 +279,22 @@ private static class RTQ extends ReferenceTargetQuery.Base { public Object evaluate(@NotNull ReferenceMacroContext ctx) throws GenerationFailureException { switch (methodKey) { case 0: - return QueriesGenerated.referenceMacro_GetReferent_1_0(ctx); + return QueriesGenerated.referenceMacro_GetReferent_0_0(ctx); case 1: - return QueriesGenerated.referenceMacro_GetReferent_1_1(ctx); + return QueriesGenerated.referenceMacro_GetReferent_0_1(ctx); case 2: - return QueriesGenerated.referenceMacro_GetReferent_1_2(ctx); + return QueriesGenerated.referenceMacro_GetReferent_0_2(ctx); case 3: - return QueriesGenerated.referenceMacro_GetReferent_1_3(ctx); + return QueriesGenerated.referenceMacro_GetReferent_0_3(ctx); case 4: - return QueriesGenerated.referenceMacro_GetReferent_1_4(ctx); + return QueriesGenerated.referenceMacro_GetReferent_0_4(ctx); case 5: - return QueriesGenerated.referenceMacro_GetReferent_1_5(ctx); + return QueriesGenerated.referenceMacro_GetReferent_0_5(ctx); case 6: + return QueriesGenerated.referenceMacro_GetReferent_0_6(ctx); + case 7: + return QueriesGenerated.referenceMacro_GetReferent_0_7(ctx); + case 8: return QueriesGenerated.referenceMacro_GetReferent_3_0(ctx); default: throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey)); diff --git a/plugins/mps-testing/languages/gentest/generator/source_gen/main/trace.info b/plugins/mps-testing/languages/gentest/generator/source_gen/main/trace.info index 936b15f32885..b2db166de200 100644 --- a/plugins/mps-testing/languages/gentest/generator/source_gen/main/trace.info +++ b/plugins/mps-testing/languages/gentest/generator/source_gen/main/trace.info @@ -7,208 +7,260 @@ - - - - - + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - + + - + - + - - + + - - - - - + + - - + + - - + + - + - - + + - - + + - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/plugins/mps-testing/languages/gentest/generator/template/main@generator.mps b/plugins/mps-testing/languages/gentest/generator/template/main@generator.mps index a77d1a3d63e3..2a990c837943 100644 --- a/plugins/mps-testing/languages/gentest/generator/template/main@generator.mps +++ b/plugins/mps-testing/languages/gentest/generator/template/main@generator.mps @@ -2,6 +2,7 @@ + @@ -12,6 +13,9 @@ + + + @@ -41,6 +45,9 @@ + + + @@ -113,9 +120,21 @@ + + + + + + + + + + + + @@ -167,6 +186,11 @@ + + + + + @@ -180,14 +204,11 @@ - - - - - - + + + @@ -222,615 +243,946 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - + + + + - - - - - - + + + + @@ -839,6 +1191,7 @@ + diff --git a/plugins/mps-testing/languages/gentest/jetbrains.mps.lang.test.generator.mpl b/plugins/mps-testing/languages/gentest/jetbrains.mps.lang.test.generator.mpl index 1f04ccbd1c59..e6e8f8e55fdb 100644 --- a/plugins/mps-testing/languages/gentest/jetbrains.mps.lang.test.generator.mpl +++ b/plugins/mps-testing/languages/gentest/jetbrains.mps.lang.test.generator.mpl @@ -28,6 +28,7 @@ + @@ -123,6 +124,8 @@ c8cbf416-5e11-499c-816d-60b07b47b8c1(jetbrains.mps.lang.test.generator.rt) 49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit) - + + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + diff --git a/plugins/mps-testing/languages/gentest/models/behavior.mps b/plugins/mps-testing/languages/gentest/models/behavior.mps index afc96988969a..6bd86724cd52 100644 --- a/plugins/mps-testing/languages/gentest/models/behavior.mps +++ b/plugins/mps-testing/languages/gentest/models/behavior.mps @@ -5,7 +5,205 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-testing/languages/gentest/models/constraints.mps b/plugins/mps-testing/languages/gentest/models/constraints.mps index 8b390ba96069..f7cf654f1b75 100644 --- a/plugins/mps-testing/languages/gentest/models/constraints.mps +++ b/plugins/mps-testing/languages/gentest/models/constraints.mps @@ -349,5 +349,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-testing/languages/gentest/models/editor.mps b/plugins/mps-testing/languages/gentest/models/editor.mps index 325ae8a66130..ef733666b08d 100644 --- a/plugins/mps-testing/languages/gentest/models/editor.mps +++ b/plugins/mps-testing/languages/gentest/models/editor.mps @@ -257,5 +257,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-testing/languages/gentest/models/structure.mps b/plugins/mps-testing/languages/gentest/models/structure.mps index e7900b45fe8f..dbb10be44311 100644 --- a/plugins/mps-testing/languages/gentest/models/structure.mps +++ b/plugins/mps-testing/languages/gentest/models/structure.mps @@ -8,6 +8,7 @@ + @@ -42,6 +43,9 @@ + + + @@ -173,5 +177,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/dependencies index 779c762d5836..f81731014340 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/dependencies +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/dependencies @@ -2,10 +2,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/generated index de5205a03ad1..397858169e0b 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/generated +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/dependencies index 2c26d624815f..e1d9f4ca7b5b 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/dependencies +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/dependencies @@ -5,6 +5,7 @@ + @@ -30,6 +31,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/generated index 2df84d46075b..fb0f2beb282f 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/generated +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/constraints/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/dependencies index 7369cb0354cc..979ad2a89e0c 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/dependencies +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/dependencies @@ -14,6 +14,7 @@ + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/dependencies index dd8ed603f865..bd0c8d8e592a 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/dependencies +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/dependencies @@ -83,6 +83,7 @@ + @@ -218,6 +219,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/generated index 2af3ba2fea70..6c3467c6ec55 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/generated +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/generated index 3acad41b33df..4a01764eee57 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/generated +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/dependencies b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/dependencies index 31c417181193..9d52c41bf6a2 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/dependencies +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/dependencies @@ -24,6 +24,8 @@ + + diff --git a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/generated b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/generated index 1993012bd01d..f2670e65256f 100644 --- a/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/generated +++ b/plugins/mps-testing/languages/gentest/source_gen.caches/jetbrains/mps/lang/test/generator/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/Language.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/Language.java index 51ac1a34c7d8..5a3ba44c9e2d 100644 --- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/Language.java +++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/Language.java @@ -6,6 +6,7 @@ import jetbrains.mps.smodel.adapter.ids.SLanguageId; import java.util.Collection; import org.jetbrains.mps.openapi.language.SLanguage; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; import jetbrains.mps.smodel.runtime.ILanguageAspect; import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor; import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor; @@ -40,6 +41,7 @@ public SLanguageId getId() { @Override protected void fillExtendedLanguages(Collection extendedLanguages) { + extendedLanguages.add(MetaAdapterFactory.getLanguage(SLanguageId.deserialize("f3061a53-9226-4cc5-a443-f952ceaf5816"), "jetbrains.mps.baseLanguage")); } @Override diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/BehaviorAspectDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/BehaviorAspectDescriptor.java index 688f0eb09fac..be29815b8958 100644 --- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/BehaviorAspectDescriptor.java +++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/BehaviorAspectDescriptor.java @@ -3,12 +3,17 @@ /*Generated by MPS */ import jetbrains.mps.core.aspects.behaviour.BaseBehaviorAspectDescriptor; -import org.jetbrains.annotations.Nullable; import jetbrains.mps.core.aspects.behaviour.api.BHDescriptor; +import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.lang.smodel.ConceptSwitchIndex; +import jetbrains.mps.lang.smodel.ConceptSwitchIndexBuilder; +import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; public final class BehaviorAspectDescriptor extends BaseBehaviorAspectDescriptor { + private final BHDescriptor myCustomAssertionBlock__BehaviorDescriptor = new CustomAssertionBlock__BehaviorDescriptor(); + private final BHDescriptor myModel_ConceptFunctionParameter__BehaviorDescriptor = new Model_ConceptFunctionParameter__BehaviorDescriptor(); public BehaviorAspectDescriptor() { } @@ -16,6 +21,14 @@ public BehaviorAspectDescriptor() { @Nullable public BHDescriptor getDescriptor(@NotNull SAbstractConcept concept) { SAbstractConcept cncpt = concept; + switch (conceptIndex.index(cncpt)) { + case 0: + return myCustomAssertionBlock__BehaviorDescriptor; + case 1: + return myModel_ConceptFunctionParameter__BehaviorDescriptor; + default: + } return null; } + private static final ConceptSwitchIndex conceptIndex = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d37a56L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d3b3b1L)).seal(); } diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/CustomAssertionBlock__BehaviorDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/CustomAssertionBlock__BehaviorDescriptor.java new file mode 100644 index 000000000000..8360c6cddacc --- /dev/null +++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/CustomAssertionBlock__BehaviorDescriptor.java @@ -0,0 +1,103 @@ +package jetbrains.mps.lang.test.generator.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry; +import jetbrains.mps.smodel.language.ConceptRegistry; +import jetbrains.mps.core.aspects.behaviour.api.SMethod; +import java.util.List; +import org.jetbrains.mps.openapi.language.SConcept; +import jetbrains.mps.core.aspects.behaviour.SMethodBuilder; +import jetbrains.mps.core.aspects.behaviour.SJavaCompoundTypeImpl; +import jetbrains.mps.core.aspects.behaviour.SModifiersImpl; +import jetbrains.mps.core.aspects.behaviour.AccessPrivileges; +import org.jetbrains.mps.openapi.model.SNode; +import java.util.Arrays; +import org.jetbrains.annotations.NotNull; +import jetbrains.mps.baseLanguage.behavior.ConceptFunction__BehaviorDescriptor; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.core.aspects.behaviour.api.SConstructor; +import org.jetbrains.annotations.Nullable; +import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public final class CustomAssertionBlock__BehaviorDescriptor extends BaseBHDescriptor { + private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d37a56L, "jetbrains.mps.lang.test.generator.structure.CustomAssertionBlock"); + private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry(); + + public static final SMethod> getParameterConcepts_id2xELmDxyi2v = new SMethodBuilder>(new SJavaCompoundTypeImpl((Class>) ((Class) Object.class))).name("getParameterConcepts").modifiers(SModifiersImpl.create(8, AccessPrivileges.PUBLIC)).concept(CONCEPT).id("2xELmDxyi2v").registry(REGISTRY).build(); + public static final SMethod getExpectedReturnType_idhEwIGRD = new SMethodBuilder(new SJavaCompoundTypeImpl((Class) ((Class) Object.class))).name("getExpectedReturnType").modifiers(SModifiersImpl.create(8, AccessPrivileges.PUBLIC)).concept(CONCEPT).id("hEwIGRD").registry(REGISTRY).build(); + + private static final List> BH_METHODS = Arrays.>asList(getParameterConcepts_id2xELmDxyi2v, getExpectedReturnType_idhEwIGRD); + + private static void ___init___(@NotNull SNode __thisNode__) { + } + + /*package*/ static List getParameterConcepts_id2xELmDxyi2v(@NotNull SNode __thisNode__) { + List result = ConceptFunction__BehaviorDescriptor.getParameterConcepts_id2xELmDxyi2v.invoke0(__thisNode__, MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x108bbca0f48L, "jetbrains.mps.baseLanguage.structure.ConceptFunction")); + ListSequence.fromList(result).addElement(MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d3b3b1L, "jetbrains.mps.lang.test.generator.structure.Model_ConceptFunctionParameter")); + return result; + } + /*package*/ static SNode getExpectedReturnType_idhEwIGRD(@NotNull SNode __thisNode__) { + return _quotation_createNode_sm6sey_a0a1(); + } + + /*package*/ CustomAssertionBlock__BehaviorDescriptor() { + super(REGISTRY); + } + + @Override + protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) { + ___init___(node); + } + + @Override + protected T invokeSpecial0(@NotNull SNode node, @NotNull SMethod method, @Nullable Object[] parameters) { + int methodIndex = BH_METHODS.indexOf(method); + if (methodIndex < 0) { + throw new BHMethodNotFoundException(this, method); + } + switch (methodIndex) { + case 0: + return (T) ((List) getParameterConcepts_id2xELmDxyi2v(node)); + case 1: + return (T) ((SNode) getExpectedReturnType_idhEwIGRD(node)); + default: + throw new BHMethodNotFoundException(this, method); + } + } + + @Override + protected T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod method, @Nullable Object[] parameters) { + int methodIndex = BH_METHODS.indexOf(method); + if (methodIndex < 0) { + throw new BHMethodNotFoundException(this, method); + } + switch (methodIndex) { + default: + throw new BHMethodNotFoundException(this, method); + } + } + + @NotNull + @Override + public List> getDeclaredMethods() { + return BH_METHODS; + } + + @NotNull + @Override + public SAbstractConcept getConcept() { + return CONCEPT; + } + private static SNode _quotation_createNode_sm6sey_a0a1() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(MetaAdapterFactory.getLanguage(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, "jetbrains.mps.baseLanguage"), 0xf8cc6bf96dL, "VoidType"), null, null, false); + return quotedNode_1; + } +} diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/Model_ConceptFunctionParameter__BehaviorDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/Model_ConceptFunctionParameter__BehaviorDescriptor.java new file mode 100644 index 000000000000..ab1c9dc26b87 --- /dev/null +++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/Model_ConceptFunctionParameter__BehaviorDescriptor.java @@ -0,0 +1,92 @@ +package jetbrains.mps.lang.test.generator.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry; +import jetbrains.mps.smodel.language.ConceptRegistry; +import jetbrains.mps.core.aspects.behaviour.api.SMethod; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.core.aspects.behaviour.SMethodBuilder; +import jetbrains.mps.core.aspects.behaviour.SJavaCompoundTypeImpl; +import jetbrains.mps.core.aspects.behaviour.SModifiersImpl; +import jetbrains.mps.core.aspects.behaviour.AccessPrivileges; +import java.util.List; +import java.util.Arrays; +import org.jetbrains.annotations.NotNull; +import jetbrains.mps.core.aspects.behaviour.api.SConstructor; +import org.jetbrains.annotations.Nullable; +import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public final class Model_ConceptFunctionParameter__BehaviorDescriptor extends BaseBHDescriptor { + private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d3b3b1L, "jetbrains.mps.lang.test.generator.structure.Model_ConceptFunctionParameter"); + private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry(); + + public static final SMethod getType_id27DJnJtIQ9C = new SMethodBuilder(new SJavaCompoundTypeImpl((Class) ((Class) Object.class))).name("getType").modifiers(SModifiersImpl.create(8, AccessPrivileges.PUBLIC)).concept(CONCEPT).id("27DJnJtIQ9C").registry(REGISTRY).build(); + + private static final List> BH_METHODS = Arrays.>asList(getType_id27DJnJtIQ9C); + + private static void ___init___(@NotNull SNode __thisNode__) { + } + + /*package*/ static SNode getType_id27DJnJtIQ9C(@NotNull SNode __thisNode__) { + return _quotation_createNode_3zbibd_a0a0(); + } + + /*package*/ Model_ConceptFunctionParameter__BehaviorDescriptor() { + super(REGISTRY); + } + + @Override + protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) { + ___init___(node); + } + + @Override + protected T invokeSpecial0(@NotNull SNode node, @NotNull SMethod method, @Nullable Object[] parameters) { + int methodIndex = BH_METHODS.indexOf(method); + if (methodIndex < 0) { + throw new BHMethodNotFoundException(this, method); + } + switch (methodIndex) { + case 0: + return (T) ((SNode) getType_id27DJnJtIQ9C(node)); + default: + throw new BHMethodNotFoundException(this, method); + } + } + + @Override + protected T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod method, @Nullable Object[] parameters) { + int methodIndex = BH_METHODS.indexOf(method); + if (methodIndex < 0) { + throw new BHMethodNotFoundException(this, method); + } + switch (methodIndex) { + default: + throw new BHMethodNotFoundException(this, method); + } + } + + @NotNull + @Override + public List> getDeclaredMethods() { + return BH_METHODS; + } + + @NotNull + @Override + public SAbstractConcept getConcept() { + return CONCEPT; + } + private static SNode _quotation_createNode_3zbibd_a0a0() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(MetaAdapterFactory.getLanguage(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, "jetbrains.mps.lang.smodel"), 0x10a2d94c0cdL, "SModelType"), null, null, false); + return quotedNode_1; + } +} diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/trace.info b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/trace.info index 1daaf0c28614..a8fe801046b4 100644 --- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/trace.info +++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/behavior/trace.info @@ -1,8 +1,200 @@ + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/ConstraintsAspectDescriptor.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/ConstraintsAspectDescriptor.java index 04f7ba873614..7da5f82e71a2 100644 --- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/ConstraintsAspectDescriptor.java +++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/ConstraintsAspectDescriptor.java @@ -21,10 +21,12 @@ public ConstraintsDescriptor getConstraints(SAbstractConcept concept) { case 0: return new TransformationMatchAssertion_Constraints(); case 1: + return new TransformationMatchCustomConditions_Constraints(); + case 2: return new TransformationMatchManyAssertion_Constraints(); default: } return new BaseConstraintsDescriptor(concept); } - private static final ConceptSwitchIndex conceptIndex = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L)).seal(); + private static final ConceptSwitchIndex conceptIndex = new ConceptSwitchIndexBuilder().put(MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d057L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L), MetaIdFactory.conceptId(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x5812b95d667f29d9L)).seal(); } diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/TransformationMatchCustomConditions_Constraints.java b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/TransformationMatchCustomConditions_Constraints.java new file mode 100644 index 000000000000..cdb8c199f9e1 --- /dev/null +++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/TransformationMatchCustomConditions_Constraints.java @@ -0,0 +1,52 @@ +package jetbrains.mps.lang.test.generator.constraints; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.smodel.runtime.ConstraintFunction; +import jetbrains.mps.smodel.runtime.ConstraintContext_CanBeParent; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import jetbrains.mps.smodel.runtime.CheckingNodeContext; +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.SNodePointer; + +public class TransformationMatchCustomConditions_Constraints extends BaseConstraintsDescriptor { + public TransformationMatchCustomConditions_Constraints() { + super(MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, "jetbrains.mps.lang.test.generator.structure.TransformationMatchCustomConditions")); + } + + @Override + protected ConstraintFunction calculateCanBeParentConstraint() { + return new ConstraintFunction() { + @NotNull + public Boolean invoke(@NotNull ConstraintContext_CanBeParent context, @Nullable CheckingNodeContext checkingNodeContext) { + boolean result = staticCanBeAParent(context.getNode(), context.getChildNode(), context.getChildConcept(), context.getLink()); + + if (!(result) && checkingNodeContext != null) { + checkingNodeContext.setBreakingNode(canBeParentBreakingPoint); + } + + return result; + } + }; + } + private static boolean staticCanBeAParent(SNode node, SNode childNode, SAbstractConcept childConcept, SContainmentLink link) { + // this assertion is allowed to reference arguments that point to model only. + if (childNode != null && SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, "jetbrains.mps.lang.test.generator.structure.ArgumentReference"))) { + if (link.equals(MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346acL, "inputModel")) || link.equals(MetaAdapterFactory.getContainmentLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x6c6d272a13d346a9L, 0x6c6d272a13d346aeL, "transformationPlan"))) { + SNode arg = SLinkOperations.getTarget(SNodeOperations.as(childNode, MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, "jetbrains.mps.lang.test.generator.structure.ArgumentReference")), MetaAdapterFactory.getReferenceLink(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf0d05bL, 0x7b1db36ecf0d05cL, "arg")); + return (arg == null) || SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(arg)), MetaAdapterFactory.getConcept(0x68015e26cc4d49dbL, 0x8715b643faea1769L, 0x7b1db36ecf09c6eL, "jetbrains.mps.lang.test.generator.structure.ModelArgument")); + } + // fall through + } + return true; + } + private static SNodePointer canBeParentBreakingPoint = new SNodePointer("r:d9fe9834-daa9-425b-9f8a-1debaf95f372(jetbrains.mps.lang.test.generator.constraints)", "7812943990232402938"); +} diff --git a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/aspectcps-descriptorclasses.mps b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/aspectcps-descriptorclasses.mps index 9c16f69a8930..43bea5e70d54 100644 --- a/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/aspectcps-descriptorclasses.mps +++ b/plugins/mps-testing/languages/gentest/source_gen/jetbrains/mps/lang/test/generator/constraints/aspectcps-descriptorclasses.mps @@ -243,42 +243,57 @@ - - - + + + - + - + - - - + + + - + - + - + + + + + + + + + + + + + + + + - - + + - + @@ -287,2127 +302,3150 @@ - - + + - - - + + + - + - - + + - - - - + + + + - - + + - + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - + - + - - + + - + - - + + - - + + - - - - - + + + + + - - - + + + - + - - - + + + - + - - + + - + - - + + - + - + - - + + - + - - + + - - + + - + - + - - + + - + - - + + - - + + - - - + + + - - - + + + - - - - - - - + + + + + + + - + - - + + - - + + - - - - - + + + + + - + - - + + - - + + - - - - - + + + + + - + - - + + - - + + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - - - - - - + + + + + + + + - + - + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - - - - + + + + - - + + - - - - - + + + + + - - + + - - + + - - + + - - - + + + - - - - - + + + + + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - - - - + + + + + + - + - - + + - - + + - + - - + + - - - - + + + + - - + + - + - - + + - - + + - - + + - - + + - - - - - - - + + + + + + + - - - + + + - - + + - - - - - - + + + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - + - + - - + + - - + + - - + + - - - - - - + + + + + + - + - + - - + + - - + + - - + + - - - - - + + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - - - - + + + + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - + - - - + + + - - - - - + + + + + - - + + - + - + - - - + + + - + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - + - - - - + + + + - + - + - - - + + + - + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - + - - - - + + + + - + - - - + + + - + - - - + + + - + - + - - - + + + - + - - - + + + - - - + + + - + - + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - + - - - + + + - - - + + + - - - - - - + + + + + + - + - - - + + + - - - + + + - - - - - - + + + + + + - + - - - + + + - - - + + + - - - - - - + + + + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - + - + - - + + - + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + -