Restore test plugin

Bug 562207

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>
diff --git a/plugins/org.polarsys.chess.test.runtime/plugin.xml b/plugins/org.polarsys.chess.test.runtime/plugin.xml
index 0f67242..dadeb77 100644
--- a/plugins/org.polarsys.chess.test.runtime/plugin.xml
+++ b/plugins/org.polarsys.chess.test.runtime/plugin.xml
@@ -4,14 +4,11 @@
 
    <extension
          point="org.eclipse.ui.commands">
-      <category
-            name="Test Category"
-            id="org.polarsys.chess.test.runtime.commands.category">
-      </category>
       <command
-            name="Launch CHESS Runtime Tests"
-            categoryId="org.polarsys.chess.test.runtime.commands.category"
-            id="org.polarsys.chess.test.runtime.commands.testCommand">
+            categoryId="it.unipd.chess.commands.category"
+            defaultHandler="org.polarsys.chess.test.runtime.handlers.TestsHandler"
+            id="org.polarsys.chess.test.runtime.commands.testCommand"
+            name="Launch CHESS Runtime Tests">
       </command>
    </extension>
    <extension
@@ -21,6 +18,18 @@
             class="org.polarsys.chess.test.runtime.handlers.TestsHandler">
       </handler>
    </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:org.polarsys.chess.mainMenu?after=org.polarsys.chess.mainmenu.separator4">
+         <command
+               commandId="org.polarsys.chess.test.runtime.commands.testCommand"
+               label="Run tests"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
   <!--extension
          point="org.eclipse.ui.menus">
       <menuContribution
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyRecursively.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyRecursively.java
index e2f2bf4..19a0d58 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyRecursively.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyRecursively.java
@@ -35,22 +35,22 @@
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Core::CHESSViews") != null);
 		
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::FailurePropagation") != null);
-		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::DataFlowCallGraph") != null);
+		//Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::DataFlowCallGraph") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::StateBased") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::StateBased::StateBasedComponents") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::StateBased::FaultTolerance") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::StateBased::MaintenanceMonitoring") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::StateBased::StateBasedAnalysis") != null);
-		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::FMEA") != null);
+		//Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::FMEA") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::DependableComponent") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::ThreatsPropagation") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Dependability::MitigationMeans") != null);
 		
-		Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::TimingAnalysis") != null);
-		Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::TimingAnalysis::TimingConstraints") != null);
-		Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::DeploymentConfiguration") != null);
-		Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::DeploymentConfiguration::HardwareBaseline") != null);
-		Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::DeploymentConfiguration::DeploymentConfAnalysis") != null);
+		//Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::TimingAnalysis") != null);
+		//Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::TimingAnalysis::TimingConstraints") != null);
+		//Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::DeploymentConfiguration") != null);
+		//Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::DeploymentConfiguration::HardwareBaseline") != null);
+		//Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::DeploymentConfiguration::DeploymentConfAnalysis") != null);
 		Assert.assertTrue(model.getAppliedProfile("CHESS::Predictability::RTComponentModel") != null);
 		
 		Assert.assertTrue(model.getAppliedProfile("CHESS::ComponentModel") != null);
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestCreateViews.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestCreateViews.java
index 61bfb33..2ecdadd 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestCreateViews.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestCreateViews.java
@@ -102,10 +102,10 @@
 		Assert.assertNotNull(deploymentViewPkg.getAppliedProfile("CHESS::Dependability::FailurePropagation"));
 		Assert.assertNotNull(deploymentViewPkg.getAppliedProfile("CHESS::Dependability::ThreatsPropagation"));
 		Assert.assertNotNull(deploymentViewPkg.getAppliedProfile("CHESS::Dependability::DependableComponent"));
-		Assert.assertNotNull(deploymentViewPkg.getAppliedProfile("CHESS::Dependability::FMEA"));
+		//Assert.assertNotNull(deploymentViewPkg.getAppliedProfile("CHESS::Dependability::FMEA"));
 		
-		Assert.assertNotNull(psmViewPkg.getAppliedProfile("CHESS::Predictability::DeploymentConfiguration::DeploymentConfAnalysis"));
-		Assert.assertNotNull(psmViewPkg.getAppliedProfile("CHESS::Predictability::TimingAnalysis"));
+		//Assert.assertNotNull(psmViewPkg.getAppliedProfile("CHESS::Predictability::DeploymentConfiguration::DeploymentConfAnalysis"));
+		//Assert.assertNotNull(psmViewPkg.getAppliedProfile("CHESS::Predictability::TimingAnalysis"));
 		
 		Assert.assertNotNull(systemViewPkg.getAppliedProfile("CHESS::Dependability::StateBased::StateBasedComponents"));
 		Assert.assertNotNull(systemViewPkg.getAppliedProfile("CHESS::Dependability::StateBased::FaultTolerance"));
@@ -118,6 +118,6 @@
 		
 		Assert.assertNotNull(depViewPkg.getAppliedProfile("CHESS::Dependability::StateBased::StateBasedAnalysis"));
 		Assert.assertNotNull(depViewPkg.getAppliedProfile("CHESS::Dependability::FailurePropagation"));
-		Assert.assertNotNull(depViewPkg.getAppliedProfile("CHESS::Dependability::FMEA"));
+		//Assert.assertNotNull(depViewPkg.getAppliedProfile("CHESS::Dependability::FMEA"));
 	}
 }