Move Version to schedlib

(cherry picked from commit 5328d72913fb1f702143db28e19bb54e22466149)

Change-Id: Iccd6843cc56a6a2484105e9c6690bf8a04fddc7e

4 files changed, 272 insertions, 1 deletions

diff --git a/sched/tests/com/android/sched/AllTests.java b/sched/tests/com/android/sched/AllTests.java
index 76cab8a..916105f 100644
--- a/sched/tests/com/android/sched/AllTests.java
+++ b/sched/tests/com/android/sched/AllTests.java
@@ -26,7 +26,7 @@ com.android.sched.item.AllTests.class,
     com.android.sched.marker.AllTests.class,
     com.android.sched.scheduler.AllTests.class,
     com.android.sched.config.AllTests.class,
-    com.android.sched.util.config.cli.AllTests.class,
+    com.android.sched.util.AllTests.class,
     com.android.sched.util.file.AllTests.class,
     com.android.sched.vfs.VFSTest.class})
 public class AllTests {
diff --git a/sched/tests/com/android/sched/util/AllTests.java b/sched/tests/com/android/sched/util/AllTests.java
new file mode 100644
index 0000000..7802e53
--- /dev/null
+++ b/sched/tests/com/android/sched/util/AllTests.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.sched.util;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses(value = {
+    VersionTest.class,
+    SubReleaseKindTest.class,
+    com.android.sched.util.config.cli.AllTests.class,
+})
+public class AllTests {
+}
diff --git a/sched/tests/com/android/sched/util/SubReleaseKindTest.java b/sched/tests/com/android/sched/util/SubReleaseKindTest.java
new file mode 100644
index 0000000..3420667
--- /dev/null
+++ b/sched/tests/com/android/sched/util/SubReleaseKindTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.sched.util;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+public class SubReleaseKindTest {
+
+  @Test
+  public void testIsMoreStable() {
+    try {
+      Assert.assertFalse(SubReleaseKind.ENGINEERING.isMoreStableThan(SubReleaseKind.ENGINEERING));
+    } catch (UncomparableSubReleaseKind e) {
+      Assert.fail();
+    }
+    try {
+      Assert.assertFalse(SubReleaseKind.ENGINEERING.isMoreStableThan(SubReleaseKind.PRE_ALPHA));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertFalse(SubReleaseKind.ENGINEERING.isMoreStableThan(SubReleaseKind.ALPHA));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertFalse(SubReleaseKind.ENGINEERING.isMoreStableThan(SubReleaseKind.BETA));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertFalse(SubReleaseKind.ENGINEERING.isMoreStableThan(SubReleaseKind.CANDIDATE));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertFalse(SubReleaseKind.ENGINEERING.isMoreStableThan(SubReleaseKind.RELEASE));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+
+    try {
+      Assert.assertTrue(SubReleaseKind.PRE_ALPHA.isMoreStableThan(SubReleaseKind.ENGINEERING));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertFalse(SubReleaseKind.PRE_ALPHA.isMoreStableThan(SubReleaseKind.PRE_ALPHA));
+      Assert.assertFalse(SubReleaseKind.PRE_ALPHA.isMoreStableThan(SubReleaseKind.ALPHA));
+      Assert.assertFalse(SubReleaseKind.PRE_ALPHA.isMoreStableThan(SubReleaseKind.BETA));
+      Assert.assertFalse(SubReleaseKind.PRE_ALPHA.isMoreStableThan(SubReleaseKind.CANDIDATE));
+      Assert.assertFalse(SubReleaseKind.PRE_ALPHA.isMoreStableThan(SubReleaseKind.RELEASE));
+    } catch (UncomparableSubReleaseKind e) {
+      Assert.fail();
+    }
+
+    try {
+      Assert.assertTrue(SubReleaseKind.ALPHA.isMoreStableThan(SubReleaseKind.ENGINEERING));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertTrue(SubReleaseKind.ALPHA.isMoreStableThan(SubReleaseKind.PRE_ALPHA));
+      Assert.assertFalse(SubReleaseKind.ALPHA.isMoreStableThan(SubReleaseKind.ALPHA));
+      Assert.assertFalse(SubReleaseKind.ALPHA.isMoreStableThan(SubReleaseKind.BETA));
+      Assert.assertFalse(SubReleaseKind.ALPHA.isMoreStableThan(SubReleaseKind.CANDIDATE));
+      Assert.assertFalse(SubReleaseKind.ALPHA.isMoreStableThan(SubReleaseKind.RELEASE));
+    } catch (UncomparableSubReleaseKind e) {
+      Assert.fail();
+    }
+
+    try {
+      Assert.assertTrue(SubReleaseKind.BETA.isMoreStableThan(SubReleaseKind.ENGINEERING));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertTrue(SubReleaseKind.BETA.isMoreStableThan(SubReleaseKind.PRE_ALPHA));
+      Assert.assertTrue(SubReleaseKind.BETA.isMoreStableThan(SubReleaseKind.ALPHA));
+      Assert.assertFalse(SubReleaseKind.BETA.isMoreStableThan(SubReleaseKind.BETA));
+      Assert.assertFalse(SubReleaseKind.BETA.isMoreStableThan(SubReleaseKind.CANDIDATE));
+      Assert.assertFalse(SubReleaseKind.BETA.isMoreStableThan(SubReleaseKind.RELEASE));
+    } catch (UncomparableSubReleaseKind e) {
+      Assert.fail();
+    }
+
+    try {
+      Assert.assertTrue(SubReleaseKind.CANDIDATE.isMoreStableThan(SubReleaseKind.ENGINEERING));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertTrue(SubReleaseKind.CANDIDATE.isMoreStableThan(SubReleaseKind.PRE_ALPHA));
+      Assert.assertTrue(SubReleaseKind.CANDIDATE.isMoreStableThan(SubReleaseKind.ALPHA));
+      Assert.assertTrue(SubReleaseKind.CANDIDATE.isMoreStableThan(SubReleaseKind.BETA));
+      Assert.assertFalse(SubReleaseKind.CANDIDATE.isMoreStableThan(SubReleaseKind.CANDIDATE));
+      Assert.assertFalse(SubReleaseKind.CANDIDATE.isMoreStableThan(SubReleaseKind.RELEASE));
+    } catch (UncomparableSubReleaseKind e) {
+      Assert.fail();
+    }
+
+    try {
+      Assert.assertTrue(SubReleaseKind.RELEASE.isMoreStableThan(SubReleaseKind.ENGINEERING));
+      Assert.fail();
+    } catch (UncomparableSubReleaseKind e) {
+      // Ok, sub release kind are not comparable
+    }
+    try {
+      Assert.assertTrue(SubReleaseKind.RELEASE.isMoreStableThan(SubReleaseKind.PRE_ALPHA));
+      Assert.assertTrue(SubReleaseKind.RELEASE.isMoreStableThan(SubReleaseKind.ALPHA));
+      Assert.assertTrue(SubReleaseKind.RELEASE.isMoreStableThan(SubReleaseKind.BETA));
+      Assert.assertTrue(SubReleaseKind.RELEASE.isMoreStableThan(SubReleaseKind.CANDIDATE));
+      Assert.assertFalse(SubReleaseKind.RELEASE.isMoreStableThan(SubReleaseKind.RELEASE));
+    } catch (UncomparableSubReleaseKind e) {
+      Assert.fail();
+    }
+  }
+
+}
diff --git a/sched/tests/com/android/sched/util/VersionTest.java b/sched/tests/com/android/sched/util/VersionTest.java
new file mode 100644
index 0000000..6e7751f
--- /dev/null
+++ b/sched/tests/com/android/sched/util/VersionTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.sched.util;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+public class VersionTest {
+
+  @Test
+  public void testCompare() {
+    Version v31a = new Version(3, 1, SubReleaseKind.ALPHA);
+    Version v31e = new Version(3, 1, SubReleaseKind.ENGINEERING);
+    try {
+      Assert.assertTrue(v31a.compareTo(v31a) == 0);
+    } catch (UncomparableVersion e) {
+      Assert.fail();
+    }
+    Version v32e = new Version(3, 2, SubReleaseKind.ENGINEERING);
+    try {
+      Assert.assertTrue(v31a.compareTo(v32e) < 0);
+      Assert.fail();
+    } catch (UncomparableVersion e) {
+      // Ok, versions are not comparable
+    }
+    try {
+      Assert.assertTrue(v31e.compareTo(v32e) < 0);
+    } catch (UncomparableVersion e) {
+      // Two ENGINEERING version are comparable
+      Assert.fail();
+    }
+
+    Version v33p = new Version(3, 3, SubReleaseKind.PRE_ALPHA);
+    Version v41b = new Version(4, 1, SubReleaseKind.BETA);
+    try {
+      Assert.assertTrue(v33p.compareTo(v41b) < 0);
+      Assert.assertTrue(v41b.compareTo(v33p) > 0);
+    } catch (UncomparableVersion e) {
+      Assert.fail();
+    }
+
+    Version v_11b = new Version(-1, 1, SubReleaseKind.BETA);
+    try {
+      Assert.assertTrue(v31e.compareTo(v_11b) > 0);
+      Assert.fail();
+    } catch (UncomparableVersion e) {
+      // Ok, versions are not comparable
+    }
+    Version v1_1b = new Version(1, -1, SubReleaseKind.BETA);
+    try {
+      Assert.assertTrue(v31e.compareTo(v1_1b) > 0);
+      Assert.fail();
+    } catch (UncomparableVersion e) {
+      // Ok, versions are not comparable
+    }
+  }
+
+  @Test
+  public void testNewerOlder() {
+    Version v31a = new Version(3, 1, SubReleaseKind.ALPHA);
+    Version v30a = new Version(3, 0, SubReleaseKind.ALPHA);
+    Version v25a = new Version(2, 5, SubReleaseKind.ALPHA);
+    Version v40a = new Version(4, 0, SubReleaseKind.ALPHA);
+    Version v32a = new Version(3, 2, SubReleaseKind.ALPHA);
+
+    try {
+      Assert.assertTrue(v31a.isNewerOrEqualsThan(v31a));
+      Assert.assertTrue(v31a.isNewerOrEqualsThan(v30a));
+      Assert.assertTrue(v31a.isNewerOrEqualsThan(v25a));
+      Assert.assertFalse(v31a.isNewerOrEqualsThan(v40a));
+      Assert.assertFalse(v31a.isNewerOrEqualsThan(v32a));
+
+      Assert.assertFalse(v31a.isNewerThan(v31a));
+      Assert.assertTrue(v31a.isNewerThan(v30a));
+      Assert.assertTrue(v31a.isNewerThan(v25a));
+      Assert.assertFalse(v31a.isNewerThan(v40a));
+      Assert.assertFalse(v31a.isNewerThan(v32a));
+    } catch (UncomparableVersion e) {
+      Assert.fail();
+    }
+  }
+}