Changeset 17194 in josm

Timestamp:

2020-10-13T22:07:11+02:00 (4 years ago)

Author:

simon04

Message:

see #15102 - see #16637 - get rid of real HTTP calls to ​https://api.openstreetmap.org in OsmServerHistoryReaderTest, mock them

Location:

trunk/test

Files:

• data/__files/api (added)
• data/__files/api/0.6 (added)
• data/__files/api/0.6/capabilities (moved) (moved from trunk/test/data/__files/osm_api/0.6/capabilities )
• data/__files/api/0.6/node (added)
• data/__files/api/0.6/node/266187 (added)
• data/__files/api/0.6/node/266187/history (added)
• data/__files/api/0.6/relation (added)
• data/__files/api/0.6/relation/49 (added)
• data/__files/api/0.6/relation/49/history (added)
• data/__files/api/0.6/way (added)
• data/__files/api/0.6/way/3058844 (added)
• data/__files/api/0.6/way/3058844/history (added)
• data/__files/api/capabilities (copied) (copied from trunk/test/data/__files/osm_api/0.6/capabilities )
• unit/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTaskTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/io/CapabilitiesTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (moved) (moved from trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java ) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTaskTest.java

@@ -58 +58 @@
     @Test
     public void testNominalUrl() {
-        ApiUrlTestTask task = new ApiUrlTestTask(PARENT, wireMockRule.url("/__files/osm_api"));
+        ApiUrlTestTask task = new ApiUrlTestTask(PARENT, wireMockRule.url("/__files/api"));
         task.run();
         assertTrue(task.isSuccess());

trunk/test/unit/org/openstreetmap/josm/io/CapabilitiesTest.java

@@ -24 +24 @@
     public void testCapabilities() throws Exception {
         final Capabilities capabilities;
-        try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream("__files/osm_api/0.6/capabilities")) {
+        try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream("__files/api/0.6/capabilities")) {
             capabilities = Capabilities.CapabilitiesParser.parse(new InputSource(inputStream));
         }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import static org.junit.Assert.assertTrue;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.junit.Assert.assertEquals;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.history.History;
@@ -13 +16 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 /**
- * History fetching tests. This test operates with production API.
+ * Unit tests of {@link OsmServerHistoryReader} class.
  */
 public class OsmServerHistoryReaderTest {
 
     /**
+     * HTTP mock.
+     */
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot()));
+
+    /**
      * Setup tests.
      */
-    @BeforeClass
-    public static void init() {
+    @Before
+    public void setUp() {
         JOSMFixture.createUnitTestFixture().init();
-        Config.getPref().put("osm-server.url", Config.getUrls().getDefaultOsmApiUrl());
+        Config.getPref().put("osm-server.url", wireMockRule.url("/__files/api"));
     }
 
@@ -36 +47 @@
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
         History h = ds.getHistory(266187, OsmPrimitiveType.NODE);
-        assertTrue("NumVersions", h.getNumVersions() >= 4);
+        assertEquals(5, h.getNumVersions());
+        assertEquals(1, h.getLatest().getNumKeys());
+        assertEquals(65565982, h.getLatest().getChangesetId());
+        assertEquals(1545089885000L, h.getLatest().getTimestamp().getTime());
     }
 
@@ -48 +62 @@
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
         History h = ds.getHistory(3058844, OsmPrimitiveType.WAY);
-        assertTrue("NumVersions", h.getNumVersions() >= 13);
+        assertEquals(14, h.getNumVersions());
+        assertEquals(10, h.getLatest().getNumKeys());
+        assertEquals(26368284, h.getLatest().getChangesetId());
+        assertEquals(1414429134000L, h.getLatest().getTimestamp().getTime());
     }
 
@@ -60 +77 @@
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
         History h = ds.getHistory(49, OsmPrimitiveType.RELATION);
-        assertTrue("NumVersions", h.getNumVersions() >= 3);
+        assertEquals(3, h.getNumVersions());
+        assertEquals(0, h.getLatest().getNumKeys());
+        assertEquals(486501, h.getLatest().getChangesetId());
+        assertEquals(1194886166000L, h.getLatest().getTimestamp().getTime());
     }
 }