svn commit: r1085440 - in /shindig/trunk/java/common/src: main/java/org/apache/shindig/common/util/OpenSocialVersion.java test/java/org/apache/shindig/common/OpenSocialVersionTest.java

[li...@apache.org]

Author: lindner
Date: Fri Mar 25 16:01:08 2011
New Revision: 1085440

URL: http://svn.apache.org/viewvc?rev=1085440&view=rev
Log:
add missed files

Added:
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java
    shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java

Added: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java?rev=1085440&view=auto
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java (added)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java Fri Mar 25 16:01:08 2011
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.shindig.common.util;
+
+import java.util.Comparator;
+import java.util.StringTokenizer;
+
+/**
+ * Convenience class for working with OpenSocial Specification and Feature versions.
+ * Applies the rules specified in the OS specification
+ * http://opensocial-resources.googlecode.com/svn/spec/1.0/Core-Gadget.xml#Versioning
+ * 
+ */
+public class OpenSocialVersion {
+  
+  public static Comparator<OpenSocialVersion> COMPARATOR = new VersionComparator();
+  
+  public int major = -1;
+  public int minor = -1;
+  public int patch = -1;
+  
+  /**
+   * Create a new OpenSocialVersion based upon a versionString
+   * @param versionString Version string
+   */
+  public OpenSocialVersion(String versionString){
+    StringTokenizer tokens = new StringTokenizer(versionString,".");
+    try{
+      if(tokens.hasMoreTokens()){
+        major = Integer.parseInt(tokens.nextToken());
+      }
+      if(tokens.hasMoreTokens()){
+        minor = Integer.parseInt(tokens.nextToken());
+      }
+      if(tokens.hasMoreTokens()){
+        patch = Integer.parseInt(tokens.nextToken());
+      }
+    } catch(NumberFormatException ex){
+      //Revert if we couldn't parse
+      major = -1;
+      minor = -1;
+      patch = -1;
+    }
+  }
+  
+  
+  /**
+   * Same version number matches same version number
+   */
+  @Override
+  public boolean equals(Object o) {
+    if(o instanceof OpenSocialVersion){
+      OpenSocialVersion ver = (OpenSocialVersion)o;
+      return (ver.major == major) && (ver.minor == minor) && (ver.patch == patch);
+    }
+    return false;
+  }
+  
+  /**
+   * Tests if OpenSocialVersion is equivalent to the parameter version
+   * @param version Compare with this version
+   * @return TRUE if is equivalent to version
+   */
+  public boolean isEquivalent(OpenSocialVersion version){
+    int cmp = version.major - major;
+    if(cmp == 0 && version.minor > -1 && minor > -1){
+      cmp = version.minor - minor;
+    }
+    if(cmp == 0 && version.patch > -1 && patch > -1){
+      cmp = version.patch - patch;
+    }
+    return cmp == 0;
+  }
+  
+  /**
+   * Tests if OpenSocialVersion is equivalent to the parameter version
+   * @param version Compare with this version string
+   * @return TRUE if is equivalent to version
+   */
+  public boolean isEquivalent(String version){
+    return isEquivalent(new OpenSocialVersion(version));
+  }
+  
+  /**
+   * Tests if OpenSocialVersion is equal to or greater than parameter version
+   * @param version Compare with this version
+   * @return TRUE if is equal or greater than version
+   */
+  public boolean isEqualOrGreaterThan(OpenSocialVersion version){
+    int cmp = version.major - major;
+    if(cmp == 0){
+      if(version.minor > -1 && minor > -1){
+        cmp = version.minor - minor;
+      } else {
+        cmp = version.minor;
+      }
+    }
+    if(cmp == 0){
+      if(version.patch > -1 && patch > -1){
+        cmp = version.patch - patch;
+      } else {
+        cmp = version.patch;
+      }
+    }
+    return cmp <= 0;
+  }
+  
+  /**
+   * Tests if OpenSocialVersion is equal to or greater than parameter version
+   * @param version Compare with this version string
+   * @return TRUE if is equal or greater than version
+   */
+  public boolean isEqualOrGreaterThan(String version){
+    return isEqualOrGreaterThan(new OpenSocialVersion(version));
+  }
+
+}
+
+/**
+ * Utility class for sorting OpenSocialVersion objects
+ *
+ */
+class VersionComparator implements java.util.Comparator<OpenSocialVersion>{
+
+  public int compare(OpenSocialVersion object1, OpenSocialVersion object2) {
+    int cmp = object1.major - object2.major;
+    if(cmp == 0){
+      cmp = object1.minor - object2.minor;
+    }
+    if(cmp == 0){
+      cmp = object1.patch - object2.patch;
+    }
+    return cmp;
+  }
+  
+}
+

