fix for #308 and I added junit tests

Author: jantje

it.baeyens.arduino.common/.classpath

@@ -3,6 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="it/baeyens/arduino/arduino/SerialMonitor.java|it/baeyens/arduino/arduino/mytest.java" kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry exported="true" kind="lib" path="lib/jssc-2.8.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

it.baeyens.arduino.common/META-INF/MANIFEST.MF

@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.eclipse.ui.console,
  org.eclipse.cdt;bundle-version="8.5.0",
- org.eclipse.osgi
+ org.eclipse.osgi,
+ org.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: it.baeyens.arduino.arduino,

it.baeyens.arduino.common/src/it/baeyens/arduino/common/ArduinoInstancePreferences.java

@@ -225,12 +225,17 @@ public static boolean isArduinoIdeOne() {
 	return !getArduinoIDEVersion().startsWith("00");
     }
 
+    public static String GetArduinoDefineValue() {
+	return GetArduinoDefineValueInternal(getArduinoIDEVersion());
+    }
+
     /*
      * This method returns the define value for the define ARDUINO
      */
-    public static String GetArduinoDefineValue() {
+    public static String GetArduinoDefineValueInternal(String Version) {
 	String Ret;
-	Ret = getArduinoIDEVersion().trim();
+	Ret = Version.trim();
+	Ret = Ret.split("-")[0];
 	if (Ret.startsWith("1.5")) {
 	    if (Ret.contains(".")) {
 		Ret = Ret.replace(".", "");

it.baeyens.arduino.common/test/it/baeyens/arduino/common/test/ArduinoIDEVersionNameParsing.java

@@ -0,0 +1,48 @@
+package it.baeyens.arduino.common.test;
+
+import static org.junit.Assert.assertEquals;
+import it.baeyens.arduino.common.ArduinoInstancePreferences;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.junit.Test;
+
+public class ArduinoIDEVersionNameParsing {
+
+    private Map<String, String> VersionList;
+
+    @Test
+    public void testAllArduinoVersions() {
+	VersionList = new LinkedHashMap<String, String>();
+	// The tests below have been deactivated as they fail
+	// and the plugin does not support these versions
+	// VersionList.put("1.0.1", "101");
+	// VersionList.put("1.0.2", "102");
+	// VersionList.put("1.0.3", "103");
+	// VersionList.put("1.0.4", "104");
+	VersionList.put("1.5.1", "151");
+	VersionList.put("1.5.2", "152");
+	VersionList.put("1.5.3", "153");
+	VersionList.put("1.5.4", "154");
+	VersionList.put("1.5.5", "155");
+	VersionList.put("1.5.6", "156");
+	VersionList.put("1.5.6-r2", "156");
+	VersionList.put("1.5.7", "157");
+	VersionList.put("1.5.8", "158");
+	VersionList.put("1.6.0", "10600");
+	VersionList.put("1.6.1", "10601");
+	VersionList.put("1.6.2", "10602");
+	VersionList.put("1.6.3", "10603");
+	VersionList.put("1.6.4", "10604");
+	VersionList.put("1.6.5", "10605");
+	VersionList.put("1.6.5-r2", "10605");
+	VersionList.put("1.6.5-r3", "10605");
+	VersionList.put("1.6.5-r4", "10605");
+	VersionList.put("1.6.5-r5", "10605");
+	for (Entry<String, String> currentVersion : VersionList.entrySet()) {
+	    assertEquals(currentVersion.getValue(), ArduinoInstancePreferences.GetArduinoDefineValueInternal(currentVersion.getKey()));
+	}
+    }
+}