Merge pull request #36 from tlmiller/SCRUM-3593

Scrum 3593

Author: tlmiller

Dockerfile

@@ -25,8 +25,10 @@ RUN cd /build && \
 
 WORKDIR /app
 RUN useradd -MrU conformance && \
-    chown -R conformance /app
+    mkdir -p /rdap-config && \
+    chown -R conformance /app && \
+    chown -R conformance /rdap-config
 
 EXPOSE 8080
 USER conformance
-ENTRYPOINT ["/app/entrypoint.sh", "rdap-configuration.json"]
+ENTRYPOINT ["/app/entrypoint.sh", "/rdap-config/rdap-configuration.json"]

README.md

@@ -154,7 +154,7 @@ docker build -t apnic/rdap-conformance .
 To run the Docker container:
 
 ```
-docker run -d -v "{configuration-path}:/app/rdap-configuration.json" \
+docker run -d -v "{configuration-path}:/rdap-config/rdap-configuration.json" \
            --name rdap-conformance apnic/rdap-conformance
 ```
 

pom.xml

@@ -6,7 +6,7 @@
     <groupId>net.apnic.rdap</groupId>
     <artifactId>rdap-conformance</artifactId>
     <packaging>jar</packaging>
-    <version>0.4</version>
+    <version>0.5</version>
     <name>rdap-conformance</name>
     <description>RDAP conformance</description>
     <inceptionYear>2014</inceptionYear>

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

@@ -88,7 +88,7 @@ private static String getJarName() {
         return jarName;
     }
 
