Changeset 7088 in josm for trunk/test/functional


Ignore:
Timestamp:
2014-05-09T14:15:51+02:00 (6 years ago)
Author:
Don-vip
Message:

more fixes in unit tests

Location:
trunk/test/functional/org/openstreetmap/josm/io
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r7082 r7088  
    1717import java.text.MessageFormat;
    1818import java.util.ArrayList;
    19 import java.util.Properties;
    2019import java.util.logging.Logger;
    2120
     
    110109
    111110    private static DataSet testDataSet;
    112     private static Properties testProperties;
    113111
    114112    /**
     
    142140        File dataSetCacheOutputFile = new File(System.getProperty("java.io.tmpdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
    143141
    144         // make sure we don't upload to production
    145         //
    146         String url = OsmApi.getOsmApi().getBaseUrl().toLowerCase().trim();
    147         if (url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
    148             || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org")) {
    149             fail(MessageFormat.format("configured url ''{0}'' seems to be a productive url, aborting.", url));
    150         }
    151 
    152142        String p = System.getProperties().getProperty("useCachedDataset");
    153143        if (p != null && Boolean.parseBoolean(p.trim().toLowerCase())) {
     
    188178    @Before
    189179    public void setUp() throws IOException, IllegalDataException {
    190         File f = new File(testProperties.getProperty("test.functional.tempdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
     180        File f = new File(System.getProperty("java.io.tmpdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
    191181        logger.info(MessageFormat.format("reading cached dataset ''{0}''", f.toString()));
    192182        ds = new DataSet();
  • trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java

    r6643 r7088  
    1212import javax.swing.JTextField;
    1313
     14import org.junit.Ignore;
    1415import org.openstreetmap.josm.Main;
    1516import org.openstreetmap.josm.gui.io.UploadStrategySelectionPanel;
    1617import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    1718
     19@Ignore
    1820public class UploadStrategySelectionPanelTest extends JFrame {
    1921
     
    5052        return pnl;
    5153    }
    52    
     54
    5355    /**
    5456     * Constructs a new {@code UploadStrategySelectionPanelTest}.
Note: See TracChangeset for help on using the changeset viewer.