Update pom.xml files for JUnit tests + add sonar support for LTTng

diff --git a/.gitignore b/.gitignore
index ea8c4bf7f35f6f77f75d92ad8ce8349f6e81ddba..41760f96f636769cb245747aefdded28e83a5a33 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /target
+*/.settings/org.sonar.ide.eclipse.core.prefs

diff --git a/org.eclipse.linuxtools.lttng.tests/pom.xml b/org.eclipse.linuxtools.lttng.tests/pom.xml
index 30155583cb6f6e53faaab459e578dc0141f961a8..72b9eb942cb1f2debad832f01c01c4564ae6ffef 100644 (file)
--- a/org.eclipse.linuxtools.lttng.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng.tests/pom.xml
@@ -19,7 +19,7 @@
 
   <artifactId>org.eclipse.linuxtools.lttng.tests</artifactId>
   <version>0.3.2-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng Tests Plug-in</name>
 
@@ -34,10 +34,41 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.2</version>
+            <executions>
+                <execution>
+                    <id>prepare</id>
+                    <phase>validate</phase>
+                    <configuration>
+                    <tasks>
+                        <echo message="prepare phase" />
+                        <gunzip src="traceset/trace-15471events_nolost_newformat.tar.gz" dest="traceset/" />
+                        <untar src="traceset/trace-15471events_nolost_newformat.tar" dest="traceset/" />
+                        <gunzip src="traceset/trace-15316events_nolost_newformat.tar.gz" dest="traceset/" />
+                        <untar src="traceset/trace-15316events_nolost_newformat.tar" dest="traceset/" />
+                    </tasks>
+                    </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                </execution>
+            </executions>
+        </plugin>
+        <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-surefire-plugin</artifactId>
+            <version>${tycho-version}</version>
+            <configuration>
+                <testSuite>org.eclipse.linuxtools.lttng.tests</testSuite>
+                <testClass>org.eclipse.linuxtools.lttng.tests.AllLTTngCoreTests</testClass>
+                <useUIHarness>false</useUIHarness>
+                <useUIThread>false</useUIThread>
+                <product>org.eclipse.sdk.ide</product>
+            </configuration>
+        </plugin>
     </plugins>
   </build>
 

diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java
index 68cdcd4441d327cf0ee6dd9848df3a71934b0bc7..9bdeaaf77bc5fa2eae95f5f63ccfa4eb089e5509 100644 (file)
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java
@@ -13,6 +13,8 @@
 package org.eclipse.linuxtools.lttng.tests;
 
 import org.eclipse.core.runtime.Plugin;
