Add unit test for creation window CharCreateDialog.

10 files changed, 222 insertions, 92 deletions

diff --git a/data/test/CMakeLists.txt b/data/test/CMakeLists.txt
index cca62955c..051d2beb8 100644
--- a/data/test/CMakeLists.txt
+++ b/data/test/CMakeLists.txt
@@ -21,6 +21,10 @@ SET(FILES
     test5.zip
     testintmap.xml
     units.xml
+    graphics/sprites/hairstyles/hairstyle01.png
+    graphics/sprites/hairstyles/hairstyle01.xml
+    graphics/sprites/hairstyles/hairstyle02.png
+    graphics/sprites/hairstyles/hairstyle02.xml
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/test)
diff --git a/data/test/Makefile.am b/data/test/Makefile.am
index fd185e722..0fb49e6a1 100644
--- a/data/test/Makefile.am
+++ b/data/test/Makefile.am
@@ -24,7 +24,11 @@ test_DATA =				\
 	test4.zip \
 	test5.zip \
 	testintmap.xml \
-	units.xml
+	units.xml \
+	graphics/sprites/hairstyles/hairstyle01.png \
+	graphics/sprites/hairstyles/hairstyle01.xml \
+	graphics/sprites/hairstyles/hairstyle02.png \
+	graphics/sprites/hairstyles/hairstyle02.xml
 
 EXTRA_DIST =				\
 	$(test_DATA) \
diff --git a/data/test/graphics/sprites/hairstyles/hairstyle01.png b/data/test/graphics/sprites/hairstyles/hairstyle01.png
new file mode 100644
index 000000000..1ef26f96f
--- /dev/null
+++ b/data/test/graphics/sprites/hairstyles/hairstyle01.png
diff --git a/data/test/graphics/sprites/hairstyles/hairstyle01.xml b/data/test/graphics/sprites/hairstyles/hairstyle01.xml
new file mode 100644
index 000000000..52fd83e46
--- /dev/null
+++ b/data/test/graphics/sprites/hairstyles/hairstyle01.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2012-2016 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/hairstyles/hairstyle01.png"
+              width="40"
+              height="50"/>
+
+    <action name="stand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-29"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetY="-29"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-25"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetY="-29"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-28" delay="80"/>
+            <frame index="0" offsetY="-29" delay="160"/>
+            <frame index="0" offsetY="-28" delay="80"/>
+            <frame index="0" offsetY="-29" delay="160"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetY="-29" delay="80"/>
+            <frame index="1" offsetY="-28" delay="80"/>
+            <frame index="1" offsetY="-29" delay="160"/>
+            <frame index="1" offsetY="-28" delay="80"/>
+            <frame index="1" offsetY="-29" delay="80"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-25" delay="80"/>
+            <frame index="2" offsetX="-1" offsetY="-26" delay="160"/>
+            <frame index="2" offsetX="-1" offsetY="-25" delay="80"/>
+            <frame index="2" offsetX="-1" offsetY="-26" delay="160"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetY="-29" delay="80"/>
+            <frame index="3" offsetY="-28" delay="80"/>
+            <frame index="3" offsetY="-29" delay="160"/>
+            <frame index="3" offsetY="-28" delay="80"/>
+            <frame index="3" offsetY="-29" delay="80"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-27" delay="80"/>
+            <frame index="0" offsetY="-28" delay="80"/>
+            <frame index="0" offsetY="-25" delay="80"/>
+            <frame index="0" offsetY="-24" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-30" delay="80"/>
+            <frame index="1" offsetX="4" offsetY="-31" delay="80"/>
+            <frame index="1" offsetY="-28" delay="80"/>
+            <frame index="1" offsetX="-1" offsetY="-27" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY="-25" delay="240"/>
+            <frame index="2" offsetX="-2" offsetY="-23" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-30" delay="80"/>
+            <frame index="3" offsetX="-3" offsetY="-31" delay="80"/>
+            <frame index="3" offsetY="-28" delay="80"/>
+            <frame index="3" offsetX="1" offsetY="-27" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_bow" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-28" delay="240"/>
+            <frame index="0" offsetY="-27" delay="80"/>
+            <frame index="0" offsetY="-28" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="3" offsetY="-29" delay="240"/>
+            <frame index="1" offsetX="5" offsetY="-30" delay="160"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-25" delay="240"/>
+            <frame index="2" offsetX="-2" offsetY="-24" delay="80"/>
+            <frame index="2" offsetX="-2" offsetY="-25" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-29" delay="240"/>
+            <frame index="3" offsetX="-5" offsetY="-30" delay="160"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="sit" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-22"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-20"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetY="-17"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-20"/>
+        </animation>
+    </action>
+
+    <action name="sittop" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-17"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-20"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetY="-17"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-20"/>
+        </animation>
+    </action>
+
+    <action name="standride" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-17"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-20"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetY="-17"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-20"/>
+        </animation>
+    </action>
+
+    <action name="spawnride" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-17"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-20"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetY="-17"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-20"/>
+        </animation>
+    </action>
+
+    <action name="ride" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-17"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-20"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetY="-17"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-20"/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="base">
+        <animation direction="default">
+            <frame index="4" offsetX="21" offsetY="6"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/data/test/graphics/sprites/hairstyles/hairstyle02.png b/data/test/graphics/sprites/hairstyles/hairstyle02.png
new file mode 100644
index 000000000..99177930c
--- /dev/null
+++ b/data/test/graphics/sprites/hairstyles/hairstyle02.png
diff --git a/data/test/graphics/sprites/hairstyles/hairstyle02.xml b/data/test/graphics/sprites/hairstyles/hairstyle02.xml
new file mode 100644
index 000000000..f11e4c31b
--- /dev/null
+++ b/data/test/graphics/sprites/hairstyles/hairstyle02.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2012 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/hairstyles/hairstyle02.png|S"
+              width="40"
+              height="50"/>
+
+    <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/data/test/items.xml b/data/test/items.xml
index b18453974..c3a36f5c3 100644
--- a/data/test/items.xml
+++ b/data/test/items.xml
@@ -34,84 +34,6 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="-2" type="hairsprite" name="Bowl Cut" colors="hairS">
         <sprite>hairstyles/hairstyle02.xml</sprite>
     </item>
