From ea1e24e909495beee3221a7d57cea7cc114dd16a Mon Sep 17 00:00:00 2001
From: Ville-Matti Riihikoski <ville-matti.riihikoski@qentinel.com>
Date: Wed, 24 Nov 2021 12:10:51 +0200
Subject: [PATCH 1/2] Allow other optional columns to the first column

---
 atest/TestCases/first_col/documentation.csv   |  3 +++
 atest/TestCases/first_col/documentation.robot | 14 ++++++++++++++
 atest/TestCases/first_col/tags.csv            |  3 +++
 atest/TestCases/first_col/tags.robot          | 13 +++++++++++++
 src/DataDriver/AbstractReaderClass.py         |  8 ++++++--
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 atest/TestCases/first_col/documentation.csv
 create mode 100644 atest/TestCases/first_col/documentation.robot
 create mode 100644 atest/TestCases/first_col/tags.csv
 create mode 100644 atest/TestCases/first_col/tags.robot

diff --git a/atest/TestCases/first_col/documentation.csv b/atest/TestCases/first_col/documentation.csv
new file mode 100644
index 0000000..6c073f6
--- /dev/null
+++ b/atest/TestCases/first_col/documentation.csv
@@ -0,0 +1,3 @@
+[Documentation];${expected}
+Doc1;Doc1
+Doc2;Doc2
\ No newline at end of file
diff --git a/atest/TestCases/first_col/documentation.robot b/atest/TestCases/first_col/documentation.robot
new file mode 100644
index 0000000..44e9144
--- /dev/null
+++ b/atest/TestCases/first_col/documentation.robot
@@ -0,0 +1,14 @@
+*** Settings ***
+Library           DataDriver    encoding=UTF8
+Test Template     Check
+
+
+*** Test Cases ***
+Documentation should be ${expected}
+
+
+*** Keywords ***
+Check
+    [Arguments]    ${expected}
+    log variables
+    Should Be Equal    ${TEST DOCUMENTATION}    ${expected}
diff --git a/atest/TestCases/first_col/tags.csv b/atest/TestCases/first_col/tags.csv
new file mode 100644
index 0000000..c6269bc
--- /dev/null
+++ b/atest/TestCases/first_col/tags.csv
@@ -0,0 +1,3 @@
+[Tags];${expected}
+tag1;tag1
+tag2;tag2
\ No newline at end of file
diff --git a/atest/TestCases/first_col/tags.robot b/atest/TestCases/first_col/tags.robot
new file mode 100644
index 0000000..a0def16
--- /dev/null
+++ b/atest/TestCases/first_col/tags.robot
@@ -0,0 +1,13 @@
+*** Settings ***
+Library           DataDriver    encoding=UTF8
+Test Template     Check
+
+
+*** Test Cases ***
+Tags should containe ${expected}
+
+
+*** Keywords ***
+Check
+    [Arguments]    ${expected}
+    Should Be Equal    ${TEST TAGS}[0]    ${expected}
diff --git a/src/DataDriver/AbstractReaderClass.py b/src/DataDriver/AbstractReaderClass.py
index 76c96cf..bf57aa8 100644
--- a/src/DataDriver/AbstractReaderClass.py
+++ b/src/DataDriver/AbstractReaderClass.py
@@ -112,10 +112,14 @@ def _read_data_from_table(self, row):
                 )
         tags = (
             [t.strip() for t in row[self.tags_column_id].split(",")]
-            if self.tags_column_id
+            if self.tags_column_id is not None
             else None
         )
-        documentation = row[self.documentation_column_id] if self.documentation_column_id else ""
+        documentation = (
+            row[self.documentation_column_id]
+            if self.documentation_column_id is not None
+            else ""
+        )
 
         self.data_table.append(TestCaseData(test_case_name, arguments, tags, documentation))
 

From b8e0e241f530b93d4b0d4e37ef2eb2c406d9e959 Mon Sep 17 00:00:00 2001
From: Ville-Matti Riihikoski <ville-matti.riihikoski@qentinel.com>
Date: Wed, 24 Nov 2021 12:19:51 +0200
Subject: [PATCH 2/2] remove debug

---
 atest/TestCases/first_col/documentation.robot | 1 -
 1 file changed, 1 deletion(-)

diff --git a/atest/TestCases/first_col/documentation.robot b/atest/TestCases/first_col/documentation.robot
index 44e9144..1e2968c 100644
--- a/atest/TestCases/first_col/documentation.robot
+++ b/atest/TestCases/first_col/documentation.robot
@@ -10,5 +10,4 @@ Documentation should be ${expected}
 *** Keywords ***
 Check
     [Arguments]    ${expected}
-    log variables
     Should Be Equal    ${TEST DOCUMENTATION}    ${expected}