new unit test

2 files changed, 24 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/utils/UncertainProperty.java b/main/src/cgeo/geocaching/utils/UncertainProperty.java
index 5f86662..e8686e3 100644
--- a/main/src/cgeo/geocaching/utils/UncertainProperty.java
+++ b/main/src/cgeo/geocaching/utils/UncertainProperty.java
@@ -2,6 +2,11 @@ package cgeo.geocaching.utils;
 
 import cgeo.geocaching.connector.gc.Tile;
 
+/**
+ * Property with certainty. When merging properties, the one with higher certainty wins.
+ * 
+ * @param <T>
+ */
 public class UncertainProperty<T> {
 
     private final T value;
diff --git a/tests/src/cgeo/geocaching/utils/UncertainPropertyTest.java b/tests/src/cgeo/geocaching/utils/UncertainPropertyTest.java
new file mode 100644
index 0000000..74aa680
--- /dev/null
+++ b/tests/src/cgeo/geocaching/utils/UncertainPropertyTest.java
@@ -0,0 +1,19 @@
+package cgeo.geocaching.utils;
+
+import junit.framework.TestCase;
+
+public class UncertainPropertyTest extends TestCase {
+
+    public static void testHigherCertaintyWins() throws Exception {
+        final UncertainProperty<String> prop1 = new UncertainProperty<String>("prop1", 10);
+        final UncertainProperty<String> prop2 = new UncertainProperty<String>("prop2", 20);
+        assertEquals(prop2, UncertainProperty.getMergedProperty(prop1, prop2));
+    }
+
+    public static void testAvoidNull() throws Exception {
+        final UncertainProperty<String> prop1 = new UncertainProperty<String>("prop1", 10);
+        final UncertainProperty<String> prop2 = new UncertainProperty<String>(null, 20);
+        assertEquals(prop1, UncertainProperty.getMergedProperty(prop1, prop2));
+        assertEquals(prop1, UncertainProperty.getMergedProperty(prop2, prop1));
+    }
+}