-    <item id="-3" type="hairsprite" name="Combed Back" colors="hairS">
-        <sprite>hairstyles/hairstyle03.xml</sprite>
-    </item>
-    <item id="-4" type="hairsprite" name="Emo" colors="hairS">
-        <sprite>hairstyles/hairstyle04.xml</sprite>
-    </item>
-    <item id="-5" type="hairsprite" name="Mohawk" colors="hairS">
-        <sprite>hairstyles/hairstyle05.xml</sprite>
-    </item>
-    <item id="-6" type="hairsprite" name="Pompadour" colors="hairS">
-        <sprite>hairstyles/hairstyle06.xml</sprite>
-    </item>
-    <item id="-7" type="hairsprite" name="Center Parting" colors="hairS">
-        <sprite>hairstyles/hairstyle07.xml</sprite>
-    </item>
-    <item id="-8" type="hairsprite" name="Long and Slick" colors="hair">
-        <sprite>hairstyles/hairstyle08.xml</sprite>
-    </item>
-    <item id="-9" type="hairsprite" name="Short and Curly" colors="hair">
-        <sprite>hairstyles/hairstyle09.xml</sprite>
-    </item>
-    <item id="-10" type="hairsprite" name="Pigtails" colors="hair">
-        <sprite>hairstyles/hairstyle10.xml</sprite>
-    </item>
-    <item id="-11" type="hairsprite" name="Long and Curly" colors="hair">
-        <sprite>hairstyles/hairstyle11.xml</sprite>
-    </item>
-    <item id="-12" type="hairsprite" name="Parted" colors="hair">
-        <sprite>hairstyles/hairstyle12.xml</sprite>
-    </item>
-    <item id="-13" type="hairsprite" name="Perky Ponytail" colors="hairS">
-        <sprite>hairstyles/hairstyle13.xml</sprite>
-    </item>
-    <item id="-14" type="hairsprite" name="Wave" colors="hairS">
-        <sprite>hairstyles/hairstyle14.xml</sprite>
-    </item>
-    <item id="-15" type="hairsprite" name="Mane" colors="hairS">
-        <sprite>hairstyles/hairstyle15.xml</sprite>
-    </item>
-    <item id="-16" type="hairsprite" name="Bun" colors="hairS">
-        <sprite>hairstyles/hairstyle16.xml</sprite>
-    </item>
-    <item id="-17" type="hairsprite" name="Wavy" colors="hairS">
-        <sprite>hairstyles/hairstyle17.xml</sprite>
-    </item>
-    <item id="-18" type="hairsprite" name="Bunches" colors="hairS">
-        <sprite>hairstyles/hairstyle18.xml</sprite>
-    </item>
-    <item id="-19" type="hairsprite" name="Long Ponytail" colors="hairS">
-        <sprite>hairstyles/hairstyle19.xml</sprite>
-    </item>
-    <item id="-20" type="hairsprite" name="Infinitely Long" colors="hair">
-        <sprite>hairstyles/hairstyle20.xml</sprite>
-    </item>
-    <item id="-21" type="hairsprite" name="Choppy" colors="hair">
-        <sprite>hairstyles/hairstyle21.xml</sprite>
-    </item>
-    <item id="-22" type="hairsprite" name="Wild" colors="hair">
-        <sprite>hairstyles/hairstyle22.xml</sprite>
-    </item>
-    <item id="-23" type="hairsprite" name="Punk" colors="hairS">
-        <sprite>hairstyles/hairstyle23.xml</sprite>
-    </item>
-    <item id="-24" type="hairsprite" name="Imperial" colors="hairS">
-        <sprite>hairstyles/hairstyle24.xml</sprite>
-    </item>
-    <item id="-25" type="hairsprite" name="Side Strand" colors="hairS">
-        <sprite>hairstyles/hairstyle25.xml</sprite>
-    </item>
-    <item id="-26" type="hairsprite" name="Messy" colors="hairS">
-        <sprite>hairstyles/hairstyle26.xml</sprite>
-    </item>
-    <item id="-27" type="hairsprite" name="Flat Ponytail" colors="hairS">
-        <sprite>hairstyles/hairstyle27.xml</sprite>
-    </item>
-    <item id="-28" type="hairsprite" name="Tapered Nape" colors="hairS">
-        <sprite>hairstyles/hairstyle28.xml</sprite>
-    </item>
 
     <!-- Races -->
     <item id="-100" type="racesprite" name="Human">
