fixes #3370 #2960 #1320 - also keep empty and null values for hint, short description and attributes

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/src/cgeo/geocaching/GeocacheTest.java b/tests/src/cgeo/geocaching/GeocacheTest.java
index f7e4e84..5d9a31c 100644
--- a/tests/src/cgeo/geocaching/GeocacheTest.java
+++ b/tests/src/cgeo/geocaching/GeocacheTest.java
@@ -100,6 +100,11 @@ public class GeocacheTest extends CGeoTestCase {
         stored.setType(CacheType.TRADITIONAL);
         stored.setCoords(new Geopoint(40.0, 8.0));
         stored.setDescription("Test1");
+        ArrayList<String> attributes = new ArrayList<String>(1);
+        attributes.add("TestAttribute");
+        stored.setAttributes(attributes);
+        stored.setShortDescription("Short");
+        stored.setHint("Hint");
 
         Geocache download = new Geocache();
         download.setGeocode("GC12345");
@@ -117,6 +122,9 @@ public class GeocacheTest extends CGeoTestCase {
         assertEquals("Longitude not merged correctly", 9.0, download.getCoords().getLongitude(), 0.1);
         assertEquals("Latitude not merged correctly", 41.0, download.getCoords().getLatitude(), 0.1);
         assertEquals("Description not merged correctly", "Test2", download.getDescription());
+        assertEquals("ShortDescription not merged correctly", "", download.getShortDescription());
+        assertEquals("Attributes not merged correctly", new ArrayList<String>(0), download.getAttributes());
+        assertEquals("Hint not merged correctly", "", download.getHint());
     }
 
     public static void testMergeLivemapStored() {