From 3fe42c3f79792b3fa07c865766e8128dc1c3d6aa Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Sun, 14 May 2017 19:43:44 +0200
Subject: [PATCH] Update old-theme-convert test

---
 doc/old-theme-convert-output.rasi | 40 +++++++++++++++----------------
 test/convert_old_theme_test.sh    |  3 ++-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/doc/old-theme-convert-output.rasi b/doc/old-theme-convert-output.rasi
index 4460ae40..4f17f684 100644
--- a/doc/old-theme-convert-output.rasi
+++ b/doc/old-theme-convert-output.rasi
@@ -1,31 +1,31 @@
 * {
-    foreground:                  #FFDBDFBC;
-    selected-normal-foreground:  #FF02143F;
+    foreground:                  #FF002B36;
+    selected-normal-foreground:  @lightbg;
     normal-foreground:           @foreground;
     red:                         #FFDC322F;
-    alternate-normal-background: #3AFFFFFF;
+    alternate-normal-background: @lightbg;
     blue:                        #FF268BD2;
-    selected-urgent-foreground:  #FF02143F;
-    urgent-foreground:           #FFFF817F;
-    alternate-urgent-background: #3AFFFFFF;
-    active-foreground:           #FF6AA4FF;
+    selected-urgent-foreground:  @background;
+    urgent-foreground:           @red;
+    alternate-urgent-background: @lightbg;
+    active-foreground:           @blue;
     lightbg:                     #FFEEE8D5;
-    selected-active-foreground:  #FF02143F;
+    selected-active-foreground:  @background;
     alternate-normal-foreground: @foreground;
-    alternate-active-background: #3AFFFFFF;
-    bordercolor:                 #FFDBDFBC;
-    background:                  #EE27201A;
-    normal-background:           #00000000;
+    alternate-active-background: @lightbg;
+    bordercolor:                 @foreground;
+    background:                  #FFFDF6E3;
+    normal-background:           @background;
     lightfg:                     #FF586875;
-    selected-normal-background:  #FFDBDFBC;
-    separatorcolor:              #FFDBDFBC;
+    selected-normal-background:  @lightfg;
+    separatorcolor:              @foreground;
     spacing:                     2;
-    urgent-background:           #00000000;
-    alternate-urgent-foreground: @urgent-foreground;
-    selected-urgent-background:  #FFFF817F;
-    alternate-active-foreground: @active-foreground;
-    selected-active-background:  #FF6AA4FF;
-    active-background:           #00000000;
+    urgent-background:           @background;
+    alternate-urgent-foreground: @red;
+    selected-urgent-background:  @red;
+    alternate-active-foreground: @blue;
+    selected-active-background:  @blue;
+    active-background:           @background;
 }
 #window {
     border:     1;
diff --git a/test/convert_old_theme_test.sh b/test/convert_old_theme_test.sh
index 2b362627..75fc392b 100755
--- a/test/convert_old_theme_test.sh
+++ b/test/convert_old_theme_test.sh
@@ -2,11 +2,12 @@
 
 TOP_DIR=$1
 
+xrdb -retain -load ${TOP_DIR}/doc/old-theme-convert-input.theme
 rofi -config ${TOP_DIR}/doc/old-theme-convert-input.theme -dump-theme  > temp.txt
 
 if ! diff temp.txt ${TOP_DIR}/doc/old-theme-convert-output.rasi > /dev/null
 then
-    echo "Dump default theme does not match."
+    echo "Convert default theme failed"
     diff temp.txt ${TOP_DIR}/doc/old-theme-convert-output.rasi
     exit 1;
 fi