From a3d98b172f47a6ad84724175f105496530a5f393 Mon Sep 17 00:00:00 2001
From: Bobby Sharp <bsharp@ebsco.com>
Date: Tue, 10 Dec 2024 14:27:14 -0500
Subject: [PATCH] More cleanup

---
 .../folio/fqm/repository/IdStreamerTest.java   |  9 ++++-----
 .../entity-types/entity_type-01.json5          | 18 ++++++------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/test/java/org/folio/fqm/repository/IdStreamerTest.java b/src/test/java/org/folio/fqm/repository/IdStreamerTest.java
index 5ca79171..98ee3aff 100644
--- a/src/test/java/org/folio/fqm/repository/IdStreamerTest.java
+++ b/src/test/java/org/folio/fqm/repository/IdStreamerTest.java
@@ -35,15 +35,14 @@
 import org.jooq.SelectSelectStep;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
-//@RunWith(MockitoJUnitRunner.class)
-@ExtendWith(MockitoExtension.class)
+@RunWith(MockitoJUnitRunner.class)
 @ActiveProfiles("db-test")
 @SpringBootTest
 class IdStreamerTest {
@@ -239,7 +238,7 @@ void shouldThrowExceptionWhenMaxQuerySizeExceeded() {
 
   @Test
   void shouldCancelQuery() {
-    // Horrible mocks because our test DSL doesn't behave nicely in separate threads
+    // This test uses a mocked DSLContext because our test DSLContext doesn't behave nicely in separate threads
     DSLContext mockJooqContext = mock(DSLContext.class);
     SelectSelectStep mockSelectStep = mock(SelectSelectStep.class);
     SelectJoinStep mockJoinStep = mock(SelectJoinStep.class);
diff --git a/src/test/resources/entity-types/entity_type-01.json5 b/src/test/resources/entity-types/entity_type-01.json5
index 36fb3e7e..b2ebbd90 100644
--- a/src/test/resources/entity-types/entity_type-01.json5
+++ b/src/test/resources/entity-types/entity_type-01.json5
@@ -1,7 +1,7 @@
 {
   id: '0cb79a4c-f7eb-4941-a104-745224ae0291',
-  name: 'entity_type_01',
-  labelAlias: 'entity_type_01',
+  name: 'entity_type-01',
+  labelAlias: 'entity_type-01',
   private: false,
   columns: [
     {
@@ -13,15 +13,15 @@
       visibleByDefault: false,
     },
     {
-      name: 'column_01',
+      name: 'column-01',
       dataType: {
-        dataType: 'stringType',
+        dataType: 'rangedUUIDType',
       },
       labelAlias: 'Column 1',
       visibleByDefault: false,
     },
     {
-      name: 'column_02',
+      name: 'column-02',
       dataType: {
         dataType: 'stringType',
       },
@@ -31,14 +31,8 @@
   ],
   defaultSort: [
     {
-      columnName: 'column_01',
+      columnName: 'column-01',
       direction: 'ASC',
     },
   ],
-  sources: [
-    {
-      type: 'db',
-      alias: 'source_1',
-    }
-  ]
 }