Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 7087)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 7088)
@@ -17,5 +17,4 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Properties;
 import java.util.logging.Logger;
 
@@ -110,5 +109,4 @@
 
     private static DataSet testDataSet;
-    private static Properties testProperties;
 
     /**
@@ -142,12 +140,4 @@
         File dataSetCacheOutputFile = new File(System.getProperty("java.io.tmpdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
 
-        // make sure we don't upload to production
-        //
-        String url = OsmApi.getOsmApi().getBaseUrl().toLowerCase().trim();
-        if (url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
-            || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org")) {
-            fail(MessageFormat.format("configured url ''{0}'' seems to be a productive url, aborting.", url));
-        }
-
         String p = System.getProperties().getProperty("useCachedDataset");
         if (p != null && Boolean.parseBoolean(p.trim().toLowerCase())) {
@@ -188,5 +178,5 @@
     @Before
     public void setUp() throws IOException, IllegalDataException {
-        File f = new File(testProperties.getProperty("test.functional.tempdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
+        File f = new File(System.getProperty("java.io.tmpdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
         logger.info(MessageFormat.format("reading cached dataset ''{0}''", f.toString()));
         ds = new DataSet();
Index: trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java	(revision 7087)
+++ trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java	(revision 7088)
@@ -12,8 +12,10 @@
 import javax.swing.JTextField;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.io.UploadStrategySelectionPanel;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 
+@Ignore
 public class UploadStrategySelectionPanelTest extends JFrame {
 
@@ -50,5 +52,5 @@
         return pnl;
     }
-    
+
     /**
      * Constructs a new {@code UploadStrategySelectionPanelTest}.
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 7087)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 7088)
@@ -25,5 +25,5 @@
 public class PropertiesMergeModelTest {
 
-    static public class ObserverTest implements Observer {
+    public static abstract class TestObserver implements Observer {
         public int numInvocations;
 
@@ -33,6 +33,5 @@
         }
 
-        public void test() {
-        }
+        public abstract void test();
 
         public void assertNumInvocations(int count) {
@@ -112,7 +111,7 @@
         // decide KEEP_MINE  and ensure notification via Observable
         //
-        ObserverTest observerTest;
+        TestObserver observerTest;
         model.addObserver(
-                observerTest = new ObserverTest() {
+                observerTest = new TestObserver() {
                     @Override
                     public void test() {
@@ -129,5 +128,5 @@
         model.deleteObserver(observerTest);
         model.addObserver(
-                observerTest = new ObserverTest() {
+                observerTest = new TestObserver() {
                     @Override
                     public void test() {