Changeset 7040 in josm for trunk/test/functional/org

Timestamp:

2014-05-02T00:04:06+02:00 (11 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/functional/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReaderTest.java (modified) (1 diff)
• OsmServerBackreferenceReaderTest.java (modified) (1 diff)
• OsmServerHistoryReaderTest.java (modified) (2 diffs)
• remotecontrol (deleted)

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -141 +141 @@
         //
         try (InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties")) {
+            if (is == null) {
+                throw new IOException();
+            }
             testProperties.load(is);
         } catch(IOException e){

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -148 +148 @@
         //
         try (InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties")) {
+            if (is == null) {
+                throw new IOException();
+            }
             testProperties.load(is);
         } catch(IOException e){

trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java

@@ -19 +19 @@
 
     @Test
-    public void test1()  throws OsmTransferException {
+    public void testNode()  throws OsmTransferException {
         OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.NODE,266187);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
@@ -27 +27 @@
 
     @Test
-    public void test2()  throws OsmTransferException {
-        OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.WAY,32916);
+    public void testWay()  throws OsmTransferException {
+        OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.WAY,3058844);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
-        History h = ds.getHistory(32916, OsmPrimitiveType.WAY);
+        History h = ds.getHistory(3058844, OsmPrimitiveType.WAY);
         System.out.println("num versions: " + h.getNumVersions());
     }
 
     @Test
-    public void test3()  throws OsmTransferException {
+    public void testRelation()  throws OsmTransferException {
         OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.RELATION,49);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);