From 41c7c055d8c056d4293a046e2ee63a5e72ff1bce Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 27 Sep 2012 16:32:50 +0000
Subject: [PATCH] 2012-09-27 18:32 UTC+0200 Viktor Szakats (vszakats
 syenar.net)   + contrib/hbexpat/tests/test.xml   *
 contrib/hbexpat/tests/test.prg   * contrib/hbexpat/tests/tohash.prg     +
 added local test xml file for expat test functions

---
 harbour/ChangeLog                        |  6 ++
 harbour/contrib/hbexpat/tests/test.prg   |  2 +-
 harbour/contrib/hbexpat/tests/test.xml   | 89 ++++++++++++++++++++++++
 harbour/contrib/hbexpat/tests/tohash.prg |  2 +-
 4 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 harbour/contrib/hbexpat/tests/test.xml

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e8e967a921..933fa1fe0a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-27 18:32 UTC+0200 Viktor Szakats (vszakats syenar.net)
+  + contrib/hbexpat/tests/test.xml
+  * contrib/hbexpat/tests/test.prg
+  * contrib/hbexpat/tests/tohash.prg
+    + added local test xml file for expat test functions
+
 2012-09-27 18:27 UTC+0200 Viktor Szakats (vszakats syenar.net)
   + contrib/gtwvg/tests/activex.prg
   + contrib/gtwvg/tests/cuigdlgs.prg
diff --git a/harbour/contrib/hbexpat/tests/test.prg b/harbour/contrib/hbexpat/tests/test.prg
index e3b4e05b73..a76079548d 100644
--- a/harbour/contrib/hbexpat/tests/test.prg
+++ b/harbour/contrib/hbexpat/tests/test.prg
@@ -18,7 +18,7 @@ PROCEDURE Main( cFileName )
    LOCAL v1, v2, v3
 
    IF cFileName == NIL
-      cFileName := ".." + hb_ps() + ".." + hb_ps() + "hbide" + hb_ps() + "setup.ui"
+      cFileName := hb_DirBase() + "test.xml"
    ENDIF
 
    OutStd( XML_ExpatVersion(), hb_eol() )
diff --git a/harbour/contrib/hbexpat/tests/test.xml b/harbour/contrib/hbexpat/tests/test.xml
new file mode 100644
index 0000000000..0262306bc4
--- /dev/null
+++ b/harbour/contrib/hbexpat/tests/test.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>413</width>
+    <height>522</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Editor</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="8">
+    <widget class="QPlainTextEdit" name="plainText"/>
+   </item>
+   <item row="1" column="0" colspan="4">
+    <widget class="QLineEdit" name="ediSearch"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QToolButton" name="buttonNext">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QToolButton" name="buttonPrev">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QToolButton" name="buttonFirst">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3">
+    <widget class="QToolButton" name="buttonLast">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="7">
+    <widget class="QPushButton" name="buttonClose">
+     <property name="text">
+      <string>Close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="4">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="6">
+    <widget class="QPushButton" name="buttonSave">
+     <property name="text">
+      <string>Save</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="5">
+    <widget class="QPushButton" name="buttonSaveAs">
+     <property name="text">
+      <string>SaveAs</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/harbour/contrib/hbexpat/tests/tohash.prg b/harbour/contrib/hbexpat/tests/tohash.prg
index c6c9b04b59..6c77fd91bf 100644
--- a/harbour/contrib/hbexpat/tests/tohash.prg
+++ b/harbour/contrib/hbexpat/tests/tohash.prg
@@ -35,7 +35,7 @@ PROCEDURE Main( cFileName )
    hb_cdpSelect( "UTF8EX" )
 
    IF cFileName == NIL
-      cFileName := ".." + hb_ps() + ".." + hb_ps() + "hbide" + hb_ps() + "setup.ui"
+      cFileName := hb_DirBase() + "test.xml"
    ENDIF
 
    OutStd( XML_ExpatVersion() + hb_eol() )