Changeset 7040 in josm for trunk/test


Ignore:
Timestamp:
2014-05-02T00:04:06+02:00 (6 years ago)
Author:
Don-vip
Message:

tests/build update:

  • update Jacoco to version 0.7.0
  • compile performance tests even if not run by ant task
  • do not create empty package-info.class files in javac task
  • move RemoteControl test to unit tests to get coverage information
  • fix NPEs seen in tests in headless mode
  • proper test failures when properties files can not be loaded


Location:
trunk/test
Files:
1 added
1 deleted
3 edited
1 copied

Legend:

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

    r7030 r7040  
    141141        //
    142142        try (InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties")) {
     143            if (is == null) {
     144                throw new IOException();
     145            }
    143146            testProperties.load(is);
    144147        } catch(IOException e){
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r7030 r7040  
    148148        //
    149149        try (InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties")) {
     150            if (is == null) {
     151                throw new IOException();
     152            }
    150153            testProperties.load(is);
    151154        } catch(IOException e){
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java

    r2448 r7040  
    1919
    2020    @Test
    21     public void test1()  throws OsmTransferException {
     21    public void testNode()  throws OsmTransferException {
    2222        OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.NODE,266187);
    2323        HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
     
    2727
    2828    @Test
    29     public void test2()  throws OsmTransferException {
    30         OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.WAY,32916);
     29    public void testWay()  throws OsmTransferException {
     30        OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.WAY,3058844);
    3131        HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
    32         History h = ds.getHistory(32916, OsmPrimitiveType.WAY);
     32        History h = ds.getHistory(3058844, OsmPrimitiveType.WAY);
    3333        System.out.println("num versions: " + h.getNumVersions());
    3434    }
    3535
    3636    @Test
    37     public void test3()  throws OsmTransferException {
     37    public void testRelation()  throws OsmTransferException {
    3838        OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.RELATION,49);
    3939        HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

    r7039 r7040  
    3030
    3131/**
    32  * Functional tests for Remote Control
     32 * Unit tests for Remote Control
    3333 */
    3434public class RemoteControlTest {
Note: See TracChangeset for help on using the changeset viewer.