+import org.eclipse.linuxtools.tmf.Tracer;
+import org.osgi.framework.BundleContext;
 
 /**
  * <b><u>TmfCoreTestPlugin</u></b>
@@ -53,4 +55,16 @@ public class LTTngCoreTestPlugin extends Plugin {
     public static LTTngCoreTestPlugin getPlugin() {
         return plugin;
     }
+    
+    @Override
+    public void start(BundleContext context) throws Exception {
+        super.start(context);
+        plugin = this;
+    }
+
+    @Override
+    public void stop(BundleContext context) throws Exception {
+        plugin = null;
+        super.stop(context);
+    }
 }

diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/.gitignore b/org.eclipse.linuxtools.lttng.tests/traceset/.gitignore
index cbd138f7d6a1cb41b2236a3d9a824254a5753d88..db03f234a673ec9a529ebe4fac85fdc70afdc6c4 100644 (file)
--- a/org.eclipse.linuxtools.lttng.tests/traceset/.gitignore
+++ b/org.eclipse.linuxtools.lttng.tests/traceset/.gitignore
@@ -1,2 +1,4 @@
 /trace-15316events_nolost_newformat
 /trace-15471events_nolost_newformat
+trace-15316events_nolost_newformat.tar
+trace-15471events_nolost_newformat.tar
\ No newline at end of file

diff --git a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
index 91a952ddea6816e4595366c7c413e24a203eb480..03011b3ff31791c23cef0f87f76779d1a1aabf35 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
@@ -12,3 +12,6 @@ Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0"
 Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.linuxtools.lttng.ui.tests.LTTngUITestPlugin
+Bundle-ActivationPolicy: lazy
+

diff --git a/org.eclipse.linuxtools.lttng.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
index 607c8e651ac3715ef25e1522d571e8b57e2eb51b..913ad0e594d08e56785ca1ec2d190deaa4f954b6 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
@@ -19,7 +19,7 @@
 
   <artifactId>org.eclipse.linuxtools.lttng.ui.tests</artifactId>
   <version>0.3.2-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng UI Tests Plug-in</name>
 
@@ -33,10 +33,18 @@
         </excludes>
       </resource>
     </resources>
-    <plugins>
+     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <testSuite>org.eclipse.linuxtools.lttng.ui.tests</testSuite>
+          <testClass>org.eclipse.linuxtools.lttng.ui.tests.AllLTTngUITests</testClass>
+          <useUIHarness>true</useUIHarness>
+          <useUIThread>true</useUIThread>
+          <product>org.eclipse.sdk.ide</product>
+        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
new file mode 100644 (file)
index 0000000..dcc3c10
--- /dev/null
+++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng.ui.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllLTTngUITests  {
+    public static Test suite() {
+        TestSuite suite = new TestSuite(AllLTTngUITests.class.getName());
+        //$JUnit-BEGIN$
+        suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.histogram.AllTests.suite());
+        //$JUnit-END$
+        return suite;
+    }
+}

diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/AllTests.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/AllTests.java
new file mode 100644 (file)
index 0000000..b68a945
--- /dev/null
+++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/AllTests.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Bernd Hufmann - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.tests.histogram;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+    public static Test suite() {
+        
+        TestSuite suite = new TestSuite(AllTests.class.getName());
+        //$JUnit-BEGIN$
+        suite.addTestSuite(HistogramDataModelTest.class);
+        //$JUnit-END$
+        return suite;
+    }
+}

diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/HistogramDataModelTest.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/HistogramDataModelTest.java
index 537739e00e3991ad284b9db899d64b4b9e85d962..e0e0f3f9bd99159a1b26f81101eccaf414bd46de 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/HistogramDataModelTest.java
+++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/histogram/HistogramDataModelTest.java
@@ -8,25 +8,22 @@
  * 
  * Contributors:
  *   Francois Chouinard - Initial API and implementation
+ *   Bernd Hufmann - Adapt to junit.framework.TestCase
  *******************************************************************************/
 
 package org.eclipse.linuxtools.lttng.ui.tests.histogram;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import junit.framework.TestCase;
 
 import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramDataModel;
 import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramScaledData;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 /**
  * <b><u>HistogramDataModelTest</u></b>
  * <p>
  * Unit tests for the HistogramDataModel class.
  */
