make "include-webstart" profile default (added "local-webstart" for development)

updateRequired (versioning) bug fixed
AboutDialog
Branding (removed MOCCA/Bean)


git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@444 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 24 insertions, 0 deletions

diff --git a/BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java b/BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java
index 0c08a276..0ea126cb 100644
--- a/BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java
+++ b/BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java
@@ -119,6 +119,30 @@ public class ConfiguratorTest {
     assertEquals(expResult, result);
 
     oldVersion = "1.0.9-SNAPSHOT-r123";
+    minVersion = "1.0.10-r432";
+    expResult = true;
+    result = Configurator.updateRequired(oldVersion, minVersion);
+    assertEquals(expResult, result);
+
+    oldVersion = "1.0.9-r123";
+    minVersion = "1.0.10-SNAPSHOT";
+    expResult = true;
+    result = Configurator.updateRequired(oldVersion, minVersion);
+    assertEquals(expResult, result);
+
+    oldVersion = "1.0.9-r123";
+    minVersion = "1.0.9-SNAPSHOT";
+    expResult = false;
+    result = Configurator.updateRequired(oldVersion, minVersion);
+    assertEquals(expResult, result);
+
+    oldVersion = "1.0.9-SNAPSHOT";
+    minVersion = "1.0.9-r349";
+    expResult = true;
+    result = Configurator.updateRequired(oldVersion, minVersion);
+    assertEquals(expResult, result);
+
+    oldVersion = "1.0.9-SNAPSHOT-r123";
     minVersion = "1.0.10-SNAPSHOT";
     expResult = true;
     result = Configurator.updateRequired(oldVersion, minVersion);