Add registry init to beforeclass (#2982)

* Add registry init to beforeclass

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

* Update to workflow and debug

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

* Increase the port range for Wiremock

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

* Update for different ports in use

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

* Update to remove trace

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

* Remove Multithreaded, getting unreliable build times

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

Author: prb112

.github/workflows/build.yml

@@ -116,7 +116,7 @@ jobs:
         echo "Using profiles ${PROFILES}"
         mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -f fhir-parent --no-transfer-progress -DexcludeReactor=true -Dmaven.wagon.http.retryHandler.count=3
         mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:resolve-plugins -f fhir-parent --no-transfer-progress -DexcludeReactor=true -Dmaven.wagon.http.retryHandler.count=3
-        mvn -B -T2C package --file fhir-parent -P "${PROFILES}" --no-transfer-progress -Dmaven.wagon.httpconnectionManager.ttlSeconds=240 -Dmaven.wagon.http.retryHandler.count=3
+        mvn -B package --file fhir-parent -P "${PROFILES}" --no-transfer-progress -Dmaven.wagon.httpconnectionManager.ttlSeconds=240 -Dmaven.wagon.http.retryHandler.count=3
   e2e-tests:
     runs-on: ubuntu-latest
     if: "!contains(github.event.pull_request.labels.*.name, 'ci-skip')"

.github/workflows/site.yml

@@ -61,7 +61,7 @@ jobs:
             pushd $(pwd)
             cd fhir/docs/
             npm install yarn -g
-            yarn install -g gatsby-cli
+            yarn global add gatsby-cli
             gatsby telemetry --disable
 
             # Install the packages

cql/fhir-cql-rest/src/test/java/com/ibm/fhir/cql/engine/rest/R4RestFHIRTest.java

@@ -12,6 +12,8 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -24,7 +26,6 @@
 import com.github.tomakehurst.wiremock.client.MappingBuilder;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-
 import com.ibm.fhir.client.FHIRClient;
 import com.ibm.fhir.client.FHIRClientFactory;
 import com.ibm.fhir.model.format.Format;
@@ -56,44 +57,57 @@
  * to configure that web container to respond to specific URL patterns
  * with specific responses. The simplest request mapping is for a client
  * to provide a URL and a resource and the container will return that
- * resource in response to a request for that URL. More complex 
+ * resource in response to a request for that URL. More complex
  * URL-building is possible using the Wiremock MappingBuilder class.
- * See Wiremocks documentation for full details. 
+ * See Wiremocks documentation for full details.
  */
 public abstract class R4RestFHIRTest {
-    
+
     public static final String HOSTNAME = "localhost";
-    public static final int PORT = 7070;
+    public static final int PORT = getPort();
 
     protected static WireMockServer wireMockServer;
     protected static WireMock wireMock;
-    
+
+    private static int getPort() {
+        // Finds an available port.
+        int port = 53900;
+        while (port < 54000) {
+            try (ServerSocket ignored = new ServerSocket(port)) {
+                return port;
+            } catch (IOException ex) {
+                port++;
+            }
+        }
+        throw new AssertionError("Unexpected that port range is unavailable");
+    }
+
     @BeforeClass
-    public static void setupServer() {
-        
+    public void setupServer() {
+
         WireMockConfiguration wireMockConfig = WireMockConfiguration.wireMockConfig();
         wireMockConfig.port(PORT);
-        
+
         wireMockServer = new WireMockServer(wireMockConfig);
         wireMockServer.start();
-        
+
         WireMock.configureFor(HOSTNAME, PORT);
         wireMock = new WireMock(HOSTNAME, PORT);
     }
-    
+
     @AfterClass
-    public static void serverShutdown() {
+    public void serverShutdown() {
         wireMockServer.stop();
     }
-    
+
     public static String getHttpHost() {
         return wireMockServer.baseUrl();
     }
 
     public static String getBaseUrl() {
         return wireMockServer.baseUrl();
     }
-    
+
     @BeforeMethod
     public void init() throws InterruptedException {
         WireMock.resetToDefault();
@@ -119,9 +133,9 @@ public static int getHttpPort() {
     public FHIRClient newClient() throws Exception {
         Properties properties = new Properties();
         properties.setProperty(FHIRClient.PROPNAME_BASE_URL, getBaseUrl());
-        properties.setProperty(FHIRClient.PROPNAME_LOGGING_ENABLED, "true");
+        // Logging should be off in CICD
+        properties.setProperty(FHIRClient.PROPNAME_LOGGING_ENABLED, "false");
         FHIRClient client = FHIRClientFactory.getClient(properties);
-
         return client;
     }
 

fhir-profile/src/test/java/com/ibm/fhir/profile/test/BPConstraintGeneratorTest.java

@@ -12,12 +12,21 @@
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
+import org.testng.annotations.BeforeClass;
+
 import com.ibm.fhir.model.annotation.Constraint;
 import com.ibm.fhir.model.resource.StructureDefinition;
 import com.ibm.fhir.profile.ConstraintGenerator;
 import com.ibm.fhir.profile.ProfileSupport;
+import com.ibm.fhir.registry.FHIRRegistry;
 
 public class BPConstraintGeneratorTest {
+    @BeforeClass
+    public void before() {
+        FHIRRegistry.getInstance();
+        FHIRRegistry.init();
+    }
+
     public static void main(String[] args) throws Exception {
         Logger logger = Logger.getLogger(ConstraintGenerator.class.getName());
         logger.setLevel(Level.FINEST);

fhir-profile/src/test/java/com/ibm/fhir/profile/test/ConstraintGeneratorTest.java

@@ -42,6 +42,7 @@
 import com.ibm.fhir.profile.ConstraintGenerator;
 import com.ibm.fhir.profile.ProfileBuilder;
 import com.ibm.fhir.profile.ProfileSupport;
+import com.ibm.fhir.registry.FHIRRegistry;
 
 public class ConstraintGeneratorTest {
     // maintain a strong reference to the logger configured for these unit tests
@@ -52,6 +53,12 @@ public void beforeClass() {
         configureLogging();
     }
 
+    @BeforeClass
+    public void before() {
+        FHIRRegistry.getInstance();
+        FHIRRegistry.init();
+    }
+
     @Test
     public static void testConstraintGenerator1() throws Exception {
         StructureDefinition profile = new ProfileBuilder(Organization.class, "http://ibm.com/fhir/StructureDefinition/TestOrganization", "1.0.0")