cleanup: fix all findbugs on test and calendar

8 files changed, 33 insertions, 40 deletions

diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/CgeoApplicationTest.java
index c4737db..72cfcdb 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/CgeoApplicationTest.java
@@ -40,7 +40,9 @@ import junit.framework.Assert;
  * application and/or context.
  */
 
-public class cgeoApplicationTest extends CGeoTestCase {
+public class CgeoApplicationTest extends CGeoTestCase {
+
+    private static final String[] INVALID_TOKEN = null;
 
     /**
      * The name 'test preconditions' is a convention to signal that if this test
@@ -69,6 +71,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
     @MediumTest
     public static void testSearchTrackable() {
         final Trackable tb = GCParser.searchTrackable("TB2J1VZ", null, null);
+        assertNotNull(tb);
         // fix data
         assertEquals("aefffb86-099f-444f-b132-605436163aa8", tb.getGuid());
         assertEquals("TB2J1VZ", tb.getGeocode());
@@ -344,8 +347,6 @@ public class cgeoApplicationTest extends CGeoTestCase {
 
                 try {
 
-                    final String[] tokens = null; // without a valid token we are "logged off"
-
                     // non premium cache
                     MockedCache cache = new GC2CJPF();
                     deleteCacheFromDBAndLogout(cache.getGeocode());
@@ -353,7 +354,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
                     Settings.setCacheType(CacheType.ALL);
 
                     Viewport viewport = new Viewport(cache, 0.003, 0.003);
-                    SearchResult search = ConnectorFactory.searchByViewport(viewport, tokens);
+                    SearchResult search = ConnectorFactory.searchByViewport(viewport, INVALID_TOKEN);
 
                     assertNotNull(search);
                     assertTrue(search.getGeocodes().contains(cache.getGeocode()));
@@ -370,7 +371,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
                     deleteCacheFromDBAndLogout(cache.getGeocode());
 
                     viewport = new Viewport(cache, 0.003, 0.003);
-                    search = ConnectorFactory.searchByViewport(viewport, tokens);
+                    search = ConnectorFactory.searchByViewport(viewport, INVALID_TOKEN);
 
                     assertNotNull(search);
                     // depending on the chosen strategy the cache is part of the search or not
@@ -392,7 +393,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
             String oldUser = mockedCache.getMockedDataUser();
             try {
                 mockedCache.setMockedDataUser(Settings.getUsername());
-                Geocache parsedCache = cgeoApplicationTest.testSearchByGeocode(mockedCache.getGeocode());
+                Geocache parsedCache = CgeoApplicationTest.testSearchByGeocode(mockedCache.getGeocode());
                 if (null != parsedCache) {
                     Compare.assertCompareCaches(mockedCache, parsedCache, true);
                 }
@@ -406,10 +407,10 @@ public class cgeoApplicationTest extends CGeoTestCase {
      * Caches that are good test cases
      */
     public static void testSearchByGeocodeSpecialties() {
-        final Geocache GCV2R9 = cgeoApplicationTest.testSearchByGeocode("GCV2R9");
+        final Geocache GCV2R9 = CgeoApplicationTest.testSearchByGeocode("GCV2R9");
         Assert.assertEquals("California, United States", GCV2R9.getLocation());
 
-        final Geocache GC1ZXEZ = cgeoApplicationTest.testSearchByGeocode("GC1ZXEZ");
+        final Geocache GC1ZXEZ = CgeoApplicationTest.testSearchByGeocode("GC1ZXEZ");
         Assert.assertEquals("Ms.Marple/Mr.Stringer", GC1ZXEZ.getOwnerUserId());
     }
 
diff --git a/tests/src/cgeo/geocaching/HtmlPerformanceTest.java b/tests/src/cgeo/geocaching/HtmlPerformanceTest.java
index b08b06e..695cd4a 100644
--- a/tests/src/cgeo/geocaching/HtmlPerformanceTest.java
+++ b/tests/src/cgeo/geocaching/HtmlPerformanceTest.java
@@ -2,6 +2,8 @@ package cgeo.geocaching;
 
 import cgeo.geocaching.utils.Log;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import org.apache.commons.lang3.StringEscapeUtils;
 
 import android.os.SystemClock;
@@ -51,6 +53,7 @@ public class HtmlPerformanceTest extends AndroidTestCase {
         });
     }
 
