Merge pull request #32 from opengeospatial/improveFailureMassage-Land…

…ingPageValidation-31

Improved failure massage

src/main/java/org/opengis/cite/wfs30/EtsAssert.java

@@ -0,0 +1,32 @@
+package org.opengis.cite.wfs30;
+
+/**
+ * Provides a set of custom assertion methods.
+ *
+ * @author <a href="mailto:[email protected]">Lyn Goltz </a>
+ */
+public class EtsAssert {
+
+    /**
+     * @param valueToAssert
+     *            the boolean to assert to be <code>true</code>
+     * @param failureMsg
+     *            the message to throw in case of a failure, should not be <code>null</code>
+     */
+    public static void assertTrue( boolean valueToAssert, String failureMsg ) {
+        if ( !valueToAssert )
+            throw new AssertionError( failureMsg );
+    }
+
+    /**
+     * @param valueToAssert
+     *            the boolean to assert to be <code>false</code>
+     * @param failureMsg
+     *            the message to throw in case of a failure, should not be <code>null</code>
+     */
+    public static void assertFalse( boolean valueToAssert, String failureMsg ) {
+        if ( valueToAssert )
+            throw new AssertionError( failureMsg );
+    }
+
+}

src/main/java/org/opengis/cite/wfs30/apidescription/LandingPage.java

@@ -2,7 +2,7 @@
 
 import static io.restassured.http.ContentType.JSON;
 import static io.restassured.http.Method.GET;
-import static org.testng.Assert.assertTrue;
+import static org.opengis.cite.wfs30.EtsAssert.assertTrue;
 
 import java.util.HashSet;
 import java.util.List;
@@ -82,7 +82,7 @@ public void landingPageValidation() {
                                           && linkTypes.contains( "data" );
         assertTrue( expectedLinkTypesExists,
                     "The landing page must include at least links with relation type 'service', 'conformance' and 'data', but contains "
-                                            + linkTypes );
+                                            + String.join( ", ", linkTypes ) );
 
     }
 

src/main/java/org/opengis/cite/wfs30/apidescription/OpenApi.java

@@ -2,9 +2,9 @@
 
 import static io.restassured.http.ContentType.JSON;
 import static io.restassured.http.Method.GET;
+import static org.opengis.cite.wfs30.EtsAssert.assertTrue;
 import static org.opengis.cite.wfs30.SuiteAttribute.API_MODEL;
 import static org.opengis.cite.wfs30.WFS3.OPEN_API_MIME_TYPE;
-import static org.testng.Assert.assertTrue;
 
 import java.net.MalformedURLException;
 import java.net.URL;

src/main/java/org/opengis/cite/wfs30/collections/FeatureCollectionsMetadataOperation.java

@@ -2,6 +2,7 @@
 
 import static io.restassured.http.ContentType.JSON;
 import static io.restassured.http.Method.GET;
+import static org.opengis.cite.wfs30.EtsAssert.assertTrue;
 import static org.opengis.cite.wfs30.SuiteAttribute.API_MODEL;
 import static org.opengis.cite.wfs30.WFS3.PATH.COLLECTIONS;
 import static org.opengis.cite.wfs30.openapi3.OpenApiUtils.retrieveTestPoints;
@@ -13,7 +14,6 @@
 import static org.opengis.cite.wfs30.util.JsonUtils.linkIncludesRelAndType;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/org/opengis/cite/wfs30/collections/GetFeatureOperation.java

@@ -1,6 +1,7 @@
 package org.opengis.cite.wfs30.collections;
 
 import static io.restassured.http.Method.GET;
+import static org.opengis.cite.wfs30.EtsAssert.assertTrue;
 import static org.opengis.cite.wfs30.SuiteAttribute.API_MODEL;
 import static org.opengis.cite.wfs30.WFS3.GEOJSON_MIME_TYPE;
 import static org.opengis.cite.wfs30.util.JsonUtils.findLinkByRel;
@@ -9,7 +10,6 @@
 import static org.opengis.cite.wfs30.util.JsonUtils.findUnsupportedTypes;
 import static org.opengis.cite.wfs30.util.JsonUtils.linkIncludesRelAndType;
 import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/org/opengis/cite/wfs30/collections/GetFeaturesOperation.java

@@ -1,6 +1,8 @@
 package org.opengis.cite.wfs30.collections;
 
 import static io.restassured.http.Method.GET;
+import static org.opengis.cite.wfs30.EtsAssert.assertFalse;
+import static org.opengis.cite.wfs30.EtsAssert.assertTrue;
 import static org.opengis.cite.wfs30.SuiteAttribute.API_MODEL;
 import static org.opengis.cite.wfs30.WFS3.GEOJSON_MIME_TYPE;
 import static org.opengis.cite.wfs30.WFS3.PATH.COLLECTIONS;
@@ -18,9 +20,7 @@
 import static org.opengis.cite.wfs30.util.JsonUtils.parseSpatialExtent;
 import static org.opengis.cite.wfs30.util.JsonUtils.parseTemporalExtent;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
 
 import java.net.URISyntaxException;
 import java.time.Duration;

src/test/java/EtsAssertTest.java

@@ -0,0 +1,30 @@
+import org.junit.Test;
+import org.opengis.cite.wfs30.EtsAssert;
+
+/**
+ * @author <a href="mailto:[email protected]">Lyn Goltz </a>
+ */
+public class EtsAssertTest {
+
+    @Test
+    public void testAssertTrue() {
+        EtsAssert.assertTrue( true, "OK" );
+    }
+
+    @Test
+    public void testAssertFalse() {
+        EtsAssert.assertFalse( false, "OK" );
+    }
+
+    @Test(expected = AssertionError.class)
+    public void testAssertTrue_false() {
+        EtsAssert.assertTrue( false, "FAIlURE" );
+    }
+
+    @Test(expected = AssertionError.class)
+    public void testAssertFalse_true() {
+        EtsAssert.assertFalse( true, "FAIlURE" );
+
+    }
+
+}