Added: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java?rev=1085440&view=auto
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java (added)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java Fri Mar 25 16:01:08 2011
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.shindig.common;
+
+import org.apache.shindig.common.util.OpenSocialVersion;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+import junit.framework.Assert;
+
+/**
+ * Tests utility class for Version strings
+ *
+ */
+public class OpenSocialVersionTest {
+  
+  @Test
+  public void createOpenSocialVersion(){
+    OpenSocialVersion version = new OpenSocialVersion("1.2.3");
+    Assert.assertEquals(1, version.major);
+    Assert.assertEquals(2, version.minor);
+    Assert.assertEquals(3, version.patch);
+    Assert.assertEquals(version, new OpenSocialVersion("1.2.3"));
+  }
+  
+  @Test
+  public void testEquivalence(){
+    OpenSocialVersion version = new OpenSocialVersion("1.2.3");
+    OpenSocialVersion version2 = new OpenSocialVersion("1.2");
+    Assert.assertTrue(version.isEquivalent(version2));
+    
+    version = new OpenSocialVersion("2");
+    Assert.assertTrue(version.isEquivalent("2.2"));
+    
+    version = new OpenSocialVersion("3");
+    Assert.assertTrue(!version.isEquivalent("2.2"));
+  }
+  
+  @Test
+  public void testEqualOrGreaterThan(){
+    OpenSocialVersion version = new OpenSocialVersion("1.2.3");
+    OpenSocialVersion version2 = new OpenSocialVersion("1.2");
+    Assert.assertTrue(version.isEqualOrGreaterThan(version2));
+    Assert.assertTrue(!version2.isEqualOrGreaterThan(version));
+    
+    version = new OpenSocialVersion("2");
+    version2 = new OpenSocialVersion("2.2");
+    Assert.assertTrue(!version.isEqualOrGreaterThan(version2));
+    Assert.assertTrue(version2.isEqualOrGreaterThan(version));
+    
+    version = new OpenSocialVersion("2.2.48");
+    version2 = new OpenSocialVersion("2.2.49");
+    Assert.assertTrue(!version.isEqualOrGreaterThan(version2));
+    Assert.assertTrue(version2.isEqualOrGreaterThan(version));
+    
+    version = new OpenSocialVersion("3");
+    Assert.assertTrue(version.isEqualOrGreaterThan("2.2"));
+    
+    version = new OpenSocialVersion("3.1.18");
+    Assert.assertTrue(version.isEqualOrGreaterThan("2.2"));
+  }
+  
+  @Test
+  public void testVersionSorting(){
+    ArrayList<OpenSocialVersion> list = new ArrayList<OpenSocialVersion>();
+    list.add(new OpenSocialVersion("2.2.48"));
+    list.add(new OpenSocialVersion("9.0.1"));
+    list.add(new OpenSocialVersion("1.2.48"));
+    list.add(new OpenSocialVersion("2.3.48"));
+    list.add(new OpenSocialVersion("2.2.455"));
+    list.add(new OpenSocialVersion("9.0.0"));
+    Collections.sort(list, OpenSocialVersion.COMPARATOR);
+    for(int i =0;i < list.size()-1;i++){
+      Assert.assertTrue(list.get(i+1).isEqualOrGreaterThan(list.get(i)));
+    }
+  }
+
+}