-public class HistogramDataModelTest {
+public class HistogramDataModelTest extends TestCase {
 
     // ------------------------------------------------------------------------
     // Test data
@@ -35,12 +32,12 @@ public class HistogramDataModelTest {
     // ------------------------------------------------------------------------
     // Housekeeping
     // ------------------------------------------------------------------------
-
-    @Before
+    
+    @Override
     public void setUp() throws Exception {
     }
 
-    @After
+    @Override
     public void tearDown() throws Exception {
     }
 
@@ -53,7 +50,6 @@ public class HistogramDataModelTest {
      * {@link org.eclipse.linuxtools.tmf.HistogramDataModel.views.histogram.TmfHistogramDataModel#HistogramDataModel()}
      * .
      */
-    @Test
     public void testHistogramDataModel() {
         HistogramDataModel model = new HistogramDataModel();
         assertTrue(model.getNbBuckets() == HistogramDataModel.DEFAULT_NUMBER_OF_BUCKETS);
@@ -69,7 +65,6 @@ public class HistogramDataModelTest {
      * {@link org.eclipse.linuxtools.tmf.HistogramDataModel.views.histogram.TmfHistogramDataModel#HistogramDataModel(int)}
      * .
      */
-    @Test
     public void testHistogramDataModelInt() {
         final int nbBuckets = 5 * 1000;
         HistogramDataModel model = new HistogramDataModel(nbBuckets);
@@ -86,7 +81,6 @@ public class HistogramDataModelTest {
      * {@link org.eclipse.linuxtools.tmf.HistogramDataModel.views.histogram.TmfHistogramDataModel#countEvent(long)}
      * .
      */
-    @Test
     public void testClear() {
         final int nbBuckets = 100;
         HistogramDataModel model = new HistogramDataModel(nbBuckets);
@@ -105,7 +99,6 @@ public class HistogramDataModelTest {
      * {@link org.eclipse.linuxtools.tmf.HistogramDataModel.views.histogram.TmfHistogramDataModel#countEvent(long)}
      * .
      */
-    @Test
     public void testCountEvent_0() {
         final int nbBuckets = 100;
         HistogramDataModel model = new HistogramDataModel(nbBuckets);
@@ -119,7 +112,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == nbBuckets);
     }
 
-    @Test
     public void testCountEvent_1() {
         final int nbBuckets = 100;
         final int maxHeight = 10;
@@ -139,7 +131,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == nbBuckets);
     }
 
-    @Test
     public void testCountEvent_2() {
         final int nbBuckets = 100;
         final int maxHeight = 10;
@@ -161,7 +152,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == nbBuckets + 1);
     }
 
-    @Test
     public void testCountEvent_3() {
         final int nbBuckets = 100;
         final int maxHeight = 10;
@@ -184,7 +174,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == nbBuckets);
     }
 
-    @Test
     public void testCountEvent_4() {
         final int nbBuckets = 100;
         final int maxHeight = 10;
@@ -208,7 +197,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == nbBuckets);
     }
 
-    @Test
     public void testCountEvent_5() {
         final int nbBuckets = 100;
         final int startTime = 25;
@@ -237,7 +225,6 @@ public class HistogramDataModelTest {
      * {@link org.eclipse.linuxtools.tmf.HistogramDataModel.views.histogram.TmfHistogramDataModel#scaleTo(int,int)}
      * .
      */
-    @Test
     public void testScaleTo_0() {
         HistogramDataModel model = new HistogramDataModel(10);
         try {
@@ -257,10 +244,9 @@ public class HistogramDataModelTest {
             }
         }
 
-        fail("Uncaught assertion error");
+        fail("Uncaught assertion error"); //$NON-NLS-1$
     }
 
-    @Test
     public void testScaleTo_1() {
         final int nbBuckets = 10;
         final int maxHeight = 10;
@@ -285,7 +271,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == nbBuckets);
     }
 
-    @Test
     public void testScaleTo_2() {
         final int nbBuckets = 10;
         final int maxHeight = 10;
@@ -310,7 +295,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == nbBuckets);
     }
 
-    @Test
     public void testScaleTo_3() {
         final int nbBuckets = 10;
         final int maxHeight = 10;
@@ -335,7 +319,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == 2 * nbBuckets);
     }
 
-    @Test
     public void testScaleTo_4() {
         final int nbBuckets = 10;
         final int maxHeight = 10;
@@ -360,7 +343,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == 4 * nbBuckets);
     }
 
-    @Test
     public void testScaleTo_5() {
         final int nbBuckets = 100;
         final int maxHeight = 20;
@@ -385,7 +367,6 @@ public class HistogramDataModelTest {
         assertTrue(model.getTimeLimit() == 2 * nbBuckets);
     }
 
-    @Test
     public void testScaleTo_6() {
         final int nbBuckets = 100;
         final int maxHeight = 24;

diff --git a/pom.xml b/pom.xml
index 4132b00d254d8d6ceffda178365a15593ba0cf89..19e715f01619dcd21584a567ccf5d7827b7224e4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,48 @@
     </license>
   </licenses>
   
+<profiles>
+  <profile>
+    <id>jcoverage</id>
+      <properties>
+      <!-- Properties to enable jacoco code coverage analysis -->
+      <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+      <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+      <sonar.jacoco.reportPath>../target/jacoco.exec</sonar.jacoco.reportPath>
+    </properties>
+
+    <build>
+      <plugins>
+        <!-- Enabling use of jacoco -->
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.5.3.201107060350</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+              <configuration>
+                <!-- Where to put jacoco coverage report -->
+                <destFile>${sonar.jacoco.reportPath}</destFile>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+  </profile>
+
+  <profile>
+    <id>lttngTests</id>
+      <modules>
+        <module>org.eclipse.linuxtools.lttng.tests</module>
+      </modules>
+  </profile>
+
+</profiles>
+
   <build>
     <plugins>
       <plugin>
@@ -54,6 +96,13 @@
           </descriptors>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <version>2.0-beta-2</version>
+      </plugin>
+
     </plugins>
   </build>
 
@@ -63,7 +112,6 @@
     <module>org.eclipse.linuxtools.lttng.help</module>
     <module>org.eclipse.linuxtools.lttng.jni</module>
     <module>org.eclipse.linuxtools.lttng.test-feature</module>
-    <module>org.eclipse.linuxtools.lttng.tests</module>
     <module>org.eclipse.linuxtools.lttng.ui</module>
     <module>org.eclipse.linuxtools.lttng.ui.tests</module>
     <module>org.eclipse.linuxtools.tmf</module>