From 8e8e998b28944ed6b2244e88b430ad346a410278 Mon Sep 17 00:00:00 2001
From: "Anders H. Rebner" <anderhre@stud.ntnu.no>
Date: Mon, 16 Mar 2020 16:19:34 +0100
Subject: [PATCH] =?UTF-8?q?#58=20Endret=20test=20til=20=C3=A5=20reflektere?=
 =?UTF-8?q?=20tabellstruktur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soitool/enumerates.py | 2 +-
 test/test_database.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/soitool/enumerates.py b/soitool/enumerates.py
index 14d9938..30940b1 100644
--- a/soitool/enumerates.py
+++ b/soitool/enumerates.py
@@ -13,4 +13,4 @@ class CodebookSort(Enum):
     """Enumerate with ways to sort codebook."""
 
     WORD = 0
-    CODE = 1
\ No newline at end of file
+    CODE = 1
diff --git a/test/test_database.py b/test/test_database.py
index 6609df8..e43cdc2 100644
--- a/test/test_database.py
+++ b/test/test_database.py
@@ -3,6 +3,7 @@ import os
 from pathlib import Path
 import unittest
 import json
+from soitool.enumerates import CodebookSize
 from soitool.database import Database
 from soitool.coder import get_code_length_needed
 
@@ -102,8 +103,8 @@ class DatabaseTest(unittest.TestCase):
         for i, entry in enumerate(expected):
             self.assertEqual(entry["word"], actual[i][0])
             self.assertEqual(entry["category"], actual[i][1])
-            self.assertRegex(actual[i][3], "[A-Z]{" + str(code_len) + "}")
             self.assertEqual(entry["type"], actual[i][2])
+            self.assertRegex(actual[i][3], "[A-Z]{" + str(code_len) + "}")
 
     def test_get_categories(self):
         """Assert function get_categories works as expected."""
@@ -161,7 +162,7 @@ class DatabaseTest(unittest.TestCase):
             if entry["type"] == 1:
                 expected.append(entry)
         # Get small codebook from db
-        actual = self.database.get_codebook(small=True)
+        actual = self.database.get_codebook(codebook_size=CodebookSize.FULL)
         # Compare lenght
         self.assertEqual(len(expected), len(actual))
         # Get expected length of codes
-- 
GitLab