diff --git a/src/unittests/fs/virtfs/virtfs.cc b/src/unittests/fs/virtfs/virtfs.cc
index 5bdfda2ea..d316b4ac5 100644
--- a/src/unittests/fs/virtfs/virtfs.cc
+++ b/src/unittests/fs/virtfs/virtfs.cc
@@ -256,8 +256,8 @@ TEST_CASE("VirtFs enumerateFiles1", "")
 
     VirtFs::List *list = nullptr;
 
-    const int cnt1 = VirtFs::exists("test/test2.txt") ? 28 : 27;
-    const int cnt2 = 28;
+    const int cnt1 = VirtFs::exists("test/test2.txt") ? 29 : 28;
+    const int cnt2 = 29;
 
     VirtFs::permitLinks(false);
     list = VirtFs::enumerateFiles("test");
diff --git a/src/unittests/fs/virtfs/virtfs1_enumerate.cc b/src/unittests/fs/virtfs/virtfs1_enumerate.cc
index 22db74cb2..25f523adf 100644
--- a/src/unittests/fs/virtfs/virtfs1_enumerate.cc
+++ b/src/unittests/fs/virtfs/virtfs1_enumerate.cc
@@ -82,8 +82,8 @@ TEST_CASE("VirtFs1 enumerateFiles1", "")
 
     VirtFs::List *list = nullptr;
 
-    const int cnt1 = VirtFs::exists("test/test2.txt") ? 28 : 27;
-    const int cnt2 = 28;
+    const int cnt1 = VirtFs::exists("test/test2.txt") ? 29 : 28;
+    const int cnt2 = 29;
 
     VirtFs::permitLinks(false);
     list = VirtFs::enumerateFiles("test");
diff --git a/src/unittests/gui/windowmanager.cc b/src/unittests/gui/windowmanager.cc
index fb937f0b4..fa708648b 100644
--- a/src/unittests/gui/windowmanager.cc
+++ b/src/unittests/gui/windowmanager.cc
@@ -60,6 +60,7 @@
 #include "gui/windows/buydialog.h"
 #include "gui/windows/buyingstoreselldialog.h"
 #include "gui/windows/buyselldialog.h"
+#include "gui/windows/charcreatedialog.h"
 #include "gui/windows/charselectdialog.h"
 #include "gui/windows/changeemaildialog.h"
 #include "gui/windows/changepassworddialog.h"
@@ -323,15 +324,15 @@ TEST_CASE("Windows tests", "windowmanager")
     }
     SECTION("CharCreateDialog")
     {
-//        LoginData data;
-//        CharSelectDialog *dialog2;
-//        CREATEWIDGETV(dialog2, CharSelectDialog, data);
-//        CharCreateDialog *dialog;
-//        CREATEWIDGETV(dialog, CharCreateDialog, dialog2, 0);
-//        gui->draw();
-//        mainGraphics->updateScreen();
-//        delete2(dialog);
-//        delete2(dialog2);
+        LoginData data;
+        CharSelectDialog *dialog2;
+        CREATEWIDGETV(dialog2, CharSelectDialog, data);
+        CharCreateDialog *dialog;
+        CREATEWIDGETV(dialog, CharCreateDialog, dialog2, 0);
+        gui->draw();
+        mainGraphics->updateScreen();
+        delete2(dialog);
+        delete2(dialog2);
     }
     SECTION("ChatWindow")
     {