Changeset 14190 in josm for trunk/test/functional

Timestamp:

2018-08-28T21:29:03+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16688 - skip some unit tests if preconditions are not met

Location:

trunk/test/functional/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReaderTest.java (modified) (9 diffs)
• OsmServerBackreferenceReaderTest.java (modified) (9 diffs)

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

@@ -22 +22 @@
 import java.util.logging.Logger;
 
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -28 +29 @@
 import org.junit.rules.Timeout;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
@@ -150 +152 @@
     @BeforeClass
     public static void init() throws Exception {
+        if (!TestUtils.areCredentialsProvided()) {
+            logger.severe("OSM DEV API credentials not provided. Please define them with -Dosm.username and -Dosm.password");
+            return;
+        }
         logger.info("initializing ...");
         JOSMFixture.createFunctionalTestFixture().init();
@@ -200 +206 @@
     @Before
     public void setUp() throws IOException, IllegalDataException, FileNotFoundException {
+        if (!TestUtils.areCredentialsProvided()) {
+            return;
+        }
         File f = new File(System.getProperty("java.io.tmpdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
         logger.info(MessageFormat.format("reading cached dataset ''{0}''", f.toString()));
@@ -214 +223 @@
     @Test
     public void testMultiGet10Nodes() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
@@ -235 +245 @@
     @Test
     public void testMultiGet10Ways() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         ArrayList<Way> ways = new ArrayList<>(ds.getWays());
@@ -257 +268 @@
     @Test
     public void testMultiGet10Relations() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         ArrayList<Relation> relations = new ArrayList<>(ds.getRelations());
@@ -279 +291 @@
     @Test
     public void testMultiGet800Nodes() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
@@ -300 +313 @@
     @Test
     public void testMultiGetWithNonExistingNode() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());

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

@@ -22 +22 @@
 import java.util.logging.Logger;
 
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -158 +160 @@
     @BeforeClass
     public static void setUpBeforeClass() throws OsmTransferException, CyclicUploadDependencyException, IOException {
+        if (!TestUtils.areCredentialsProvided()) {
+            logger.severe("OSM DEV API credentials not provided. Please define them with -Dosm.username and -Dosm.password");
+            return;
+        }
         logger.info("initializing ...");
 
@@ -213 +219 @@
     @Before
     public void setUp() throws IOException, IllegalDataException, FileNotFoundException {
+        if (!TestUtils.areCredentialsProvided()) {
+            return;
+        }
         File f = new File(System.getProperty("java.io.tmpdir"), MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
         logger.info(MessageFormat.format("reading cached dataset ''{0}''", f.toString()));
@@ -227 +236 @@
     @Test
     public void testBackreferenceForNode() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         Node n = lookupNode(ds, 0);
         assertNotNull(n);
@@ -284 +294 @@
     @Test
     public void testBackreferenceForNodeFull() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         Node n = lookupNode(ds, 0);
         assertNotNull(n);
@@ -332 +343 @@
     @Test
     public void testBackreferenceForWay() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         Way w = lookupWay(ds, 1);
         assertNotNull(w);
@@ -376 +388 @@
     @Test
     public void testBackreferenceForWayFull() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         Way w = lookupWay(ds, 1);
         assertNotNull(w);
@@ -414 +427 @@
     @Test
     public void testBackreferenceForRelation() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         Relation r = lookupRelation(ds, 1);
         assertNotNull(r);
@@ -533 +547 @@
     @Test
     public void testBackreferenceForRelationFull() throws OsmTransferException {
+        Assume.assumeTrue(TestUtils.areCredentialsProvided());
         Relation r = lookupRelation(ds, 1);
         assertNotNull(r);