Debug API and tests, add test

5 files changed, 63 insertions, 16 deletions

diff --git a/tests/run.sh b/tests/run.sh
index 296eccf..93cad38 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -36,7 +36,7 @@ do
             exit 1
         fi  
     else
-        nb_pass=$(( nb_test + 1 ))
+        nb_pass=$(( nb_pass + 1 ))
         passed "${test_name}"
     fi
 done
diff --git a/tests/test-simple-apply.out b/tests/test-simple-apply.out
index 064868d..ac630f1 100644
--- a/tests/test-simple-apply.out
+++ b/tests/test-simple-apply.out
@@ -1,5 +1,3 @@
-Author: lasers
-Url: https://github.com/okraits/j4-make-config
 ##### Variables #####
 ##### Define workspaces names
 set $ws1 "1 "
@@ -289,7 +287,7 @@ bar {
   position top
   font pango:DejaVu Sans Mono 14
   status_command i3status -c ~/.config/i3/i3status.conf
-  separator_symbol "|"
+separator_symbol "|"
   colors {
     active_workspace #414141 #2d2d2d #ffffff
     background #2d2d2d
@@ -305,7 +303,7 @@ client.focused #4183F6 #2d76f6 #ffffff #d8442e #4183F6
 client.focused_inactive #C1C1C1 #bbbbbb #ffffff #009c58 #C1C1C1
 client.unfocused #414141 #2d2d2d #ffffff #bbbbbb #414141
 client.urgent #FFCB21 #ffc609 #ffffff #d8442e #FFCB21
-Description: seti theme by Jody Ribton - based on the seti Atom theme at https://atom.io/themes/seti-ui
+
 ##### Variables #####
 ##### Define workspaces names
 set $ws1 "1 "
@@ -595,7 +593,7 @@ bar {
   position top
   font pango:DejaVu Sans Mono 14
   status_command i3status -c ~/.config/i3/i3status.conf
-  separator_symbol "|"
+separator_symbol "|"
   colors {
     separator #AAAAAA
     background #1f2326
@@ -611,3 +609,4 @@ client.focused #4F99D3 #4F99D3 #151718 #9FCA56 #4F99D3
 client.focused_inactive #9FCA56 #9FCA56 #151718 #A074C4 #9FCA56
 client.unfocused #1f2326 #1f2326 #AAAAAA #A074C4 #1f2326
 client.urgent #CE4045 #CE4045 #FFFFFF #DCCD69 #CE4045
+
diff --git a/tests/test-simple-apply.sh b/tests/test-simple-apply.sh
index e5ab960..2516906 100644
--- a/tests/test-simple-apply.sh
+++ b/tests/test-simple-apply.sh
@@ -3,15 +3,7 @@
 wai=$(dirname $(readlink -f $0))
 source "${wai}/include.sh"
 
-##### Load config file
-config_file=$(load ${data}/config)
-
 ##### Test apply on theme with no variables
-$exec apply ${data}/google ${config_file}
-cat $config_file
+$exec apply -d ${data}/google
 ##### Test apply on theme with variables
-$exec apply ${data}/seti ${config_file}
-cat $config_file 
-
-##### Clear temporary file
-rm $config_file
+$exec apply -d ${data}/seti
diff --git a/tests/test-simple-extract.out b/tests/test-simple-extract.out
new file mode 100644
index 0000000..04aa616
--- /dev/null
+++ b/tests/test-simple-extract.out
@@ -0,0 +1,48 @@
+bar_colors:
+  active_workspace:
+    background: '#2d2d2d'
+    border: '#414141'
+    text: '#ffffff'
+  background: '#2d2d2d'
+  focused_workspace:
+    background: '#2d76f6'
+    border: '#4183F6'
+    text: '#ffffff'
+  inactive_workspace:
+    background: '#2d2d2d'
+    border: '#414141'
+    text: '#bbbbbb'
+  separator: '#bbbbbb'
+  statusline: '#ffffff'
+  urgent_workspace:
+    background: '#ffc609'
+    border: '#FFCB21'
+    text: '#ffffff'
+meta:
+  description: Generated From i3-colors
+window_colors:
+  focused:
+    background: '#2d76f6'
+    border: '#4183F6'
+    child_border: '#4183F6'
+    indicator: '#d8442e'
+    text: '#ffffff'
+  focused_inactive:
+    background: '#bbbbbb'
+    border: '#C1C1C1'
+    child_border: '#C1C1C1'
+    indicator: '#009c58'
+    text: '#ffffff'
+  unfocused:
+    background: '#2d2d2d'
+    border: '#414141'
+    child_border: '#414141'
+    indicator: '#bbbbbb'
+    text: '#ffffff'
+  urgent:
+    background: '#ffc609'
+    border: '#FFCB21'
+    child_border: '#FFCB21'
+    indicator: '#d8442e'
+    text: '#ffffff'
+
diff --git a/tests/test-simple-extract.sh b/tests/test-simple-extract.sh
new file mode 100644
index 0000000..61e2844
--- /dev/null
+++ b/tests/test-simple-extract.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+wai=$(dirname $(readlink -f $0))
+source "${wai}/include.sh"
+
+##### Test extract on a config file
+$exec extract ${data}/config
+