Merge pull request #38 from netceteragroup/enable-health-test

[22] Re-enable health test
netceteragroup · Mar 3, 2023 · e5b4618 · e5b4618
2 parents 7b9e730 + eb06f22
commit e5b4618
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 2 deletions.
diff --git a/girders-demos/girders-demo-test/pom.xml b/girders-demos/girders-demo-test/pom.xml
@@ -161,6 +161,12 @@
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>com.unboundid</groupId>
+      <artifactId>unboundid-ldapsdk</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/.../girders-demo-test/src/test/java/com/netcetera/girders/demo/test/actuator/HealthTest.java b/.../girders-demo-test/src/test/java/com/netcetera/girders/demo/test/actuator/HealthTest.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.netcetera.girders.demo.test.TestConfiguration;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +10,7 @@
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Import;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.client.RestTemplate;
 
@@ -25,6 +25,7 @@
     properties = "girders.crypto.text=disabled")
 @Import(TestConfiguration.class)
 @ExtendWith(SpringExtension.class)
+@ActiveProfiles("health-test")
 class HealthTest {
 
   @Autowired
@@ -35,7 +36,6 @@ class HealthTest {
   private int port;
 
   @Test
-  @Disabled
   void testHealth() {
     String url = "http://localhost:" + port + "/demo-showcase/actuator/health";
     JsonNode result = client.getForObject(url, JsonNode.class);

diff --git a/girders-demos/girders-demo-test/src/test/resources/application-health-test.yml b/girders-demos/girders-demo-test/src/test/resources/application-health-test.yml
@@ -0,0 +1,13 @@
+spring.ldap:
+  urls: ldap://localhost:8389
+  base: dc=netcetera,dc=com
+  username: uid=admin
+  password: secret
+
+spring.ldap.embedded:
+  ldif: classpath:ldap-test.ldif
+  base-dn: ${spring.ldap.base}
+  port: 8389
+  credential.username: uid=admin
+  credential.password: secret
+  validation.enabled: false
diff --git a/girders-demos/girders-demo-test/src/test/resources/ldap-test.ldif b/girders-demos/girders-demo-test/src/test/resources/ldap-test.ldif
@@ -0,0 +1,30 @@
+dn: dc=netcetera,dc=com
+objectclass: top
+objectclass: domain
+objectclass: extensibleObject
+dc: netcetera
+
+# Organizational Units
+dn: ou=people,dc=netcetera,dc=com
+objectclass: top
+objectclass: organizationalUnit
+ou: people
+
+# Create People
+dn: uid=shelby,ou=people,dc=netcetera,dc=com
+objectclass: top
+objectclass: account
+cn: Thomas
+sn: Shelby
+uid: shelby
+mail: thomas.shelby@sth.com
+employeeType: ncg-employee
+
+dn: uid=john,ou=people,dc=netcetera,dc=com
+objectclass: top
+objectclass: account
+cn: John
+sn: Smith
+uid: john
+mail: john.smith@sth.com
+employeeType: ncg-employee