check document references

tomhrr · tomhrr · commit e68e7881c2d0 · 2014-07-11T20:50:43.000+10:00
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Country.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Country.java
@@ -38,7 +38,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("country");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("4");
 
         String countryValue =
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/DomainNames.java b/src/main/java/net/apnic/rdap/conformance/attributetest/DomainNames.java
@@ -65,6 +65,10 @@ private int isValidLdhName(final String ldhName) {
     public boolean run(final Context context, final Result proto,
                        final Map<String, Object> data) {
         Result nr = new Result(proto);
+        /* This would refer to a specific object class, but ldhName
+         * and unicodeName appear in both nameservers and domains, and
+         * section 4 is likely to be the most helpful part of the
+         * document in the event of failure anyway. */
         nr.setCode("content");
         nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("4");
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Entities.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Entities.java
@@ -32,7 +32,7 @@ public boolean run(final Context context, final Result proto,
         /* Only set the reference if it is not already set, since the
          * entities attribute is described separately for each object. */
         if (nr.getDocument() == null) {
-            nr.setDocument("draft-ietf-weirds-json-response-06");
+            nr.setDocument("draft-ietf-weirds-json-response-07");
             nr.setReference("6.1");
         }
 
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Entity.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Entity.java
@@ -85,7 +85,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("6.1");
 
         String responseHandle =
@@ -157,7 +157,7 @@ public boolean run(final Context context, final Result proto,
                     rr.addNode(Integer.toString(i));
                     rr.setInfo("registered");
                     rr.setStatus(Status.Success);
-                    rr.setReference("10.2.3");
+                    rr.setReference("11.2.3");
                     if (!ROLES.contains(role)) {
                         rr.setInfo("unregistered: " + role);
                         rr.setStatus(Status.Failure);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/ErrorResponse.java b/src/main/java/net/apnic/rdap/conformance/attributetest/ErrorResponse.java
@@ -40,7 +40,7 @@ public boolean run(final Context context, final Result proto,
                        final Map<String, Object> data) {
         Result p = new Result(proto);
         p.setCode("content");
-        p.setDocument("draft-ietf-json-response-06");
+        p.setDocument("draft-ietf-json-response-07");
         p.setReference("7");
 
         List<AttributeTest> tests = new ArrayList(Arrays.asList(
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Event.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Event.java
@@ -56,6 +56,8 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
+        nr.setReference("5.5");
 
         boolean evtres = true;
         String eventAction =
@@ -64,11 +66,9 @@ public boolean run(final Context context, final Result proto,
         if (eventAction == null) {
             evtres = false;
         } else {
-            Result evr = new Result(proto);
-            evr.setCode("content");
+            Result evr = new Result(nr);
             evr.addNode("eventAction");
-            evr.setDocument("draft-ietf-weirds-json-response-06");
-            evr.setReference("10.2.2");
+            evr.setReference("11.2.2");
             if (EVENT_ACTIONS.contains(eventAction)) {
                 evr.setInfo("registered");
                 evr.setStatus(Status.Success);
@@ -90,11 +90,9 @@ public boolean run(final Context context, final Result proto,
         if (eventDate == null) {
             evdres = false;
         } else {
-            Result edvr = new Result(proto);
-            edvr.setCode("content");
+            Result edvr = new Result(nr);
             edvr.addNode("eventDate");
-            edvr.setDocument("draft-ietf-weirds-json-response-06");
-            edvr.setReference("10.2.2");
+            edvr.setReference("4");
             DateTime dth = parser.parseDateTime(eventDate);
             if (dth != null) {
                 edvr.setInfo("valid");
@@ -113,8 +111,7 @@ public boolean run(final Context context, final Result proto,
             Utils.getStringAttribute(context, nr, "eventActor",
                                      Status.Notification, data);
         if ((eventActor != null) && !allowActor) {
-            Result eacr = new Result(proto);
-            eacr.setCode("content");
+            Result eacr = new Result(nr);
             eacr.addNode("eventActor");
             eacr.setInfo("not permitted here");
             eacr.setStatus(Status.Failure);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Link.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Link.java
@@ -171,7 +171,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("5.2");
 
         boolean success = true;
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Links.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Links.java
@@ -28,7 +28,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("5.2");
 
         return arrayTest.run(context, nr, data);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Notices.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Notices.java
@@ -12,6 +12,10 @@
 /**
  * <p>Notices class.</p>
  *
+ * The key argument in the constructor is present so that both
+ * 'remarks' and 'notices' elements can be tested by way of this
+ * class.
+ *
  * @author Tom Harrison <tomh@apnic.net>
  * @version 0.2
  */
@@ -40,7 +44,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("5.3");
 
         return arrayTest.run(context, nr, data);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Port43.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Port43.java
@@ -39,7 +39,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("5.7");
 
         String port43 = Utils.getStringAttribute(context, nr, "port43",
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/PublicIds.java b/src/main/java/net/apnic/rdap/conformance/attributetest/PublicIds.java
@@ -29,7 +29,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("5.8");
 
         return arrayTest.run(context, nr, data);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/RdapConformance.java b/src/main/java/net/apnic/rdap/conformance/attributetest/RdapConformance.java
@@ -34,7 +34,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("rdapConformance");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("5.1");
 
         Result nr1 = new Result(nr);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Status.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Status.java
@@ -50,7 +50,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("status");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("5.6");
 
         Result nr1 = new Result(nr);
@@ -88,7 +88,7 @@ public boolean run(final Context context, final Result proto,
         for (Object s : statusEntries) {
             Result r2 = new Result(nr);
             r2.addNode(Integer.toString(i++));
-            r2.setReference("10.2.1");
+            r2.setReference("11.2.1");
             if (!STATUSES.contains((String) s)) {
                 r2.setStatus(Result.Status.Failure);
                 r2.setInfo("invalid: " + ((String) s));
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/UnknownAttributes.java b/src/main/java/net/apnic/rdap/conformance/attributetest/UnknownAttributes.java
@@ -46,7 +46,7 @@ public boolean run(final Context context, final Result proto,
                        final Map<String, Object> data) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-06");
+        nr.setDocument("draft-ietf-weirds-json-response-07");
         nr.setReference("3.2");
 
         boolean success = true;
diff --git a/src/main/java/net/apnic/rdap/conformance/test/autnum/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/autnum/Standard.java
@@ -98,7 +98,7 @@ public boolean run(final Context context) {
         Result proto = new Result(Result.Status.Notification, path,
                                   "autnum.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-06",
+                                  "draft-ietf-weirds-json-response-07",
                                   "6.5");
         Result r = new Result(proto);
         r.setCode("response");
diff --git a/src/main/java/net/apnic/rdap/conformance/test/domain/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/domain/Standard.java
@@ -54,7 +54,7 @@ public boolean run(final Context context) {
         Result proto = new Result(Status.Notification, path,
                                   "domain.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-06",
+                                  "draft-ietf-weirds-json-response-07",
                                   "6.3");
         Result r = new Result(proto);
         r.setCode("response");
diff --git a/src/main/java/net/apnic/rdap/conformance/test/ip/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/ip/Standard.java
@@ -234,7 +234,7 @@ public boolean run(final Context context) {
         Result proto = new Result(Result.Status.Notification, path,
                                   "ip.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-06",
+                                  "draft-ietf-weirds-json-response-07",
                                   "6.4");
 
         proto.setCode("content");
diff --git a/src/main/java/net/apnic/rdap/conformance/test/nameserver/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/nameserver/Standard.java
@@ -55,7 +55,7 @@ public boolean run(final Context context) {
         Result proto = new Result(Status.Notification, path,
                                   "domain.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-06",
+                                  "draft-ietf-weirds-json-response-07",
                                   "6.2");
         Result r = new Result(proto);
         r.setCode("response");

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public boolean run(final Context context, final Result proto,`
`32`	`32`	`/* Only set the reference if it is not already set, since the`
`33`	`33`	`* entities attribute is described separately for each object. */`
`34`	`34`	`if (nr.getDocument() == null) {`
`35`		`- nr.setDocument("draft-ietf-weirds-json-response-06");`
	`35`	`+ nr.setDocument("draft-ietf-weirds-json-response-07");`
`36`	`36`	`nr.setReference("6.1");`
`37`	`37`	`}`
`38`	`38`