From b0ad786c45e3e21ae7935cae4c2d8cfba9807253 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 16 Sep 2021 09:50:44 +0200
Subject: [PATCH] tests for instructions

---
 .../impl/SEBClientInstructionServiceImpl.java |  1 -
 .../SEBClientInstructionServiceTest.java      | 86 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/SEBClientInstructionServiceTest.java

diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientInstructionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientInstructionServiceImpl.java
index ef061cf4..90e6d941 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientInstructionServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientInstructionServiceImpl.java
@@ -158,7 +158,6 @@ public class SEBClientInstructionServiceImpl implements SEBClientInstructionServ
                     .filter(Objects::nonNull)
                     .forEach(this::putToCache);
         });
-
     }
 
     @Override
diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/SEBClientInstructionServiceTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/SEBClientInstructionServiceTest.java
new file mode 100644
index 00000000..fc7d820d
--- /dev/null
+++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/SEBClientInstructionServiceTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2021 ETH Zürich, Educational Development and Technology (LET)
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+package ch.ethz.seb.sebserver.webservice.integration.services;
+
+import static org.junit.Assert.*;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.jdbc.Sql;
+
+import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection;
+import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus;
+import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction.InstructionType;
+import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ClientInstructionRecord;
+import ch.ethz.seb.sebserver.webservice.integration.api.admin.AdministrationAPIIntegrationTester;
+import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientConnectionDAO;
+import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientInstructionDAO;
+import ch.ethz.seb.sebserver.webservice.servicelayer.session.SEBClientInstructionService;
+
+@Sql(scripts = { "classpath:schema-test.sql", "classpath:data-test.sql", "classpath:data-test-additional.sql" })
+public class SEBClientInstructionServiceTest extends AdministrationAPIIntegrationTester {
+
+    @Autowired
+    private SEBClientInstructionService sebClientInstructionService;
+    @Autowired
+    private ClientConnectionDAO clientConnectionDAO;
+    @Autowired
+    private ClientInstructionDAO clientInstructionDAO;
+
+    @Before
+    public void initSEBConnection() {
+        this.clientConnectionDAO.createNew(new ClientConnection(
+                null, 1L, 2L, ConnectionStatus.ACTIVE, "testToken", "user1", "0.0.0.0", false, null, null))
+                .getOrThrow();
+    }
+
+    @Test
+    public void testRegister() {
+        // check no instructions in DB
+        Collection<ClientInstructionRecord> all = this.clientInstructionDAO
+                .getAllActive()
+                .getOrThrow();
+
+        assertNotNull(all);
+        assertTrue(all.isEmpty());
+
+        // register instruction
+        this.sebClientInstructionService.registerInstruction(2L, InstructionType.SEB_QUIT, Collections.emptyMap(),
+                "testToken", false);
+
+        // check on DB
+        all = this.clientInstructionDAO
+                .getAllActive()
+                .getOrThrow();
+
+        assertNotNull(all);
+        assertFalse(all.isEmpty());
+        final ClientInstructionRecord instrRec = all.iterator().next();
+        assertEquals("testToken", instrRec.getConnectionToken());
+        assertEquals(InstructionType.SEB_QUIT.name(), instrRec.getType());
+        assertEquals("", instrRec.getAttributes());
+
+        // get instruction JSON
+        final String json = this.sebClientInstructionService.getInstructionJSON("testToken");
+        assertEquals("", json);
+
+        // check DB is empty again
+        all = this.clientInstructionDAO
+                .getAllActive()
+                .getOrThrow();
+        assertNotNull(all);
+        assertTrue(all.isEmpty());
+
+    }
+
+}