+    @SuppressFBWarnings("DM_GC")
     private static long measure(String label, Runnable runnable) {
         System.gc();
         final long start = SystemClock.elapsedRealtime();
diff --git a/tests/src/cgeo/geocaching/PersonalNoteTest.java b/tests/src/cgeo/geocaching/PersonalNoteTest.java
index 38085d5..74e1bab 100644
--- a/tests/src/cgeo/geocaching/PersonalNoteTest.java
+++ b/tests/src/cgeo/geocaching/PersonalNoteTest.java
@@ -36,10 +36,10 @@ public class PersonalNoteTest extends TestCase {
 
         Geocache exceedingCache = new Geocache();
         exceedingCache.setListId(StoredList.STANDARD_LIST_ID); // stored
-        exceedingCache.setPersonalNote(testString.toString());
+        exceedingCache.setPersonalNote(testString);
         PersonalNote otherNote = new PersonalNote(exceedingCache);
         PersonalNote result = parsedNote.mergeWith(otherNote);
-        assertPersonalNote(result, null, testString.toString());
+        assertPersonalNote(result, null, testString);
     }
 
     public static void testParseCgeoOnly() {
diff --git a/tests/src/cgeo/geocaching/export/ExportTest.java b/tests/src/cgeo/geocaching/export/ExportTest.java
index 6d39f8d..b8f1ffd 100644
--- a/tests/src/cgeo/geocaching/export/ExportTest.java
+++ b/tests/src/cgeo/geocaching/export/ExportTest.java
@@ -7,6 +7,7 @@ import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.utils.FileUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -43,7 +44,7 @@ public class ExportTest extends CGeoTestCase {
 
         assertNotNull(result);
 
-        result.delete();
+        FileUtils.deleteIgnoringFailure(result);
     }
 
     private static class GpxExportTester extends GpxExport {
diff --git a/tests/src/cgeo/geocaching/files/GPXImporterTest.java b/tests/src/cgeo/geocaching/files/GPXImporterTest.java
index ee42d23..6d7456c 100644
--- a/tests/src/cgeo/geocaching/files/GPXImporterTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXImporterTest.java
@@ -12,6 +12,7 @@ import cgeo.geocaching.test.R;
 import cgeo.geocaching.utils.CancellableHandler;
 import cgeo.geocaching.utils.Log;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import android.net.Uri;
@@ -50,8 +51,8 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
             // the "real" method check
             assertEquals(wptsFileName, GPXImporter.getWaypointsFileNameForGpxFile(gpx));
             // they also need to be deleted, because of case sensitive tests that will not work correct on case insensitive file systems
-            gpx.delete();
-            wpts.delete();
+            FileUtils.deleteQuietly(gpx);
+            FileUtils.deleteQuietly(wpts);
         }
         final File gpx1 = new File(tempDir, "abc.gpx");
         assertNull(GPXImporter.getWaypointsFileNameForGpxFile(gpx1));
@@ -260,7 +261,7 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
             msg1.copyFrom(msg);
             messages.add(msg1);
             lastMessage = System.currentTimeMillis();
-            notify();
+            notifyAll();
         }
 
         public synchronized void waitForCompletion(final long milliseconds, final int maxMessages) {
@@ -287,7 +288,7 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
         assertTrue("java.io.tmpdir is not defined", StringUtils.isNotBlank(globalTempDir));
 
         tempDir = new File(globalTempDir, "cgeogpxesTest");
-        tempDir.mkdir();
+        cgeo.geocaching.utils.FileUtils.mkdirs(tempDir);
         assertTrue("Could not create directory " + tempDir.getPath(), tempDir.exists());
         // workaround to get storage initialized
         DataStore.getAllHistoryCachesCount();
@@ -306,21 +307,9 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
         cachesInList.addAll(search.getCachesFromSearchResult(LoadFlags.LOAD_CACHE_OR_DB));
         DataStore.markDropped(cachesInList);
         DataStore.removeList(listId);
-        deleteDirectory(tempDir);
+        FileUtils.deleteDirectory(tempDir);
         TestSettings.setStoreOfflineMaps(importCacheStaticMaps);
         TestSettings.setStoreOfflineWpMaps(importWpStaticMaps);
         super.tearDown();
     }
-
-    private static void deleteDirectory(File dir) {
-        for (File f : dir.listFiles()) {
-            if (f.isFile()) {
-                f.delete();
-            } else if (f.isDirectory()) {
-                deleteDirectory(f);
-            }
-        }
-        dir.delete();
-    }
-
 }
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index 9604519..dcaad22 100644
--- a/tests/src/cgeo/geocaching/files/GPXParserTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java
@@ -12,13 +12,13 @@ import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 import cgeo.geocaching.test.R;
+import cgeo.geocaching.utils.SynchronizedDateFormat;
 
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
@@ -28,7 +28,7 @@ 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'", Locale.US); // 2010-04-20T07:00:00Z
+    private static final SynchronizedDateFormat LOG_DATE_FORMAT = new SynchronizedDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US); // 2010-04-20T07:00:00Z
 
     public void testGPXVersion100() throws Exception {
         testGPXVersion(R.raw.gc1bkp3_gpx100);
diff --git a/tests/src/cgeo/geocaching/test/CgeoTestsActivity.java b/tests/src/cgeo/geocaching/test/CgeoTestsActivity.java
index 0f41cef..c1f6fdd 100644
--- a/tests/src/cgeo/geocaching/test/CgeoTestsActivity.java
+++ b/tests/src/cgeo/geocaching/test/CgeoTestsActivity.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.test;
 
+import butterknife.ButterKnife;
+
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.pm.InstrumentationInfo;
@@ -14,6 +16,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.List;
 
@@ -76,7 +79,9 @@ public class CgeoTestsActivity extends Activity {
                     Thread.sleep(50);
                     publishProgress(mReader.readLine());
                 } while (System.currentTimeMillis() < timeout);
-            } catch (Exception e) {
+            } catch (InterruptedException e) {
+                publishProgress("ERROR: " + e);
+            } catch (IOException e) {
                 publishProgress("ERROR: " + e);
             } finally {
                 publishProgress("END");
@@ -90,8 +95,8 @@ public class CgeoTestsActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.cgeo_tests_activity);
-        logView = (TextView) findViewById(R.id.logOutput);
-        scrollView = (BottomAwareScrollView) findViewById(R.id.scrollView);
+        logView = ButterKnife.findById(this, R.id.logOutput);
+        scrollView = ButterKnife.findById(this, R.id.scrollView);
     }
 
     @Override
@@ -114,7 +119,7 @@ public class CgeoTestsActivity extends Activity {
      *            referenced from XML layout
      */
     public void runTests(final View v) {
-        final Button button = (Button) findViewById(R.id.buttonRun);
+        final Button button = ButterKnife.findById(this, R.id.buttonRun);
         button.setEnabled(false);
         try {
             runTestsInternally();
diff --git a/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java b/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java
index e9db12d..ea8079b 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java
@@ -133,10 +133,4 @@ public class GC3XX5J extends MockedCache {
     public String getShortDescription() {
         return "Kadar zbolimo nam pomaga...<br /> <br /> When we get sick, they are helpful...";
     }
-
-    @Override
-    public String getPersonalNote() {
-        return super.getPersonalNote();
-    }
-
 }