fix unsupported query type tests

Author: tomhrr

src/main/java/net/apnic/rdap/conformance/Application.java

@@ -150,16 +150,6 @@ public X509Certificate[] getAcceptedIssuers() {
 
         List<Test> tests = new ArrayList();
 
-        for (String objectType : objectTypes) {
-            ObjectClass oc = s.getObjectClass(objectType);
-            if ((oc != null)
-                    && (!s.getObjectClass(objectType).isSupported())) {
-                tests.add(new net.apnic.rdap.conformance.test.common.NotFound(
-                            "/" + objectType)
-                         );
-            }
-        }
-
         /* Relative URI in the HTTP request. */
         Result relative = new Result();
         relative.setTestName("common.bad-uri-relative");
@@ -195,6 +185,9 @@ public X509Certificate[] getAcceptedIssuers() {
             )
         );
 
+        /* From here onwards, the tests are RDAP-specific, except for
+         * the unescaped-URI IP test. */
+
         /* application/json content-type. This is deliberately using
          * an invalid status code with inverted sense, because so long
          * as the request is 'successful', it's fine. */
@@ -212,6 +205,26 @@ public X509Certificate[] getAcceptedIssuers() {
                   ));
         c.setContentType(null);
 
+        /* Unsupported query types. */
+        for (String objectType : objectTypes) {
+            Result unsupported = new Result();
+            unsupported.setTestName("common.unsupported");
+            unsupported.setDocument("draft-ietf-weirds-using-http-08");
+            unsupported.setReference("5.4");
+            ObjectClass oc = s.getObjectClass(objectType);
+            if ((oc == null)
+                    || (!s.getObjectClass(objectType).isSupported())) {
+                tests.add(
+                    new net.apnic.rdap.conformance.test.common.BasicRequest(
+                        HttpStatus.SC_BAD_REQUEST,
+                        "/" + objectType + "/1.2.3.4",
+                        "common.unsupported",
+                        false,
+                        unsupported
+                    ));
+            }
+        }
+
         ObjectClass ocIp = s.getObjectClass("ip");
         if ((ocIp != null) && (ocIp.isSupported())) {
             tests.add(new net.apnic.rdap.conformance.test.ip.BadRequest());

src/main/java/net/apnic/rdap/conformance/responsetest/NotStatusCode.java

@@ -39,8 +39,12 @@ public boolean run(final Context context, final Result proto,
 
         if (code != notExpectedCode) {
             nr.setStatus(Status.Success);
-            nr.setInfo("got " + code + " instead of unexpected code ("
-                       + notExpectedCode + ")");
+            if (notExpectedCode != 0) {
+                nr.setInfo("got " + code + " instead of unexpected code ("
+                           + notExpectedCode + ")");
+            } else {
+                nr.setInfo("got valid code (" + code + ")");
+            }
             results.add(nr);
             return true;
         } else {