Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2017-01-25 14:23:00 +0000
committerPierre-Charles David2017-01-27 13:10:03 +0000
commit909994b3694c5b5b1b5ff7e804db867304d750bd (patch)
treedfbb3adac032b62b01351acd7fb7171094aaca64
parent3acde8ddf288ff0088594dbd3c34420adca5a736 (diff)
downloadorg.eclipse.sirius-909994b3694c5b5b1b5ff7e804db867304d750bd.tar.gz
org.eclipse.sirius-909994b3694c5b5b1b5ff7e804db867304d750bd.tar.xz
org.eclipse.sirius-909994b3694c5b5b1b5ff7e804db867304d750bd.zip
[DRAFT] Add timestamp info to AcceleoMTInterpreterOnPackageImportTests to understand where it spends its time
-rw-r--r--plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java287
-rw-r--r--plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/table/AllTablePluginTests.java64
-rw-r--r--plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/AcceleoMTInterpreterOnPackageImportTests.java31
-rw-r--r--plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java4
-rw-r--r--plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java78
-rw-r--r--plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java2
6 files changed, 102 insertions, 364 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
index 012c669fa2..6af9add523 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
@@ -10,143 +10,11 @@
*******************************************************************************/
package org.eclipse.sirius.tests.suite.common;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.sirius.ext.jface.viewers.IToolTipProvider;
-import org.eclipse.sirius.tests.unit.api.componentization.DiagramComponentizationManagerTest;
-import org.eclipse.sirius.tests.unit.api.componentization.DiagramExtensionDescriptionTest;
-import org.eclipse.sirius.tests.unit.api.componentization.MetamodelSpecificationInRepresentationExtensionDescriptionTest;
-import org.eclipse.sirius.tests.unit.api.convert.ConvertProjectToModelingProjectTest;
-import org.eclipse.sirius.tests.unit.api.convert.ConvertViewpointModelingProjectToSiriusModelingProjectTest;
-import org.eclipse.sirius.tests.unit.api.dialect.DialectEditorCloserTest;
-import org.eclipse.sirius.tests.unit.api.dialect.DialectManagerTest;
-import org.eclipse.sirius.tests.unit.api.dialect.DialectUIManagerTest;
-import org.eclipse.sirius.tests.unit.api.editors.EditorNameAdapterTests;
-import org.eclipse.sirius.tests.unit.api.editors.EditorVariousTests;
-import org.eclipse.sirius.tests.unit.api.editors.EntitiesSpecificEditorTests;
-import org.eclipse.sirius.tests.unit.api.editors.WorkspaceEPackageRegistryTests;
-import org.eclipse.sirius.tests.unit.api.editors.traceability.GoToMarkerTests;
-import org.eclipse.sirius.tests.unit.api.find.FindTest;
-import org.eclipse.sirius.tests.unit.api.initialization.InitializationTest;
-import org.eclipse.sirius.tests.unit.api.interpreter.CompletionTests;
-import org.eclipse.sirius.tests.unit.api.interpreter.crossReferencer.AcceleoCrossReferencerTest;
-import org.eclipse.sirius.tests.unit.api.modelingproject.SaveWhenNoEditorsTests;
-import org.eclipse.sirius.tests.unit.api.modelingproject.SemanticResourcesManagementTests;
-import org.eclipse.sirius.tests.unit.api.navigator.GroupingContentProviderByContainingTest;
-import org.eclipse.sirius.tests.unit.api.navigator.GroupingContentProviderTest;
-import org.eclipse.sirius.tests.unit.api.refresh.ModifyHeaderLabelExpressionTest;
-import org.eclipse.sirius.tests.unit.api.resource.ResourceStrategyForUmlTests;
-import org.eclipse.sirius.tests.unit.api.resource.ResourceStrategyTests;
-import org.eclipse.sirius.tests.unit.api.resource.SemanticResourceURIInAirdTests;
-import org.eclipse.sirius.tests.unit.api.resource.WorkspaceDragAndDropSupportTests;
-import org.eclipse.sirius.tests.unit.api.routing.EdgeRoutingStyleEdgeConditionalStyleTest;
-import org.eclipse.sirius.tests.unit.api.routing.EdgeRoutingStyleEndUserOverrideTest;
-import org.eclipse.sirius.tests.unit.api.routing.EdgeRoutingStyleTests;
-import org.eclipse.sirius.tests.unit.api.semantic.XSDSemanticResourceTests;
-import org.eclipse.sirius.tests.unit.api.session.DAnalysisSessionTests;
-import org.eclipse.sirius.tests.unit.api.session.ModelAccessorLifecycleTest;
-import org.eclipse.sirius.tests.unit.api.session.OpenSessionTest;
-import org.eclipse.sirius.tests.unit.api.session.ReloadSessionTest;
-import org.eclipse.sirius.tests.unit.api.session.ResourceVersionMismatchTest;
-import org.eclipse.sirius.tests.unit.api.session.SampleSessionTest;
-import org.eclipse.sirius.tests.unit.api.session.SessionEditorInputTests;
import org.eclipse.sirius.tests.unit.api.session.SessionManagerListener2Tests;
-import org.eclipse.sirius.tests.unit.api.session.SessionSemanticResourceTests;
-import org.eclipse.sirius.tests.unit.api.session.SessionServiceTest;
-import org.eclipse.sirius.tests.unit.api.session.SiriusComparatorTests;
-import org.eclipse.sirius.tests.unit.api.session.SiriusRegistryListener2Tests;
-import org.eclipse.sirius.tests.unit.api.session.SiriusRegistryTests;
-import org.eclipse.sirius.tests.unit.api.session.ViewpointSelectionTests;
-import org.eclipse.sirius.tests.unit.api.tools.SiriusControlAndCrossReferenceInMultiSessionTest;
-import org.eclipse.sirius.tests.unit.api.vsm.edit.SiriusAdapterFactoryRegistryTest;
-import org.eclipse.sirius.tests.unit.common.DialectEditorsOpeningWithFailingSessionOpeningTests;
-import org.eclipse.sirius.tests.unit.common.EclipseUtilTest;
-import org.eclipse.sirius.tests.unit.common.EqualityHelperTestCase;
-import org.eclipse.sirius.tests.unit.common.InterpreterVariablesTestCase;
-import org.eclipse.sirius.tests.unit.common.OperationCanceledExceptionSessionTest;
-import org.eclipse.sirius.tests.unit.common.PreferencesTests;
-import org.eclipse.sirius.tests.unit.common.RefreshEditorsPrecommitListenerTests;
-import org.eclipse.sirius.tests.unit.common.RestoreSessionFromEditorInputTests;
-import org.eclipse.sirius.tests.unit.common.SaverTest;
-import org.eclipse.sirius.tests.unit.common.SiriusCrossReferenceAdapterTests;
-import org.eclipse.sirius.tests.unit.common.SubMenusPrioritiesTest;
-import org.eclipse.sirius.tests.unit.common.TooltipProviderTests;
-import org.eclipse.sirius.tests.unit.common.TransientSessionTests;
-import org.eclipse.sirius.tests.unit.common.WorkspaceResourceSyncTestCase;
-import org.eclipse.sirius.tests.unit.common.ZombieViewpointsTest;
-import org.eclipse.sirius.tests.unit.common.interpreter.CompoundInterpreterTestCase;
-import org.eclipse.sirius.tests.unit.common.interpreter.CreateCellToolInterpreterTest;
-import org.eclipse.sirius.tests.unit.common.interpreter.acceleo.aql.AcceleoQueryLanguageCompletionTests;
import org.eclipse.sirius.tests.unit.common.interpreter.acceleo.mtl.AcceleoMTInterpreterOnPackageImportTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.acceleo.mtl.AcceleoMTLCompletionTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.acceleo.mtl.AcceleoMTLInterpreterTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.acceleo.mtl.AcceleoPackageRegistryTest;
-import org.eclipse.sirius.tests.unit.common.interpreter.acceleo.mtl.IInterpreterValidationExpressionTest;
-import org.eclipse.sirius.tests.unit.common.interpreter.acceleo.mtl.InterpretedExpressionTargetSwitchTest;
-import org.eclipse.sirius.tests.unit.common.interpreter.feature.FeatureCompletionTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.feature.FeatureInterpreterTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.feature.FeatureProposalProviderTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.ocl.OCLCompletionTest;
-import org.eclipse.sirius.tests.unit.common.interpreter.service.ServiceCompletionTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.service.ServiceInterpreterTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.service.ServiceProposalProviderTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.variable.VariableCompletionTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.variable.VariableInterpreterTests;
-import org.eclipse.sirius.tests.unit.common.interpreter.variable.VariableProposalProviderTests;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign01;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign02;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign03;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign04;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign05;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign06;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign07;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign08;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign09;
-import org.eclipse.sirius.tests.unit.common.migration.DiagramMigrationTestCampaign10;
-import org.eclipse.sirius.tests.unit.common.migration.GeneralMigrationMechanismTest;
-import org.eclipse.sirius.tests.unit.common.migration.MigrationFromSirius0_9Test;
-import org.eclipse.sirius.tests.unit.common.migration.MigrationFromSirius1_0_0_M5Test;
-import org.eclipse.sirius.tests.unit.common.migration.ModelsToSemanticResourcesMigrationTest;
-import org.eclipse.sirius.tests.unit.common.migration.NoteAttachmentMigrationTest;
-import org.eclipse.sirius.tests.unit.common.migration.VariableMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.filter.EObjectSelectionFilterTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.BorderSizeMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.ComputedStyleDescriptionCachePackingFileMigrationParticipantTests;
-import org.eclipse.sirius.tests.unit.diagram.migration.CorruptedViewsMigrationTests;
-import org.eclipse.sirius.tests.unit.diagram.migration.DDiagramSetRemovalMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.DRepDescriptorCreationMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.DRepresentationContainerRemovalMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.DRepresentationMoveToRootObjectsMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.DiagramSplitMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.FontFormatMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.FontStyleForDNodeListElementMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.FragmentedFilesMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.ListContainerAttributeMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.MigrationCompartmentWithLayoutConstraintsTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.MigrationEdgeLabelLocationToBoundsTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.MigrationInconsistentGMFVisibilityTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.MigrationLabelBoundsToLocationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.MigrationOfCollapsedBorderedNodeTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.MigrationOfHideLabelFilterInconsistencyTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.MigrationRoutingStyleEndUserOverrideTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.OptionalLayerToAdditionalLayerMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.ReferencedModelResourceMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.RemoveAcceleoReferencesMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.RepairMigrateLostDiagramElementsTC1Test;
-import org.eclipse.sirius.tests.unit.diagram.migration.RepairMigrateLostDiagramElementsTC2Test;
-import org.eclipse.sirius.tests.unit.diagram.migration.RepairMigratePinStatusTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.RepairOnLabelHiddenTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.RepairOnStyleCustomizationsTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.RepairTest;
import org.eclipse.sirius.tests.unit.diagram.migration.RepairWithActivatedFiltersTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.RgbValuesEDataTypeMigrationTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.RunRepairTest;
-import org.eclipse.sirius.tests.unit.diagram.migration.SetVersionTest;
import org.eclipse.sirius.tests.unit.multipageeditor.SiriusMultiPageEditorTest;
-import org.eclipse.sirius.tests.unit.perf.common.CommonPreferencesTest;
-import org.eclipse.sirius.tests.unit.perf.common.Session1MillionTests;
-import junit.framework.JUnit4TestAdapter;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -171,159 +39,7 @@ public class AllCommonPluginTests extends TestCase {
* the suite into which to add the tests.
*/
public static void addGerritPart(TestSuite suite) {
- suite.addTestSuite(RefreshEditorsPrecommitListenerTests.class);
- suite.addTestSuite(EqualityHelperTestCase.class);
- suite.addTestSuite(WorkspaceResourceSyncTestCase.class);
- suite.addTestSuite(InterpreterVariablesTestCase.class);
- suite.addTestSuite(DialectEditorsOpeningWithFailingSessionOpeningTests.class);
- suite.addTestSuite(PreferencesTests.class);
-
- suite.addTestSuite(ConvertProjectToModelingProjectTest.class);
-
- suite.addTestSuite(RepairOnStyleCustomizationsTest.class);
- suite.addTestSuite(RepairOnLabelHiddenTest.class);
- suite.addTestSuite(RepairTest.class);
- // suite.addTestSuite(ModelBasedTransformationEngineTests.class);
- // suite.addTestSuite(ColorsMigrationTests.class);
- // suite.addTestSuite(SemanticCandidateExpressionMigrationTests.class);
- suite.addTestSuite(MigrationLabelBoundsToLocationTest.class);
- suite.addTestSuite(MigrationEdgeLabelLocationToBoundsTest.class);
- suite.addTestSuite(MigrationCompartmentWithLayoutConstraintsTest.class);
- suite.addTestSuite(MigrationInconsistentGMFVisibilityTest.class);
- suite.addTestSuite(RepairMigrateLostDiagramElementsTC1Test.class);
- suite.addTestSuite(RepairMigrateLostDiagramElementsTC2Test.class);
- suite.addTestSuite(RepairMigratePinStatusTest.class);
- suite.addTestSuite(GeneralMigrationMechanismTest.class);
- // suite.addTestSuite(EdgeStyleDescriptionAndEdgeStyleMigrationTests.class);
- suite.addTestSuite(FragmentedFilesMigrationTest.class);
- suite.addTestSuite(MigrationOfCollapsedBorderedNodeTest.class);
- suite.addTestSuite(MigrationOfHideLabelFilterInconsistencyTest.class);
- suite.addTestSuite(ListContainerAttributeMigrationTest.class);
- suite.addTestSuite(SetVersionTest.class);
- suite.addTestSuite(DiagramSplitMigrationTest.class);
- // suite.addTestSuite(ComponentizedFilesMigrationTests.class);
- suite.addTestSuite(RunRepairTest.class);
- suite.addTestSuite(DDiagramSetRemovalMigrationTest.class);
- // suite.addTestSuite(AutomaticMigrationOnAirdResourceTest.class);
- suite.addTestSuite(ReferencedModelResourceMigrationTest.class);
- suite.addTestSuite(RemoveAcceleoReferencesMigrationTest.class);
- suite.addTestSuite(FontStyleForDNodeListElementMigrationTest.class);
- // suite.addTestSuite(SequenceInstanceRoleSizeRepairMigrationTestCase.class);
- suite.addTestSuite(OptionalLayerToAdditionalLayerMigrationTest.class);
- suite.addTestSuite(MigrationRoutingStyleEndUserOverrideTest.class);
- suite.addTestSuite(CorruptedViewsMigrationTests.class);
- suite.addTestSuite(OperationCanceledExceptionSessionTest.class);
- suite.addTestSuite(MigrationFromSirius0_9Test.class);
- suite.addTestSuite(MigrationFromSirius1_0_0_M5Test.class);
- suite.addTestSuite(ComputedStyleDescriptionCachePackingFileMigrationParticipantTests.class);
- suite.addTestSuite(RgbValuesEDataTypeMigrationTest.class);
- suite.addTestSuite(ConvertViewpointModelingProjectToSiriusModelingProjectTest.class);
- suite.addTestSuite(FontFormatMigrationTest.class);
- suite.addTestSuite(BorderSizeMigrationTest.class);
- suite.addTestSuite(VariableMigrationTest.class);
- suite.addTestSuite(DRepresentationContainerRemovalMigrationTest.class);
- suite.addTestSuite(DRepDescriptorCreationMigrationTest.class);
- suite.addTestSuite(NoteAttachmentMigrationTest.class);
- suite.addTestSuite(DRepresentationMoveToRootObjectsMigrationTest.class);
-
- suite.addTest(new JUnit4TestAdapter(CommonPreferencesTest.class));
- suite.addTest(new JUnit4TestAdapter(GroupingContentProviderTest.class));
- suite.addTest(new JUnit4TestAdapter(GroupingContentProviderByContainingTest.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign01.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign02.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign03.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign04.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign05.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign06.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign07.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign08.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign09.class));
- suite.addTest(new JUnit4TestAdapter(DiagramMigrationTestCampaign10.class));
-
- suite.addTestSuite(InitializationTest.class);
- suite.addTestSuite(CompletionTests.class);
- suite.addTestSuite(OCLCompletionTest.class);
- suite.addTestSuite(DiagramComponentizationManagerTest.class);
- suite.addTestSuite(DiagramExtensionDescriptionTest.class);
- suite.addTestSuite(MetamodelSpecificationInRepresentationExtensionDescriptionTest.class);
- suite.addTestSuite(DialectManagerTest.class);
- suite.addTestSuite(DialectEditorCloserTest.class);
- suite.addTestSuite(DialectUIManagerTest.class);
- suite.addTestSuite(FindTest.class);
- suite.addTestSuite(EdgeRoutingStyleTests.class);
- suite.addTestSuite(EdgeRoutingStyleEdgeConditionalStyleTest.class);
- suite.addTestSuite(EdgeRoutingStyleEndUserOverrideTest.class);
-
- suite.addTestSuite(DAnalysisSessionTests.class);
- suite.addTestSuite(SampleSessionTest.class);
- suite.addTestSuite(SessionEditorInputTests.class);
- suite.addTestSuite(SiriusRegistryTests.class);
- suite.addTestSuite(ResourceVersionMismatchTest.class);
- suite.addTestSuite(SiriusRegistryListener2Tests.class);
- suite.addTestSuite(SessionSemanticResourceTests.class);
- suite.addTestSuite(SessionServiceTest.class);
-
- suite.addTestSuite(EditorNameAdapterTests.class);
- suite.addTestSuite(EditorVariousTests.class);
- suite.addTestSuite(EntitiesSpecificEditorTests.class);
- suite.addTestSuite(GoToMarkerTests.class);
- suite.addTestSuite(WorkspaceEPackageRegistryTests.class);
-
- suite.addTestSuite(SiriusComparatorTests.class);
- suite.addTestSuite(ViewpointSelectionTests.class);
- suite.addTestSuite(SiriusAdapterFactoryRegistryTest.class);
-
- suite.addTestSuite(WorkspaceDragAndDropSupportTests.class);
- suite.addTestSuite(EObjectSelectionFilterTest.class);
-
- // suite.addTestSuite(LabelAlignmentMigrationTests.class);
- // suite.addTestSuite(LabelAlignmentMigration2Tests.class);
- // suite.addTestSuite(BundledImageDescriptionBorderColorMigrationTests.class);
- suite.addTestSuite(SemanticResourcesManagementTests.class);
- suite.addTestSuite(SaveWhenNoEditorsTests.class);
- suite.addTestSuite(ModifyHeaderLabelExpressionTest.class);
-
- suite.addTestSuite(CreateCellToolInterpreterTest.class);
- suite.addTestSuite(AcceleoMTLInterpreterTests.class);
- suite.addTestSuite(AcceleoMTLCompletionTests.class);
- suite.addTestSuite(AcceleoQueryLanguageCompletionTests.class);
- suite.addTestSuite(AcceleoCrossReferencerTest.class);
- suite.addTestSuite(AcceleoPackageRegistryTest.class);
- suite.addTestSuite(IInterpreterValidationExpressionTest.class);
- suite.addTestSuite(FeatureInterpreterTests.class);
- suite.addTestSuite(FeatureCompletionTests.class);
- suite.addTestSuite(ServiceInterpreterTests.class);
- suite.addTestSuite(ServiceCompletionTests.class);
- suite.addTestSuite(VariableInterpreterTests.class);
- suite.addTestSuite(VariableCompletionTests.class);
- suite.addTestSuite(FeatureProposalProviderTests.class);
- suite.addTestSuite(ServiceProposalProviderTests.class);
- suite.addTestSuite(VariableProposalProviderTests.class);
- suite.addTestSuite(InterpretedExpressionTargetSwitchTest.class);
- suite.addTestSuite(ReloadSessionTest.class);
- suite.addTestSuite(EclipseUtilTest.class);
- suite.addTestSuite(CompoundInterpreterTestCase.class);
- // TooltipProviderTests must be executed with the inner IAdapterFactory
- // not with another one
- if (!Platform.getAdapterManager().hasAdapter(EcorePackage.eINSTANCE, IToolTipProvider.class.getName())) {
- suite.addTestSuite(TooltipProviderTests.class);
- }
- suite.addTestSuite(TransientSessionTests.class);
- suite.addTestSuite(RestoreSessionFromEditorInputTests.class);
- suite.addTestSuite(SiriusCrossReferenceAdapterTests.class);
- suite.addTestSuite(SaverTest.class);
- suite.addTestSuite(XSDSemanticResourceTests.class);
- suite.addTestSuite(SiriusControlAndCrossReferenceInMultiSessionTest.class);
- suite.addTestSuite(ModelsToSemanticResourcesMigrationTest.class);
- suite.addTestSuite(SemanticResourceURIInAirdTests.class);
- suite.addTestSuite(ResourceStrategyTests.class);
- suite.addTestSuite(ResourceStrategyForUmlTests.class);
- suite.addTestSuite(OpenSessionTest.class);
- suite.addTestSuite(ModelAccessorLifecycleTest.class);
-
- suite.addTestSuite(SubMenusPrioritiesTest.class);
- suite.addTestSuite(ZombieViewpointsTest.class);
- suite.addTestSuite(Session1MillionTests.class);
+ suite.addTestSuite(AcceleoMTInterpreterOnPackageImportTests.class);
}
/**
@@ -353,7 +69,6 @@ public class AllCommonPluginTests extends TestCase {
public static Test suite() {
final TestSuite suite = new TestSuite("Common Plugin Tests");
addGerritPart(suite);
- addNonGerritPart(suite);
return suite;
}
}
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/table/AllTablePluginTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/table/AllTablePluginTests.java
index 719818e8ac..acedac1646 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/table/AllTablePluginTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/table/AllTablePluginTests.java
@@ -73,38 +73,38 @@ public class AllTablePluginTests extends TestCase {
*/
public static Test suite() {
final TestSuite suite = new TestSuite("Table Plugin Tests");
- suite.addTestSuite(DTableSynchronizerTest.class);
- suite.addTestSuite(DTableSynchronizerWithEditorTest.class);
- suite.addTestSuite(DTableCellStylesTest.class);
- suite.addTestSuite(DTableSortByColumnTest.class);
- suite.addTestSuite(DTableSortByColumnTestWithEditor.class);
- suite.addTestSuite(DTableSortByLineTest.class);
- suite.addTestSuite(DTableSortByLineWithEditorTests.class);
- suite.addTestSuite(DialectManagerTest.class);
- suite.addTestSuite(ExportToCsvTest.class);
- suite.addTestSuite(MultiLineExportToCsvTest.class);
- suite.addTestSuite(TreeLabelProviderTest.class);
- suite.addTestSuite(PopupMenuTest.class);
- suite.addTestSuite(DefaultVariablesOnToolsTest.class);
- suite.addTestSuite(TableAdapterFactoryRegistryTest.class);
- suite.addTestSuite(SpecifyArrays_Test.class);
- suite.addTestSuite(CreateTableWithToolWithPrecondtionTest.class);
- suite.addTestSuite(RefreshToolActionBarTest.class);
- suite.addTestSuite(TableToolPreconditionCompletionTest.class);
- suite.addTestSuite(DTableSynchronizerVSMWithEditorTest.class);
- suite.addTestSuite(DCrossTableSynchronizerVSMWithEditorTest.class);
- suite.addTestSuite(DCrossTableNoDomainSynchronizerVSMWithEditorTest.class);
- suite.addTestSuite(NoVariableDuplicationTest.class);
- suite.addTestSuite(InvalidParentExpressionTest.class);
- suite.addTestSuite(TableManuelRefreshTests.class);
- suite.addTestSuite(TableNotDirtyOnOpeningTest.class);
- suite.addTest(ExploitArrays_Test.suite());
- suite.addTestSuite(DCellDeleteTest.class);
- suite.addTestSuite(CrossReferencedDLineDeleteTest.class);
- suite.addTestSuite(TableContentTest.class);
- suite.addTestSuite(VariableOnTableCreationToolsTest.class);
- suite.addTestSuite(TableStyleRefreshTest.class);
- suite.addTestSuite(TableWithMultivaluedAttributeTest.class);
+// suite.addTestSuite(DTableSynchronizerTest.class);
+// suite.addTestSuite(DTableSynchronizerWithEditorTest.class);
+// suite.addTestSuite(DTableCellStylesTest.class);
+// suite.addTestSuite(DTableSortByColumnTest.class);
+// suite.addTestSuite(DTableSortByColumnTestWithEditor.class);
+// suite.addTestSuite(DTableSortByLineTest.class);
+// suite.addTestSuite(DTableSortByLineWithEditorTests.class);
+// suite.addTestSuite(DialectManagerTest.class);
+// suite.addTestSuite(ExportToCsvTest.class);
+// suite.addTestSuite(MultiLineExportToCsvTest.class);
+// suite.addTestSuite(TreeLabelProviderTest.class);
+// suite.addTestSuite(PopupMenuTest.class);
+// suite.addTestSuite(DefaultVariablesOnToolsTest.class);
+// suite.addTestSuite(TableAdapterFactoryRegistryTest.class);
+// suite.addTestSuite(SpecifyArrays_Test.class);
+// suite.addTestSuite(CreateTableWithToolWithPrecondtionTest.class);
+// suite.addTestSuite(RefreshToolActionBarTest.class);
+// suite.addTestSuite(TableToolPreconditionCompletionTest.class);
+// suite.addTestSuite(DTableSynchronizerVSMWithEditorTest.class);
+// suite.addTestSuite(DCrossTableSynchronizerVSMWithEditorTest.class);
+// suite.addTestSuite(DCrossTableNoDomainSynchronizerVSMWithEditorTest.class);
+// suite.addTestSuite(NoVariableDuplicationTest.class);
+// suite.addTestSuite(InvalidParentExpressionTest.class);
+// suite.addTestSuite(TableManuelRefreshTests.class);
+// suite.addTestSuite(TableNotDirtyOnOpeningTest.class);
+// suite.addTest(ExploitArrays_Test.suite());
+// suite.addTestSuite(DCellDeleteTest.class);
+// suite.addTestSuite(CrossReferencedDLineDeleteTest.class);
+// suite.addTestSuite(TableContentTest.class);
+// suite.addTestSuite(VariableOnTableCreationToolsTest.class);
+// suite.addTestSuite(TableStyleRefreshTest.class);
+// suite.addTestSuite(TableWithMultivaluedAttributeTest.class);
return suite;
}
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/AcceleoMTInterpreterOnPackageImportTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/AcceleoMTInterpreterOnPackageImportTests.java
index a4e471da8c..50c16cae85 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/AcceleoMTInterpreterOnPackageImportTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/AcceleoMTInterpreterOnPackageImportTests.java
@@ -10,8 +10,11 @@
*******************************************************************************/
package org.eclipse.sirius.tests.unit.common.interpreter.acceleo.mtl;
+import java.text.MessageFormat;
import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.BasicEObjectImpl;
import org.eclipse.sirius.diagram.description.DiagramDescription;
@@ -41,6 +44,8 @@ public class AcceleoMTInterpreterOnPackageImportTests extends SiriusDiagramTestC
private static final String DOCBOOK_NS_URI = "http://docbook.org/ns/docbook";
private static final String INVALID_PROXY_URI = "http://unknown.org/ns/invalidmm";
+
+ private long start;
/**
*
@@ -50,10 +55,20 @@ public class AcceleoMTInterpreterOnPackageImportTests extends SiriusDiagramTestC
*/
@Override
protected void setUp() throws Exception {
+ start = System.nanoTime();
super.setUp();
+ timestamp("super.setUp()");
copyFilesToTestProject(SiriusTestsPlugin.PLUGIN_ID, TEST_FOLDER_PATH, VSM_PATH, SEMANTIC_MODEL_PATH, REPRESENTATION_FILE_PATH);
+ timestamp("copyFilesToTestProject()");
genericSetUp(Collections.singleton(TEMPORARY_PROJECT_NAME + "/" + SEMANTIC_MODEL_PATH), Collections.singleton(TEMPORARY_PROJECT_NAME + "/" + VSM_PATH), TEMPORARY_PROJECT_NAME + "/"
+ REPRESENTATION_FILE_PATH);
+ timestamp("genericSetup()");
+ }
+
+ private void timestamp(String string) {
+ long now = System.nanoTime();
+ long elapsed_ms = TimeUnit.NANOSECONDS.toMillis(now - start);
+ System.out.println(MessageFormat.format("===== Timestamp {0} @ {1}ms", string, elapsed_ms));
}
/**
@@ -66,12 +81,17 @@ public class AcceleoMTInterpreterOnPackageImportTests extends SiriusDiagramTestC
public void testPackageImportWithPrefix() {
String descName = "DiagramReferencingMetamodels";
RepresentationDescription desc = getRepresentationDescription(descName, viewpoints.iterator().next());
- assertEquals(descName + " should reference 2 metamodels.", 2, desc.getMetamodel().size());
- assertEquals(EPackage.Registry.INSTANCE.getEPackage(DOCBOOK_NS_URI), desc.getMetamodel().get(0));
- assertTrue(desc.getMetamodel().get(1).eIsProxy());
- assertEquals(INVALID_PROXY_URI, ((BasicEObjectImpl) desc.getMetamodel().get(1)).eProxyURI().toString());
+ timestamp("getRepresentationDescription()");
+ EList<EPackage> metamodel = desc.getMetamodel();
+ timestamp("getMetamodel()");
+ assertEquals(descName + " should reference 2 metamodels.", 2, metamodel.size());
+ assertEquals(EPackage.Registry.INSTANCE.getEPackage(DOCBOOK_NS_URI), metamodel.get(0));
+ timestamp("EPackage.Registry.INSTANCE.getEPackage(DOCBOOK_NS_URI)");
+ assertTrue(metamodel.get(1).eIsProxy());
+ assertEquals(INVALID_PROXY_URI, ((BasicEObjectImpl) metamodel.get(1)).eProxyURI().toString());
doCreateRepresentationAndCheckThatNoErrorOccur(descName);
+ timestamp("doCreateRepresentationAndCheckThatNoErrorOccur()");
}
/**
@@ -115,8 +135,11 @@ public class AcceleoMTInterpreterOnPackageImportTests extends SiriusDiagramTestC
protected void doCreateRepresentationAndCheckThatNoErrorOccur(String representationDescriptionName) {
boolean oldIsErrorCatchActive = isErrorCatchActive();
setErrorCatchActive(true);
+ timestamp("setErrorCatchActive()");
createRepresentation(representationDescriptionName, session.getSemanticResources().iterator().next().getContents().get(0));
+ timestamp("createRepresentation()");
assertFalse("No compilation error should have been raised by the diagram creation. " + getErrorLoggersMessage(), doesAnErrorOccurs());
+ timestamp("assert No Errors Occured()");
setErrorCatchActive(oldIsErrorCatchActive);
}
}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
index 62feffb4e2..98758a5634 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
@@ -109,8 +109,8 @@ public class AllTestSuite extends TestCase {
*/
public static Test suite() {
TestSuite suite = new TestSuite("Sirius SwtBot tests");
- addPart1(suite);
- addPart2(suite);
+// addPart1(suite);
+// addPart2(suite);
return suite;
}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java
index cd1db700b3..a9c14ff5ee 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java
@@ -150,45 +150,45 @@ public class SequenceSwtBotTestSuite extends TestCase {
*/
public static Test suite() {
final TestSuite suite = new TestSuite("SwtBot tests on sequence diagram");
- addGerritPart(suite);
-
- suite.addTestSuite(SequenceReturnMessageTest.class);
- suite.addTestSuite(SyncCallTest.class);
- suite.addTestSuite(SyncCallMoveTest.class);
- suite.addTestSuite(SyncCall2Test.class);
- suite.addTestSuite(SyncCall3Test.class);
- suite.addTestSuite(SyncCallInOperandReorderTest.class);
- suite.addTestSuite(CreateMessageOnCollapsedExecutionTest.class);
- suite.addTestSuite(SequenceExecutionMessageToSelfTest.class);
- suite.addTestSuite(SequenceDestroyMessageTest.class);
- suite.addTestSuite(NoteAttachmentTest.class);
- suite.addTestSuite(SequenceArrangeLinkedBorderedNodesTest.class);
- suite.addTestSuite(InteractionUseSingleClickCreationTests.class);
- suite.addTestSuite(InteractionUseTwoClickCreationTests.class);
- suite.addTestSuite(InteractionUseCoverageTests.class);
- suite.addTestSuite(InteractionUseTests.class);
- suite.addTestSuite(InteractionUseMoveDownTests.class);
- suite.addTestSuite(InteractionUseResizeTests.class);
- suite.addTestSuite(CombinedFragmentsSingleClickCreationTests.class);
- suite.addTestSuite(CombinedFragmentsTwoClickCreationTests.class);
- suite.addTestSuite(CombinedFragmentsWithInclusionCreationTests.class);
- suite.addTestSuite(CombinedFragmentsAndElementsCreationTests.class);
- suite.addTestSuite(CombinedFragmentsAndMessagesCreationTests.class);
- suite.addTestSuite(CombinedFragmentsTests.class);
- suite.addTestSuite(CombinedFragmentsOperandCreationTests.class);
- suite.addTestSuite(CombinedFragmentsOperandOverlapTests.class);
- suite.addTestSuite(StateBasicTests.class);
- suite.addTestSuite(PunctualStateTests.class);
- suite.addTestSuite(RefreshLayoutNotExecutedOnNoSequenceChangesTests.class);
- suite.addTestSuite(StateNoMessageTests.class);
- suite.addTestSuite(ComplexInOutCombinedFragmentTest.class);
- suite.addTestSuite(ObservationPointTests.class);
- suite.addTestSuite(ActionDisabledOnSequenceDiagramTest.class);
- suite.addTestSuite(ActionDisabledOnExtendedMessagesTest.class);
- suite.addTestSuite(FrameReparentTest.class);
- suite.addTestSuite(InstanceRoleOrderingTests.class);
-
- suite.addTestSuite(HeaderSequenceDiagramTests.class);
+// addGerritPart(suite);
+//
+// suite.addTestSuite(SequenceReturnMessageTest.class);
+// suite.addTestSuite(SyncCallTest.class);
+// suite.addTestSuite(SyncCallMoveTest.class);
+// suite.addTestSuite(SyncCall2Test.class);
+// suite.addTestSuite(SyncCall3Test.class);
+// suite.addTestSuite(SyncCallInOperandReorderTest.class);
+// suite.addTestSuite(CreateMessageOnCollapsedExecutionTest.class);
+// suite.addTestSuite(SequenceExecutionMessageToSelfTest.class);
+// suite.addTestSuite(SequenceDestroyMessageTest.class);
+// suite.addTestSuite(NoteAttachmentTest.class);
+// suite.addTestSuite(SequenceArrangeLinkedBorderedNodesTest.class);
+// suite.addTestSuite(InteractionUseSingleClickCreationTests.class);
+// suite.addTestSuite(InteractionUseTwoClickCreationTests.class);
+// suite.addTestSuite(InteractionUseCoverageTests.class);
+// suite.addTestSuite(InteractionUseTests.class);
+// suite.addTestSuite(InteractionUseMoveDownTests.class);
+// suite.addTestSuite(InteractionUseResizeTests.class);
+// suite.addTestSuite(CombinedFragmentsSingleClickCreationTests.class);
+// suite.addTestSuite(CombinedFragmentsTwoClickCreationTests.class);
+// suite.addTestSuite(CombinedFragmentsWithInclusionCreationTests.class);
+// suite.addTestSuite(CombinedFragmentsAndElementsCreationTests.class);
+// suite.addTestSuite(CombinedFragmentsAndMessagesCreationTests.class);
+// suite.addTestSuite(CombinedFragmentsTests.class);
+// suite.addTestSuite(CombinedFragmentsOperandCreationTests.class);
+// suite.addTestSuite(CombinedFragmentsOperandOverlapTests.class);
+// suite.addTestSuite(StateBasicTests.class);
+// suite.addTestSuite(PunctualStateTests.class);
+// suite.addTestSuite(RefreshLayoutNotExecutedOnNoSequenceChangesTests.class);
+// suite.addTestSuite(StateNoMessageTests.class);
+// suite.addTestSuite(ComplexInOutCombinedFragmentTest.class);
+// suite.addTestSuite(ObservationPointTests.class);
+// suite.addTestSuite(ActionDisabledOnSequenceDiagramTest.class);
+// suite.addTestSuite(ActionDisabledOnExtendedMessagesTest.class);
+// suite.addTestSuite(FrameReparentTest.class);
+// suite.addTestSuite(InstanceRoleOrderingTests.class);
+//
+// suite.addTestSuite(HeaderSequenceDiagramTests.class);
return suite;
}
diff --git a/plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java b/plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java
index 8f61611e77..cf38c59d18 100644
--- a/plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java
@@ -34,7 +34,7 @@ public class AllSiriusTestSuite extends TestCase {
*/
public static Test suite() {
final TestSuite suite = new TestSuite("Sirius tests tree");
- suite.addTest(AllTreePluginTests.suite());
+// suite.addTest(AllTreePluginTests.suite());
return suite;
}
}

Back to the top