fixes Hyperfoil#651

stalep · Sep 18, 2023 · cd04d82 · cd04d82
1 parent 8b5447d
commit cd04d82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ExperimentServiceImpl.java b/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ExperimentServiceImpl.java
@@ -218,8 +218,7 @@ private void runExperiments(DataSet.Info info, Consumer<ExperimentResult> result
             .unwrap(NativeQuery.class)
             .addScalar("profile_id", StandardBasicTypes.INTEGER)
             .addScalar("baseline_filter", StandardBasicTypes.TEXT)
-            .addScalar("value", StandardBasicTypes.TEXT)
-              //.addScalar("value", JsonNodeBinaryType.INSTANCE)
+            .addScalar("value", JsonBinaryType.INSTANCE)
             .addScalar("dataset_id", StandardBasicTypes.INTEGER)
             .getResultList();
 
@@ -284,8 +283,7 @@ private void runExperiments(DataSet.Info info, Consumer<ExperimentResult> result
                "LEFT JOIN label_values lv ON label.id = lv.label_id WHERE ep.id = ?1 AND lv.dataset_id = ?2")
                .setParameter(1, profile.id).setParameter(2, info.id)
                .unwrap(NativeQuery.class)
-               .addScalar("value", StandardBasicTypes.TEXT)
-                 //.addScalar("value", JsonNodeBinaryType.INSTANCE)
+               .addScalar("value", JsonBinaryType.INSTANCE)
                .getSingleResult();
          Hibernate.initialize(profile.test.name);
          resultConsumer.accept(new ExperimentResult(ExperimentProfileMapper.from(profile),

diff --git a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/RunServiceTest.java b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/RunServiceTest.java
@@ -38,6 +38,7 @@
 import io.hyperfoil.tools.horreum.api.data.Extractor;
 import io.hyperfoil.tools.horreum.entity.data.*;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.TestInfo;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -715,7 +716,7 @@ public void testJavascriptExecution() throws InterruptedException {
       Assertions.assertEquals("foobar", preview.value.textValue());
    }
 
-   /*
+   @Disabled
    @org.junit.jupiter.api.Test
    public void runExperiment() throws InterruptedException {
       Test test = createExampleTest("supersecret");
@@ -858,8 +859,6 @@ public void runExperiment() throws InterruptedException {
       }
    }
 
-    */
-
    private JsonNode getBySchema(JsonNode data, String schema) {
       JsonNode foo = StreamSupport.stream(data.spliterator(), false)
             .filter(item -> schema.equals(item.path("$schema").asText())).findFirst().orElse(null);