Skip to content

Commit 8ef4bc7

Browse files
tomhrrtomhrr
committed
add remaining document references
1 parent e68e788 commit 8ef4bc7

File tree

8 files changed

+167
-49
lines changed

8 files changed

+167
-49
lines changed

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

Lines changed: 72 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,17 @@ private static void runSearchTests(final List<Test> tests,
7777
}
7878
}
7979

80+
private static Result getDocRefProto(String document,
81+
String reference,
82+
String testName)
83+
{
84+
Result proto = new Result();
85+
proto.setDocument(document);
86+
proto.setReference(reference);
87+
proto.setTestName(testName);
88+
return proto;
89+
}
90+
8091
/**
8192
* <p>main.</p>
8293
*
@@ -225,6 +236,10 @@ public X509Certificate[] getAcceptedIssuers() {
225236
}
226237
}
227238

239+
Result extraQueryParam =
240+
getDocRefProto("draft-ietf-weirds-using-http-08", "4.2",
241+
"common.extra-query-parameter");
242+
228243
ObjectClass ocIp = s.getObjectClass("ip");
229244
if ((ocIp != null) && (ocIp.isSupported())) {
230245
tests.add(new net.apnic.rdap.conformance.test.ip.BadRequest());
@@ -236,7 +251,7 @@ public X509Certificate[] getAcceptedIssuers() {
236251
for (String e : notExists) {
237252
tests.add(new net.apnic.rdap.conformance.test.common.NotFound(
238253
"/ip/" + e
239-
));
254+
));
240255
}
241256
List<String> redirects = ocIp.getRedirects();
242257
for (String e : redirects) {
@@ -260,7 +275,8 @@ public X509Certificate[] getAcceptedIssuers() {
260275
HttpStatus.SC_BAD_REQUEST,
261276
"/ip/1.2.3.4?asdf=zxcv",
262277
"ip.extra-query-parameter",
263-
true
278+
true,
279+
extraQueryParam
264280
));
265281
}
266282

@@ -277,7 +293,7 @@ public X509Certificate[] getAcceptedIssuers() {
277293
for (String e : notExists) {
278294
tests.add(new net.apnic.rdap.conformance.test.common.NotFound(
279295
"/autnum/" + e
280-
));
296+
));
281297
}
282298
ObjectTest std =
283299
new net.apnic.rdap.conformance.test.autnum.Standard();
@@ -295,7 +311,8 @@ public X509Certificate[] getAcceptedIssuers() {
295311
HttpStatus.SC_BAD_REQUEST,
296312
"/autnum/1234?asdf=zxcv",
297313
"autnum.extra-query-parameter",
298-
true
314+
true,
315+
extraQueryParam
299316
));
300317
}
301318

@@ -314,7 +331,7 @@ public X509Certificate[] getAcceptedIssuers() {
314331
for (String e : notExists) {
315332
tests.add(new net.apnic.rdap.conformance.test.common.NotFound(
316333
"/nameserver/" + e
317-
));
334+
));
318335
}
319336
ObjectTest std =
320337
new net.apnic.rdap.conformance.test.nameserver.Standard();
@@ -333,7 +350,8 @@ public X509Certificate[] getAcceptedIssuers() {
333350
HttpStatus.SC_BAD_REQUEST,
334351
"/nameserver/example.com?asdf=zxcv",
335352
"nameserver.extra-query-parameter",
336-
true
353+
true,
354+
extraQueryParam
337355
)
338356
);
339357
runSearchTests(
@@ -362,19 +380,26 @@ public X509Certificate[] getAcceptedIssuers() {
362380
}
363381
/* That the entity handle happens to be an IP address should
364382
not cause a 400 to be returned. */
365-
tests.add(new net.apnic.rdap.conformance.test.common.BasicRequest(
366-
HttpStatus.SC_BAD_REQUEST,
367-
"/entity/1.2.3.4",
368-
"entity.not-bad-request",
369-
true
370-
));
383+
tests.add(
384+
new net.apnic.rdap.conformance.test.common.BasicRequest(
385+
HttpStatus.SC_BAD_REQUEST,
386+
"/entity/1.2.3.4",
387+
null,
388+
true,
389+
getDocRefProto("draft-ietf-weirds-rdap-query-10", "3.1.5",
390+
"entity.not-bad-request")
391+
)
392+
);
371393
/* Extra query parameter. */
372-
tests.add(new net.apnic.rdap.conformance.test.common.BasicRequest(
373-
HttpStatus.SC_BAD_REQUEST,
374-
"/entity/asdf?asdf=zxcv",
375-
"entity.extra-query-parameter",
376-
true
377-
));
394+
tests.add(
395+
new net.apnic.rdap.conformance.test.common.BasicRequest(
396+
HttpStatus.SC_BAD_REQUEST,
397+
"/entity/asdf?asdf=zxcv",
398+
"entity.extra-query-parameter",
399+
true,
400+
extraQueryParam
401+
)
402+
);
378403
runSearchTests(
379404
tests,
380405
ocEn,
@@ -413,26 +438,37 @@ public X509Certificate[] getAcceptedIssuers() {
413438
}
414439
/* Number registries should not return 400 on forward
415440
* domains. */
416-
tests.add(new net.apnic.rdap.conformance.test.common.BasicRequest(
417-
HttpStatus.SC_BAD_REQUEST,
418-
"/domain/example.com",
419-
"domain.not-bad-request",
420-
true
421-
));
441+
tests.add(
442+
new net.apnic.rdap.conformance.test.common.BasicRequest(
443+
HttpStatus.SC_BAD_REQUEST,
444+
"/domain/example.com",
445+
null,
446+
true,
447+
getDocRefProto("draft-ietf-weirds-rdap-query-10", "3.1.3",
448+
"domain.not-bad-request")
449+
)
450+
);
422451
/* As above, but for name registries and reverse domains. */
423-
tests.add(new net.apnic.rdap.conformance.test.common.BasicRequest(
424-
HttpStatus.SC_BAD_REQUEST,
425-
"/domain/202.in-addr.arpa",
426-
"domain.not-bad-request",
427-
true
428-
));
452+
tests.add(
453+
new net.apnic.rdap.conformance.test.common.BasicRequest(
454+
HttpStatus.SC_BAD_REQUEST,
455+
"/domain/202.in-addr.arpa",
456+
null,
457+
true,
458+
getDocRefProto("draft-ietf-weirds-rdap-query-10", "3.1.3",
459+
"domain.not-bad-request")
460+
)
461+
);
429462
/* Extra query parameter. */
430-
tests.add(new net.apnic.rdap.conformance.test.common.BasicRequest(
431-
HttpStatus.SC_BAD_REQUEST,
432-
"/domain/example.com?asdf=zxcv",
433-
"domain.extra-query-parameter",
434-
true
435-
));
463+
tests.add(
464+
new net.apnic.rdap.conformance.test.common.BasicRequest(
465+
HttpStatus.SC_BAD_REQUEST,
466+
"/domain/example.com?asdf=zxcv",
467+
"domain.extra-query-parameter",
468+
true,
469+
extraQueryParam
470+
)
471+
);
436472
runSearchTests(
437473
tests,
438474
ocDom,

‎src/main/java/net/apnic/rdap/conformance/attributetest/ResultsTruncated.java‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
package net.apnic.rdap.conformance.attributetest;
2+
3+
import java.util.Map;
4+
import java.util.Set;
5+
6+
import com.google.common.collect.Sets;
7+
8+
import net.apnic.rdap.conformance.Result;
9+
import net.apnic.rdap.conformance.Result.Status;
10+
import net.apnic.rdap.conformance.Context;
11+
import net.apnic.rdap.conformance.Utils;
12+
import net.apnic.rdap.conformance.AttributeTest;
13+
import net.apnic.rdap.conformance.valuetest.BooleanValue;
14+
15+
/**
16+
* <p>ResultsTruncated class.</p>
17+
*
18+
* @author Tom Harrison <[email protected]>
19+
* @version 0.2
20+
*/
21+
public final class ResultsTruncated implements AttributeTest {
22+
/**
23+
* <p>Constructor for ResultsTruncated.</p>
24+
*/
25+
public ResultsTruncated() { }
26+
27+
/** {@inheritDoc} */
28+
public boolean run(final Context context, final Result proto,
29+
final Map<String, Object> data) {
30+
Result nr = new Result(proto);
31+
nr.setCode("content");
32+
nr.setDocument("draft-ietf-weirds-json-response-07");
33+
nr.setReference("10");
34+
35+
Object rt = Utils.getAttribute(context, nr,
36+
"resultsTruncated",
37+
Status.Notification,
38+
data);
39+
if (rt == null) {
40+
return false;
41+
}
42+
43+
nr.addNode("resultsTruncated");
44+
return new BooleanValue().run(context, nr, rt);
45+
}
46+
47+
/**
48+
* <p>getKnownAttributes.</p>
49+
*
50+
* @return a {@link java.util.Set} object.
51+
*/
52+
public Set<String> getKnownAttributes() {
53+
return Sets.newHashSet("resultsTruncated");
54+
}
55+
}

‎src/main/java/net/apnic/rdap/conformance/test/autnum/BadRequest.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.apnic.rdap.conformance.Context;
44
import net.apnic.rdap.conformance.Test;
5+
import net.apnic.rdap.conformance.Result;
56
import net.apnic.rdap.conformance.test.common.BasicRequest;
67
import org.apache.http.HttpStatus;
78

@@ -18,11 +19,16 @@ public final class BadRequest implements Test {
1819
* <p>Constructor for BadRequest.</p>
1920
*/
2021
public BadRequest() {
22+
Result proto = new Result();
23+
proto.setDocument("draft-ietf-weirds-rdap-query-10");
24+
proto.setReference("3.1.2");
25+
proto.setTestName("autnum.bad-request");
2126
cbr = new BasicRequest(
2227
HttpStatus.SC_BAD_REQUEST,
2328
"/autnum/...",
24-
"autnum.bad-request",
25-
false
29+
null,
30+
false,
31+
proto
2632
);
2733
}
2834

‎src/main/java/net/apnic/rdap/conformance/test/common/Redirect.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ public boolean run(final Context context) {
7373

7474
Result proto = new Result(Status.Notification, path,
7575
testName,
76-
"", "", "", "");
76+
"", "",
77+
"draft-ietf-weirds-using-http-08",
78+
"5.2");
7779
Result r = new Result(proto);
7880
r.setCode("response");
7981

‎src/main/java/net/apnic/rdap/conformance/test/common/Search.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import net.apnic.rdap.conformance.attributetest.ArrayAttribute;
1515
import net.apnic.rdap.conformance.attributetest.ScalarAttribute;
1616
import net.apnic.rdap.conformance.attributetest.StandardResponse;
17-
import net.apnic.rdap.conformance.valuetest.BooleanValue;
17+
import net.apnic.rdap.conformance.attributetest.ResultsTruncated;
1818
import net.apnic.rdap.conformance.Utils;
1919

2020
/**
@@ -74,7 +74,9 @@ public boolean run(final Context context) {
7474

7575
Result proto = new Result(Status.Notification, path,
7676
testName,
77-
"", "", "", "");
77+
"", "",
78+
"draft-ietf-weirds-json-response-07",
79+
"9");
7880
Result r = new Result(proto);
7981
r.setCode("response");
8082

@@ -93,8 +95,7 @@ public boolean run(final Context context) {
9395
context, proto, root, knownAttributes, true,
9496
Arrays.asList(
9597
new ArrayAttribute(searchTest, searchResultsKey),
96-
new ScalarAttribute("resultsTruncated",
97-
new BooleanValue()),
98+
new ResultsTruncated(),
9899
new StandardResponse()
99100
)
100101
);

‎src/main/java/net/apnic/rdap/conformance/test/domain/BadRequest.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.apnic.rdap.conformance.Context;
44
import net.apnic.rdap.conformance.Test;
5+
import net.apnic.rdap.conformance.Result;
56
import net.apnic.rdap.conformance.test.common.BasicRequest;
67
import org.apache.http.HttpStatus;
78

@@ -18,11 +19,16 @@ public final class BadRequest implements Test {
1819
* <p>Constructor for BadRequest.</p>
1920
*/
2021
public BadRequest() {
22+
Result proto = new Result();
23+
proto.setDocument("draft-ietf-weirds-rdap-query-10");
24+
proto.setReference("3.1.3");
25+
proto.setTestName("domain.bad-request");
2126
cbr = new BasicRequest(
2227
HttpStatus.SC_BAD_REQUEST,
2328
"/domain/...",
24-
"domain.bad-request",
25-
false
29+
null,
30+
false,
31+
proto
2632
);
2733
}
2834

‎src/main/java/net/apnic/rdap/conformance/test/ip/BadRequest.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.apnic.rdap.conformance.Context;
44
import net.apnic.rdap.conformance.Test;
5+
import net.apnic.rdap.conformance.Result;
56
import net.apnic.rdap.conformance.test.common.BasicRequest;
67
import org.apache.http.HttpStatus;
78

@@ -18,11 +19,16 @@ public class BadRequest implements Test {
1819
* <p>Constructor for BadRequest.</p>
1920
*/
2021
public BadRequest() {
22+
Result proto = new Result();
23+
proto.setDocument("draft-ietf-weirds-rdap-query-10");
24+
proto.setReference("3.1.1");
25+
proto.setTestName("ip.bad-request");
2126
cbr = new BasicRequest(
2227
HttpStatus.SC_BAD_REQUEST,
2328
"/ip/...",
24-
"ip.bad-request",
25-
false
29+
null,
30+
false,
31+
proto
2632
);
2733
}
2834

‎src/main/java/net/apnic/rdap/conformance/test/nameserver/BadRequest.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.apnic.rdap.conformance.Context;
44
import net.apnic.rdap.conformance.Test;
5+
import net.apnic.rdap.conformance.Result;
56
import net.apnic.rdap.conformance.test.common.BasicRequest;
67
import org.apache.http.HttpStatus;
78

@@ -18,11 +19,16 @@ public final class BadRequest implements Test {
1819
* <p>Constructor for BadRequest.</p>
1920
*/
2021
public BadRequest() {
22+
Result proto = new Result();
23+
proto.setDocument("draft-ietf-weirds-rdap-query-10");
24+
proto.setReference("3.1.4");
25+
proto.setTestName("nameserver.bad-request");
2126
cbr = new BasicRequest(
2227
HttpStatus.SC_BAD_REQUEST,
2328
"/nameserver/...",
24-
"nameserver.bad-request",
25-
false
29+
null,
30+
false,
31+
proto
2632
);
2733
}
2834

0 commit comments

Comments
 (0)