perf: Reduce usage of OSGi Version.

Create new class PerfVersion and use it instead of OSGi Version one as
"perf --version" output doesn't adhere to rules for OSGi qualifier (no
dot allowed in it).

Change-Id: I02b9afe2b81fba4c5d7c7ded00446ea12bebee8c
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/58068
Reviewed-by: Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
Tested-by: Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>

4 files changed, 81 insertions, 5 deletions

diff --git a/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.ui.prefs b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.ui.prefs
index 065e15b602..8d6f832177 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -18,6 +18,7 @@ sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=false
 sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -33,6 +34,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -55,3 +57,4 @@ sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/perf/org.eclipse.linuxtools.perf.tests/.settings/org.moreunit.prefs b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.moreunit.prefs
new file mode 100644
index 0000000000..b23adba051
--- /dev/null
+++ b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.moreunit.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.moreunit.preferences.version=2
diff --git a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/LaunchTabsTest.java b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/LaunchTabsTest.java
index b945cb2cad..758f0249e0 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/LaunchTabsTest.java
+++ b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/LaunchTabsTest.java
@@ -22,6 +22,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
 import org.eclipse.linuxtools.internal.perf.PerfCore;
 import org.eclipse.linuxtools.internal.perf.PerfPlugin;
+import org.eclipse.linuxtools.internal.perf.PerfVersion;
 import org.eclipse.linuxtools.internal.perf.launch.PerfEventsTab;
 import org.eclipse.linuxtools.internal.perf.launch.PerfOptionsTab;
 import org.eclipse.linuxtools.profiling.tests.AbstractTest;
@@ -35,7 +36,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.Version;
 
 public class LaunchTabsTest extends AbstractTest {
     private ILaunchConfiguration config;
@@ -133,11 +133,10 @@ public class LaunchTabsTest extends AbstractTest {
         performApply(tab, wc);
         assertEquals(false, config.getAttribute(PerfPlugin.ATTR_Kernel_SourceLineNumbers, true));
 
-        Version version = PerfCore.getPerfVersion(config);
+        PerfVersion version = PerfCore.getPerfVersion(config);
         Button meCheck = tab.getChkMultiplexEvents();
         if (meCheck.isEnabled()) {
-            assertTrue (version != null && new Version(2, 6, 35).compareTo(version) > 0);
-
+            assertTrue (version != null && new PerfVersion(2, 6, 35).isNewer(version));
             meCheck.setSelection(true);
             meCheck.notifyListeners(SWT.Selection, null);
             performApply(tab, wc);
@@ -147,7 +146,7 @@ public class LaunchTabsTest extends AbstractTest {
             performApply(tab, wc);
             assertEquals(false, config.getAttribute(PerfPlugin.ATTR_Multiplex, true));
         } else {
-            assertTrue (version == null || new Version(2, 6, 35).compareTo(version) < 0);
+            assertTrue (version == null || !new PerfVersion(2, 6, 35).isNewer(version));
         }
 
         Button msCheck = tab.getChkModuleSymbols();
diff --git a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/PerfVersionTest.java b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/PerfVersionTest.java
new file mode 100644
index 0000000000..9092e0b7ad
--- /dev/null
+++ b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/PerfVersionTest.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Red Hat, Inc.
+ * 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:
+ *    Alexander Kurtakov <akurtako@redhat.com> - Initial Implementation.
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.perf.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.linuxtools.internal.perf.PerfVersion;
+import org.junit.Test;
+
+public class PerfVersionTest {
+
+	@Test
+	public void testPerfVersionString() {
+		PerfVersion version = new PerfVersion("4.2.3.300.fc23.x86_64.g21b8");
+		assertEquals(4, version.getMajor());
+		assertEquals(2, version.getMinor());
+		assertEquals(3, version.getMicro());
+		assertEquals("300.fc23.x86_64.g21b8", version.getQualifier());
+	}
+
+	@Test
+	public void testPerfVersionIntIntInt() {
+		PerfVersion version = new PerfVersion(4, 2, 3);
+		assertEquals(4, version.getMajor());
+		assertEquals(2, version.getMinor());
+		assertEquals(3, version.getMicro());
+		assertEquals("", version.getQualifier());
+
+		version = new PerfVersion("4.0.8-200.fc21.x86_64");
+		assertEquals(4, version.getMajor());
+		assertEquals(0, version.getMinor());
+		assertEquals(8, version.getMicro());
+		assertEquals("200.fc21.x86_64", version.getQualifier());
+
+		version = new PerfVersion("4.0.8");
+		assertEquals(4, version.getMajor());
+		assertEquals(0, version.getMinor());
+		assertEquals(8, version.getMicro());
+		assertEquals("", version.getQualifier());
+	}
+
+	@Test
+	public void testIsNewer() {
+		PerfVersion version = new PerfVersion("4.2.3.300.fc23.x86_64.g21b8");
+		assertTrue(version.isNewer(new PerfVersion(4, 2, 2)));
+		assertFalse(version.isNewer(new PerfVersion(4, 2, 4)));
+
+		assertTrue(version.isNewer(new PerfVersion(4, 1, 3)));
+		assertFalse(version.isNewer(new PerfVersion(4, 2, 3)));
+
+		assertTrue(version.isNewer(new PerfVersion(3, 2, 3)));
+		assertFalse(version.isNewer(new PerfVersion(5, 2, 3)));
+	}
+
+	@Test
+	public void testToString() {
+		String versionString = "4.2.3.300.fc23.x86_64.g21b8";
+		PerfVersion version = new PerfVersion(versionString);
+		assertTrue(versionString.equals(version.toString()));
+	}
+
+}