From 162f06001acf863c4cac1eaef5bb949d240fe0a3 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Thu, 26 May 2022 23:27:32 +0200
Subject: [PATCH] Build dev8 & improved cpl new unittests

---
 unittests/unittests/unittests.json               |  4 ++--
 unittests/unittests_cli/new_test_case.py         | 11 ++++++-----
 unittests/unittests_cli/unittests_cli.json       |  6 +++---
 unittests/unittests_core/unittests_core.json     |  4 ++--
 unittests/unittests_query/unittests_query.json   |  6 +++---
 unittests/unittests_shared/unittests_shared.json |  4 ++--
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/unittests/unittests/unittests.json b/unittests/unittests/unittests.json
index c9be15f0..1408486c 100644
--- a/unittests/unittests/unittests.json
+++ b/unittests/unittests/unittests.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "17.dev7"
+      "Micro": "17.dev8"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.6.17.dev7"
+      "cpl-core>=2022.6.17.dev8"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {
diff --git a/unittests/unittests_cli/new_test_case.py b/unittests/unittests_cli/new_test_case.py
index fa2f8070..6b831117 100644
--- a/unittests/unittests_cli/new_test_case.py
+++ b/unittests/unittests_cli/new_test_case.py
@@ -28,7 +28,8 @@ class NewTestCase(unittest.TestCase):
         else:
             self.assertFalse(os.path.isfile(os.path.join(project_path, f'application.py')))
 
-        if '--sp' in args:
+        # s depends on ab
+        if '--ab' in args and '--s' in args:
             self.assertTrue(os.path.isfile(os.path.join(project_path, f'startup.py')))
         else:
             self.assertFalse(os.path.isfile(os.path.join(project_path, f'startup.py')))
@@ -50,10 +51,7 @@ class NewTestCase(unittest.TestCase):
         os.chdir(os.path.abspath(os.path.join(os.getcwd(), '../')))
 
     def test_console(self):
-        self._test_project('console', 'test-console', '--ab', '--s', '--sp')
-
-    def test_console_without_sp(self):
-        self._test_project('console', 'test-console-without-sp', '--ab', '--s')
+        self._test_project('console', 'test-console', '--ab', '--s')
 
     def test_console_without_s(self):
         self._test_project('console', 'test-console-without-s', '--ab')
@@ -61,6 +59,9 @@ class NewTestCase(unittest.TestCase):
     def test_console_without_ab(self):
         self._test_project('console', 'test-console-without-ab', '--sp')
 
+    def test_console_without_anything(self):
+        self._test_project('console', 'test-console-without-anything', '--n')
+
     def test_sub_console(self):
         self._test_sub_project('console', 'test-sub-console', 'test-console', '--ab', '--s', '--sp')
 
diff --git a/unittests/unittests_cli/unittests_cli.json b/unittests/unittests_cli/unittests_cli.json
index c8681484..5d0cc83f 100644
--- a/unittests/unittests_cli/unittests_cli.json
+++ b/unittests/unittests_cli/unittests_cli.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "17.dev7"
+      "Micro": "17.dev8"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,8 +16,8 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.6.17.dev7",
-      "cpl-cli>=2022.6.17.dev7"
+      "cpl-core>=2022.6.17.dev8",
+      "cpl-cli>=2022.6.17.dev8"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {
diff --git a/unittests/unittests_core/unittests_core.json b/unittests/unittests_core/unittests_core.json
index f8dedcd3..0286b34d 100644
--- a/unittests/unittests_core/unittests_core.json
+++ b/unittests/unittests_core/unittests_core.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "17.dev7"
+      "Micro": "17.dev8"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.6.17.dev7"
+      "cpl-core>=2022.6.17.dev8"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {
diff --git a/unittests/unittests_query/unittests_query.json b/unittests/unittests_query/unittests_query.json
index c4f1ed2e..bbb2aa8f 100644
--- a/unittests/unittests_query/unittests_query.json
+++ b/unittests/unittests_query/unittests_query.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "17.dev7"
+      "Micro": "17.dev8"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,8 +16,8 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.6.17.dev7",
-      "cpl-query>=2022.6.17.dev7"
+      "cpl-core>=2022.6.17.dev8",
+      "cpl-query>=2022.6.17.dev8"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {
diff --git a/unittests/unittests_shared/unittests_shared.json b/unittests/unittests_shared/unittests_shared.json
index 9f28e0b7..89c58db2 100644
--- a/unittests/unittests_shared/unittests_shared.json
+++ b/unittests/unittests_shared/unittests_shared.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "17.dev7"
+      "Micro": "17.dev8"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.6.17.dev7"
+      "cpl-core>=2022.6.17.dev8"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {