Add other tests

Hyperfoil · Apr 10, 2024 · 5e9e17a · 5e9e17a
1 parent 2aa637c
commit 5e9e17a
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 15 deletions.
diff --git a/horreum-backend/src/main/resources/application.properties b/horreum-backend/src/main/resources/application.properties
@@ -86,9 +86,9 @@ horreum.test-mode=false
 #quarkus.native.additional-build-args=
 
 # thread pool sizes
-smallrye.messaging.worker.horreum.dataset.pool.max-concurrency=10
-smallrye.messaging.worker.horreum.run.pool.max-concurrency=10
-smallrye.messaging.worker.horreum.schema.pool.max-concurrency=10
+smallrye.messaging.worker.horreum.dataset.pool.max-concurrency=7
+smallrye.messaging.worker.horreum.run.pool.max-concurrency=7
+smallrye.messaging.worker.horreum.schema.pool.max-concurrency=7
 
 
 hibernate.jdbc.time_zone=UTC

diff --git a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/SchemaServiceTest.java b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/SchemaServiceTest.java
@@ -31,6 +31,7 @@
 import io.quarkus.test.oidc.server.OidcWiremockTestResource;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.inject.Inject;
+import jakarta.persistence.Tuple;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.TestInfo;
 
@@ -281,7 +282,7 @@ public void testFindUsages() throws InterruptedException  {
    }
 
    @org.junit.jupiter.api.Test
-   public void testCreateSchemaAfterRun() throws InterruptedException {
+   public void testCreateSchemaAfterRunWithArrayData() throws InterruptedException {
       String schemaUri = "urn:unknown:schema";
       Test test = createTest(createExampleTest("dummy-test"));
 
@@ -295,7 +296,6 @@ public void testCreateSchemaAfterRun() throws InterruptedException {
       assertEquals(0, em.createNativeQuery("SELECT COUNT(*)::::int FROM run_validationerrors").getSingleResult());
       assertEquals(0, em.createNativeQuery("SELECT COUNT(*)::::int FROM dataset_validationerrors").getSingleResult());
 
-
       List<?> runSchemasBefore = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1").setParameter(1, runId).getResultList();
       assertEquals(0, runSchemasBefore.size());
 
@@ -307,14 +307,83 @@ public void testCreateSchemaAfterRun() throws InterruptedException {
       TestUtil.eventually(() -> {
          Util.withTx(tm, () -> {
             em.clear();
-            List<?>  runSchemas = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1").setParameter(1, runId).getResultList();
+            List<?> runSchemas = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1").setParameter(1, runId).getResultList();
             // two records as the run is an array of two objects, both referencing the same schema
             assertEquals(2, runSchemas.size());
             return null;
          });
       });
    }
 
+   @org.junit.jupiter.api.Test
+   public void testCreateSchemaAfterRunWithMultipleSchemas() throws InterruptedException {
+      String firstSchemaUri = "urn:unknown1:schema";
+      String secondSchemaUri = "urn:unknown2:schema";
+      Test test = createTest(createExampleTest("dummy-test"));
+
+      ArrayNode data = JsonNodeFactory.instance.arrayNode();
+      data.addObject().put("$schema", firstSchemaUri).put("foo", "bar");
+      data.addObject().put("$schema", secondSchemaUri).put("foo", "zip");
+      int runId = uploadRun(data.toString(), test.name);
+      assertTrue(runId > 0);
+
+      // no validation errors
+      assertEquals(0, em.createNativeQuery("SELECT COUNT(*)::::int FROM run_validationerrors").getSingleResult());
+      assertEquals(0, em.createNativeQuery("SELECT COUNT(*)::::int FROM dataset_validationerrors").getSingleResult());
+
+      List<?> runSchemasBefore = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1").setParameter(1, runId).getResultList();
+      assertEquals(0, runSchemasBefore.size());
+
+      // create the schema 1 afterward
+      Schema schema1 = createSchema("Unknown schema 1", firstSchemaUri);
+      assertNotNull(schema1);
+      assertTrue(schema1.id > 0);
+
+      TestUtil.eventually(() -> {
+         Util.withTx(tm, () -> {
+            em.clear();
+            List<Tuple> runSchemas = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1", Tuple.class).setParameter(1, runId).getResultList();
+            // 1 record as the run is an array of two objects referencing different schemas and only the first one is created
+            assertEquals(1, runSchemas.size());
+            assertEquals(schema1.id, (int)runSchemas.get(0).get(3));
+            return null;
+         });
+      });
+   }
+
+   @org.junit.jupiter.api.Test
+   public void testCreateSchemaAfterRunWithObjectData() throws InterruptedException {
+      String schemaUri = "urn:unknown:schema";
+      Test test = createTest(createExampleTest("dummy-test"));
+
+      ObjectNode data = JsonNodeFactory.instance.objectNode();
+      data.put("$schema", schemaUri).put("foo", "bar");
+      int runId = uploadRun(data.toString(), test.name);
+      assertTrue(runId > 0);
+
+      // no validation errors
+      assertEquals(0, em.createNativeQuery("SELECT COUNT(*)::::int FROM run_validationerrors").getSingleResult());
+      assertEquals(0, em.createNativeQuery("SELECT COUNT(*)::::int FROM dataset_validationerrors").getSingleResult());
+
+      List<?> runSchemasBefore = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1").setParameter(1, runId).getResultList();
+      assertEquals(0, runSchemasBefore.size());
+
+      // create the schema afterward
+      Schema schema = createSchema("Unknown schema", schemaUri);
+      assertNotNull(schema);
+      assertTrue(schema.id > 0);
+
+      TestUtil.eventually(() -> {
+         Util.withTx(tm, () -> {
+            em.clear();
+            List<?> runSchemas = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1").setParameter(1, runId).getResultList();
+            // run has single object data, thus referencing one schema
+            assertEquals(1, runSchemas.size());
+            return null;
+         });
+      });
+   }
+
    @org.junit.jupiter.api.Test
    public void testChangeUriForReferencedSchema() throws InterruptedException {
       String schemaUri = "urn:dummy:schema";
@@ -343,14 +412,7 @@ public void testChangeUriForReferencedSchema() throws InterruptedException {
       assertNotNull(updatedSchema);
       assertEquals(schema.id, updatedSchema.id);
 
-      TestUtil.eventually(() -> {
-         Util.withTx(tm, () -> {
-            em.clear();
-            List<?>  runSchemas = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1").setParameter(1, runId).getResultList();
-            // two records as the run is an array of two objects, both referencing the same schema
-            assertEquals(0, runSchemas.size());
-            return null;
-         });
-      });
+      List<?> runSchemasAfter = em.createNativeQuery("SELECT * FROM run_schemas WHERE runid = ?1").setParameter(1, runId).getResultList();
+      assertEquals(0, runSchemasAfter.size());
    }
 }