From 38dba9a09834eabce5aaf36a5f9fe7f666c5f3bd Mon Sep 17 00:00:00 2001
From: Yakup Ensar Evli <54323073+ensarevlideveloper@users.noreply.github.com>
Date: Mon, 31 Jan 2022 11:13:32 +0100
Subject: [PATCH] TSK-1791: Usage of ClassificationService of the new Test-API,
 Insertion of five new classifications before tests as there are no
 classifications available before.

---
 .../ClassificationQueryAccTest.java           | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/taskana-core/src/test/java/acceptance/classification/ClassificationQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/ClassificationQueryAccTest.java
index 2f35c3128..038fc7fdf 100644
--- a/lib/taskana-core/src/test/java/acceptance/classification/ClassificationQueryAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/classification/ClassificationQueryAccTest.java
@@ -1,39 +1,47 @@
 package acceptance.classification;
 
+import static acceptance.DefaultTestEntities.defaultTestClassification;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import acceptance.AbstractAccTest;
 import java.util.List;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import testapi.TaskanaInject;
+import testapi.TaskanaIntegrationTest;
 
 import pro.taskana.classification.api.ClassificationService;
 import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.test.security.JaasExtension;
 import pro.taskana.common.test.security.WithAccessId;
 
 /** Acceptance test for classification queries and authorization. */
-@ExtendWith(JaasExtension.class)
-class ClassificationQueryAccTest extends AbstractAccTest {
+@TaskanaIntegrationTest
+class ClassificationQueryAccTest {
+  @TaskanaInject ClassificationService classificationService;
+
+  @WithAccessId(user = "businessadmin")
+  @BeforeAll
+  void createClassificationsWithDifferentRoles() throws Exception {
+    for (int i = 0; i < 5; i++) {
+      defaultTestClassification().buildAndStoreAsSummary(classificationService);
+    }
+  }
 
   @Test
   void should_FindAllAccesibleClassifications_When_UserNotAuthenticated() {
-    ClassificationService classificationService = taskanaEngine.getClassificationService();
     List<ClassificationSummary> classificationSummaryList =
         classificationService.createClassificationQuery().domainIn("DOMAIN_A").list();
 
-    assertThat(classificationSummaryList).hasSize(18);
+    assertThat(classificationSummaryList).hasSize(5);
   }
 
   @WithAccessId(user = "admin")
   @WithAccessId(user = "businessadmin")
   @TestTemplate
   void should_FindAllAccessibleClassifications_When_UserInRoleAdminOrBusinessadmin() {
-    ClassificationService classificationService = taskanaEngine.getClassificationService();
     List<ClassificationSummary> classificationSummaryList =
         classificationService.createClassificationQuery().domainIn("DOMAIN_A").list();
 
-    assertThat(classificationSummaryList).hasSize(18);
+    assertThat(classificationSummaryList).hasSize(5);
   }
 }