-    private static void addSearchTests(final TestAggregate tests,
+    private static void addSearchTests(final List<Test> tests,
                                        final ObjectClass oc,
                                        final SearchTest st,
                                        final String prefix,
@@ -146,7 +146,7 @@ private static Result getDocRefProto(final String document,
     }
 
     private static void addNonRdapTests(final Context c,
-                                        final TestAggregate tests) {
+                                        final List<Test> tests) {
         /* Relative URI in the HTTP request. */
         Result relative = new Result();
         relative.setTestName("common.bad-uri-relative");
@@ -185,7 +185,7 @@ private static void addNonRdapTests(final Context c,
     }
 
     private static void addUnsupportedQueryTypeTests(final Specification s,
-                                                     final TestAggregate tests) {
+                                                     final List<Test> tests) {
         /* Previously, this required that the server return a 400 (Bad
          * Request) for unsupported queries, as per using-http [5.4].
          * However, rdap-query now states that for documented query
@@ -212,7 +212,7 @@ private static void addUnsupportedQueryTypeTests(final Specification s,
     }
 
     private static void addIpTests(final Specification s,
-                                   final TestAggregate tests) {
+                                   final List<Test> tests) {
         ObjectClass ocIp = s.getObjectClass("ip");
         if ((ocIp == null) || !ocIp.isSupported()) {
             return;
@@ -260,7 +260,7 @@ private static void addIpTests(final Specification s,
     }
 
     private static void addAutnumTests(final Specification s,
-                                       final TestAggregate tests) {
+                                       final List<Test> tests) {
         ObjectClass ocAn = s.getObjectClass("autnum");
         if ((ocAn == null) || !ocAn.isSupported()) {
             return;
@@ -297,7 +297,7 @@ private static void addAutnumTests(final Specification s,
     }
 
     private static void addNameserverTests(final Specification s,
-                                           final TestAggregate tests)
+                                           final List<Test> tests)
             throws Exception {
         ObjectClass ocNs = s.getObjectClass("nameserver");
         if ((ocNs == null) || !ocNs.isSupported()) {
@@ -348,7 +348,7 @@ private static void addNameserverTests(final Specification s,
     }
 
     private static void addEntityTests(final Specification s,
-                                       final TestAggregate tests)
+                                       final List<Test> tests)
             throws Exception {
         ObjectClass ocEn = s.getObjectClass("entity");
         if ((ocEn == null) || !ocEn.isSupported()) {
@@ -399,7 +399,7 @@ private static void addEntityTests(final Specification s,
     }
 
     private static void addDomainTests(final Specification s,
-                                       final TestAggregate tests)
+                                       final List<Test> tests)
             throws Exception {
         ObjectClass ocDom = s.getObjectClass("domain");
         if ((ocDom == null) || !ocDom.isSupported()) {
@@ -540,7 +540,7 @@ public static void main(final String[] args) throws Exception {
                 ? RateLimiter.create(spec.getRequestsPerSecond())
                 : null;
 
-        TestAggregate tests = new TestAggregate();
+        List<Test> tests = new ArrayList<Test>();
 
         /* For now, the non-RDAP-specific tests are disabled. These
          * are fairly niche, and in many cases can't easily be fixed
@@ -577,10 +577,12 @@ public static void main(final String[] args) throws Exception {
         final ExecutorService executorService =
             Executors.newFixedThreadPool(Runtime.getRuntime()
                                                 .availableProcessors());
+        ContextList contexts = new ContextList();
         for (final Test t : tests) {
             final Context context =
                 createContext(spec, rateLimiter, executorService, testsRunning);
             context.submitTest(t);
+            contexts.add(context);
         }
 
         /* application/json content-type. This is deliberately using
@@ -602,6 +604,7 @@ public static void main(final String[] args) throws Exception {
             createContext(spec, rateLimiter, executorService, testsRunning);
         context.setContentType("application/json");
         context.submitTest(test);
+        contexts.add(context);
 
         while (true) {
             if (testsRunning.get() != 0) {
@@ -616,7 +619,7 @@ public static void main(final String[] args) throws Exception {
 
         executorService.shutdown();
 
-        if(tests.hasFailure()) {
+        if(contexts.hasFailedResult()) {
             System.exit(EX_FAILURE);
         }
     }

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

@@ -135,6 +135,22 @@ public Specification getSpecification() {
         return specification;
     }
 
+    /**
+     * <p>Indicates if a failed result is present in this context</p>
+     *
+     * @return True of false if this context has a failed result
+     */
+    public boolean hasFailedResult()
+    {
+        for(Result res: results)
+        {
+            if(res.isStatus(Result.Status.Failure)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * <p>Setter for the field <code>specification</code>.</p>
      *
@@ -249,7 +265,6 @@ public void onSuccess(final HttpResponse httpResponse) {
                                     testsRunning.getAndDecrement();
                                 }
                                 public void onFailure(final Throwable t) {
-                                    System.out.println("**********");
                                     test.setError(t);
                                     test.run();
                                     synchronized (System.out) {

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

@@ -0,0 +1,33 @@
+package net.apnic.rdap.conformance;
+
+import java.util.ArrayList;
+
+/**
+ * Represents a list of Context objects.
+ *
+ * Class is a wrapper around {@link java.util.ArrayList} that provides
+ * convenience functions for getting information about a list of Context objects.
+ *
+ * Note: This class does not implement any ArrayList constructors as they are
+ * not needed at present.
+ */
+public class ContextList
+    extends ArrayList<Context>
+{
+    /**
+     * Indiciates if at least one Context object in this list has a failed
+     * result.
+     *
+     * @return boolean if at least one Context has a failed result.
+     */
+    public boolean hasFailedResult()
+    {
+        for(Context context : this)
+        {
+            if(context.hasFailedResult()) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -90,6 +90,18 @@ public Status getStatus() {
         return status;
     }
 
+    /**
+     * True if the supplied status is equal to the internal status of this
+     * result.
+     *
+     * @param checkStatus Status to check against
+     * @return true if the provided status matches the internal status of this
+     *         result
+     */
+    public boolean isStatus(final Status checkStatus) {
+        return status == checkStatus;
+    }
+
     /**
      * <p>Setter for the field <code>status</code>.</p>
      *

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

@@ -34,13 +34,6 @@ public interface Test {
      */
     HttpRequest getRequest();
 
-    /**
-     * <p>isFailure.</p>
-     *
-     * @return boolean indiciator if the test succeeded or passed
-     */
-    boolean hasFailed();
-
     /**
      * <p>setResponse.</p>
      *

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

@@ -34,11 +34,6 @@ public BadRequest() {
         );
     }
 
-    /** {@inheritDoc} */
-    public boolean hasFailed() {
-        return cbr.hasFailed();
-    }
-
     /** {@inheritDoc} */
     public void setContext(final Context c) {
         cbr.setContext(c);