code cleanup: fix Lint warnings about Locales

8 files changed, 44 insertions, 13 deletions

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 62813a2..b59c766 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="cgeo.geocaching.test"
-      android:versionCode="1"
-      android:versionName="1.0"
-      name="c:geo Tests">
-    <uses-sdk android:minSdkVersion="4" />
+    package="cgeo.geocaching.test"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="13"/>
     <instrumentation android:targetPackage="cgeo.geocaching" android:name="android.test.InstrumentationTestRunner" />
     <application android:icon="@drawable/icon" android:label="@string/app_name">
 
diff --git a/tests/src/cgeo/geocaching/CacheTest.java b/tests/src/cgeo/geocaching/CacheTest.java
index e1d6efb..905cab0 100644
--- a/tests/src/cgeo/geocaching/CacheTest.java
+++ b/tests/src/cgeo/geocaching/CacheTest.java
@@ -41,4 +41,10 @@ public class CacheTest extends AndroidTestCase {
         // different objects with same geocode shall be equal
         assertTrue(one.equals(two));
     }
+
+    public static void testGeocodeUppercase() {
+        cgCache cache = new cgCache();
+        cache.setGeocode("gc1234");
+        assertEquals("GC1234", cache.getGeocode());
+    }
 }
diff --git a/tests/src/cgeo/geocaching/TrackableTest.java b/tests/src/cgeo/geocaching/TrackableTest.java
new file mode 100644
index 0000000..9a04b89
--- /dev/null
+++ b/tests/src/cgeo/geocaching/TrackableTest.java
@@ -0,0 +1,13 @@
+package cgeo.geocaching;
+
+import android.test.AndroidTestCase;
+
+public class TrackableTest extends AndroidTestCase {
+
+    public static void testGetGeocode() {
+        cgTrackable trackable = new cgTrackable();
+        trackable.setGeocode("tb1234");
+        assertEquals("TB1234", trackable.getGeocode());
+    }
+
+}
diff --git a/tests/src/cgeo/geocaching/cgWaypointTest.java b/tests/src/cgeo/geocaching/cgWaypointTest.java
index 324d562..6665c51 100644
--- a/tests/src/cgeo/geocaching/cgWaypointTest.java
+++ b/tests/src/cgeo/geocaching/cgWaypointTest.java
@@ -33,4 +33,9 @@ public class cgWaypointTest extends AndroidTestCase {
         assertTrue(parking.compareTo(trailhead) < 0);
 	}
 
+    public static void testGeocode() {
+        cgWaypoint waypoint = new cgWaypoint("Test waypoint", WaypointType.PARKING, false);
+        waypoint.setGeocode("p1");
+        assertEquals("P1", waypoint.getGeocode());
+    }
 }
diff --git a/tests/src/cgeo/geocaching/enumerations/CacheSizeTest.java b/tests/src/cgeo/geocaching/enumerations/CacheSizeTest.java
index c872c9d..9c3063d 100644
--- a/tests/src/cgeo/geocaching/enumerations/CacheSizeTest.java
+++ b/tests/src/cgeo/geocaching/enumerations/CacheSizeTest.java
@@ -2,6 +2,8 @@ package cgeo.geocaching.enumerations;
 
 import android.test.AndroidTestCase;
 
+import java.util.Locale;
+
 public class CacheSizeTest extends AndroidTestCase {
 
     public static void testOrder() {
@@ -15,13 +17,14 @@ public class CacheSizeTest extends AndroidTestCase {
         assertEquals(CacheSize.UNKNOWN, CacheSize.getById(null));
         assertEquals(CacheSize.UNKNOWN, CacheSize.getById("random garbage"));
         assertEquals(CacheSize.LARGE, CacheSize.getById("large"));
+        assertEquals(CacheSize.LARGE, CacheSize.getById("LARGE"));
     }
 
     public static void testGetByIdComplete() {
         for (CacheSize size : CacheSize.values()) {
             assertEquals(size, CacheSize.getById(size.id));
-            assertEquals(size, CacheSize.getById(size.id.toLowerCase()));
-            assertEquals(size, CacheSize.getById(size.id.toUpperCase()));
+            assertEquals(size, CacheSize.getById(size.id.toLowerCase(Locale.US)));
+            assertEquals(size, CacheSize.getById(size.id.toUpperCase(Locale.US)));
         }
     }
 }
diff --git a/tests/src/cgeo/geocaching/enumerations/CacheTypeTest.java b/tests/src/cgeo/geocaching/enumerations/CacheTypeTest.java
index dd35669..21e97c0 100644
--- a/tests/src/cgeo/geocaching/enumerations/CacheTypeTest.java
+++ b/tests/src/cgeo/geocaching/enumerations/CacheTypeTest.java
@@ -2,6 +2,8 @@ package cgeo.geocaching.enumerations;
 
 import android.test.AndroidTestCase;
 
+import java.util.Locale;
+
 public class CacheTypeTest extends AndroidTestCase {
 
     public static void testGetById() {
@@ -21,16 +23,16 @@ public class CacheTypeTest extends AndroidTestCase {
     public static void testGetByIdComplete() {
         for (CacheType type : CacheType.values()) {
             assertEquals(type, CacheType.getById(type.id));
-            assertEquals(type, CacheType.getById(type.id.toLowerCase()));
-            assertEquals(type, CacheType.getById(type.id.toUpperCase()));
+            assertEquals(type, CacheType.getById(type.id.toLowerCase(Locale.US)));
+            assertEquals(type, CacheType.getById(type.id.toUpperCase(Locale.US)));
         }
     }
 
     public static void testGetByPatternComplete() {
         for (CacheType type : CacheType.values()) {
             assertEquals(type, CacheType.getByPattern(type.pattern));
-            assertEquals(type, CacheType.getByPattern(type.pattern.toLowerCase()));
-            assertEquals(type, CacheType.getByPattern(type.pattern.toUpperCase()));
+            assertEquals(type, CacheType.getByPattern(type.pattern.toLowerCase(Locale.US)));
+            assertEquals(type, CacheType.getByPattern(type.pattern.toUpperCase(Locale.US)));
         }
     }
 }
diff --git a/tests/src/cgeo/geocaching/enumerations/LogTypeTest.java b/tests/src/cgeo/geocaching/enumerations/LogTypeTest.java
index ce2a37a..d4c8f5e 100644
--- a/tests/src/cgeo/geocaching/enumerations/LogTypeTest.java
+++ b/tests/src/cgeo/geocaching/enumerations/LogTypeTest.java
@@ -19,7 +19,8 @@ public class LogTypeTest extends AndroidTestCase {
     public static void testGetByType() {
         assertEquals(LogType.UNKNOWN, LogType.getByIconName(""));
         assertEquals(LogType.UNKNOWN, LogType.getByIconName(null));
-        assertEquals(LogType.GRABBED_IT, LogType.getByType("grabbed IT "));
+        assertEquals(LogType.GRABBED_IT, LogType.getByType("grabbed it"));
+        assertEquals(LogType.GRABBED_IT, LogType.getByType("  gRAbbed IT "));
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index 197de26..bd18baf 100644
--- a/tests/src/cgeo/geocaching/files/GPXParserTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java
@@ -24,10 +24,11 @@ import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
-    private static final SimpleDateFormat LOG_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); // 2010-04-20T07:00:00Z
+    private static final SimpleDateFormat LOG_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US); // 2010-04-20T07:00:00Z
     private int listId;
 
     public void testGPXVersion100() throws Exception {