commit	58e0a95be88170d4f0553a531cdc7213d3b4aaa7	[log] [tgz]
author	Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>	Mon Jul 24 11:25:30 2017 +0200
committer	Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>	Mon Jul 24 11:44:40 2017 +0200
tree	8d555194679bbec3246256c2aaf930b0ac692166
parent	520ca571681a549787992331cda545e0bf96e9d2 [diff]

[520093] Merging framework test projects

Change-Id: I5813b7e4a98576b0869caa17669e86e235c76610
Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>

cps/frameworktests/org.eclipse.viatra.examples.cps.tests.instances/.project[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.instances/META-INF/MANIFEST.MF[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.instances/build.properties[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.instances/pom.xml[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/.classpath[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/.project[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/.settings/org.eclipse.jdt.core.prefs[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/.settings/org.eclipse.pde.core.prefs[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/META-INF/MANIFEST.MF[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/build.properties[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/pom.xml[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_changeAppInstanceAllocationLocation.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_changeAppInstanceIdentifier.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_changeAppInstanceType.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_changeAppTypeIdentifier.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_dangling.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_deleteAppInstance.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_deleteAppType.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_dred_deps_a3a2_del.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_dred_deps_a3a5_del.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_dred_deps_all.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_dred_deps_components.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_dred_deps_init.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_newAppInstance.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_newComplexStructure.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_newHostInstance.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_newHostInstanceWithMoreHddThanRam.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_newHostInstanceWithMoreRamThanHdd.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_recursion_chainRec.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_recursion_chainTC.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_recursion_communicationRemoved_chainRec.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_recursion_communicationRemoved_chainTC.snapshot[Deleted - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/.classpath[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/.project[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/META-INF/MANIFEST.MF[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/build.properties[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/instances/aggregators.cyberphysicalsystem[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.instances/aggregators.cyberphysicalsystem - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/instances/dangling.cyberphysicalsystem[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.instances/dangling.cyberphysicalsystem - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/instances/demo.cyberphysicalsystem[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.instances/demo.cyberphysicalsystem - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/instances/dred.cyberphysicalsystem[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.instances/dred.cyberphysicalsystem - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_avgCPU.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_avgCPU.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_changeAppInstanceAllocationLocation.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_changeAppInstanceIdentifier.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_changeAppInstanceType.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_changeAppTypeIdentifier.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_dangling.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_deleteAllHostInstance.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_deleteAllHostInstance.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_deleteAllHostType.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_deleteAllHostType.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_deleteAppInstance.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_deleteAppType.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_deleteHostInstanceWithTheMostHostedApplication.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_deleteHostInstanceWithTheMostHostedApplication.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_deleteHostType.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_deleteHostType.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_dred_deps_a3a2_del.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_dred_deps_a3a5_del.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_dred_deps_all.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_dred_deps_components.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_dred_deps_init.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_literalUsage.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_literalUsage.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_max5_Priority.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_max5_Priority.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_max6_Priority.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_max6_Priority.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_max7_Priority.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_max7_Priority.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_min0_Priority.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_min0_Priority.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_min1_Priority.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_min1_Priority.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_min2_Priority.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_min2_Priority.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_newAppInstance.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_newComplexStructure.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_newHostInstance.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_newHostInstanceWithMoreHddThanRam.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_newHostInstanceWithMoreRamThanHdd.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_newTransition.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_newTransition.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_recursion_chainRec.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_recursion_chainTC.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_recursion_communicationRemoved_chainRec.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_recursion_communicationRemoved_chainTC.snapshot[Added - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_sum0_Priority.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_sum0_Priority.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_sum21_Priority.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_sum21_Priority.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_sumCPU.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_sumCPU.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/models/snapshots/test_trickyJoin.snapshot[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/snapshots/test_trickyJoin.snapshot - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/plugin.xml[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/plugin.xml - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/pom.xml[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src-gen/.gitignore[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src-gen/.gitignore - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/APICpsTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/AggregatorComparisonTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/AggregatorTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/AnonymousVariablesCpsTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/BaseIndexerIndexingLevelsTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/BaseIndexerTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/BasicCpsTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/DRedTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/DanglingTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/ErrorHandlingTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/FlattenedPatternCallCpsTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/LiteralValuesTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/LocalSearchPlanCostOverflowTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/ModelManipulationAggregatorTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/ModelManipulationAvgAggregatorTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/ModelManipulationCpsTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/ModelManipulationTrickyJoinTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/RecursionCpsTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/TestingFrameworkTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/VariableEqualityCpsTest.xtend[diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/LiteralUsage.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/LiteralUsage.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/aggregators.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/aggregators.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/cpsValidationRules.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/cpsValidationRules.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/danglingTestQueries.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/danglingTestQueries.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/dred.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/dred.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/errorHandling.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/errorHandling.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/flattenedPatternCall.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/flattenedPatternCall.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/functionalDependencies.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/functionalDependencies.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/localsearchPlannerTests.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/localsearchPlannerTests.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/otherTests.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/otherTests.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/recursiveQueries.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/recursiveQueries.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/simpleCpsQueries.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/simpleCpsQueries.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/trickyJoin.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/trickyJoin.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/unnamedVariables.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/unnamedVariables.vql - diff]
cps/frameworktests/org.eclipse.viatra.examples.cps.tests/src/org/eclipse/viatra/examples/cps/tests/queries/variablesEquality.vql[Renamed from cps/frameworktests/org.eclipse.viatra.examples.cps.tests.queries/src/org/eclipse/viatra/examples/cps/tests/queries/variablesEquality.vql - diff]
cps/frameworktests/org.eclipse.viatra.tests.parent/pom.xml[diff]

119 files changed

tree: 8d555194679bbec3246256c2aaf930b0ac692166

README.md

VIATRA - Examples

Contributing to VIATRA

Please read the Contributing wiki page to understand our contribution process.

License

All code in this repository is available under the Eclipse Public License v1.0: http://www.eclipse.org/legal/epl-v10.html