More test framework changes...

7 files changed, 31 insertions, 23 deletions

diff --git a/client/test.sh b/client/test.sh
index 83dc675..cbd0184 100755
--- a/client/test.sh
+++ b/client/test.sh
@@ -5,6 +5,9 @@ TEST_PRO=test.pro
 MAKEFILE=Makefile.test
 TEST_APP=test_app
 
+# Make sure that pracro.cc gets compiled again with the TESTING flags set.
+touch pracro.cc
+
 if [ -z $1 ]
 then
 		TESTFILES=test/test*.cc
@@ -25,25 +28,25 @@ do
     echo Compiling $TEST test: >> $OUTPUT
     echo ${COMPILE} >> $OUTPUT
     cpp -P -E -DTESTFILE=\"$TEST\" $TEST_PRO_IN -o $TEST_PRO
-		qmake -makefile $TEST_PRO -o $MAKEFILE
+    qmake -makefile $TEST_PRO -o $MAKEFILE
     if make -f $MAKEFILE 2>&1 >> ${OUTPUT}; then
-				echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]"
-				echo "[Success]" >> $OUTPUT
-				
-				echo -n "* Running   $TEST test"
-				echo Running $TEST test: >> $OUTPUT
-				if ./$TEST_APP 2>&1 >> $OUTPUT ; then
-						echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]"
-						echo "[Success]" >> $OUTPUT
-				else
-						echo -e "\r\t\t\t\t\t\t[\033[1;31mFailure\033[0;2m]"
-						echo "[Failure]" >> $OUTPUT
-				fi
+	echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]"
+	echo "[Success]" >> $OUTPUT
+	
+	echo -n "* Running   $TEST test"
+	echo Running $TEST test: >> $OUTPUT
+	if ./$TEST_APP 2>&1 >> $OUTPUT ; then
+	    echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]"
+	    echo "[Success]" >> $OUTPUT
+	else
+	    echo -e "\r\t\t\t\t\t\t[\033[1;31mFailure\033[0;2m]"
+	    echo "[Failure]" >> $OUTPUT
+	fi
     else
-				echo -e "\r\t\t\t\t\t\t[\033[1;31mFailure\033[0;2m]"
-				echo "[Failure]" >> $OUTPUT
+	echo -e "\r\t\t\t\t\t\t[\033[1;31mFailure\033[0;2m]"
+	echo "[Failure]" >> $OUTPUT
     fi
 		
-		rm -f $MAKEFILE $TEST_PRO $TEST_APP
+    rm -f $MAKEFILE $TEST_PRO $TEST_APP
 done
 
diff --git a/client/test/testcomboboxedit.cc b/client/test/testcomboboxedit.cc
index 5294886..7fdbfb1 100644
--- a/client/test/testcomboboxedit.cc
+++ b/client/test/testcomboboxedit.cc
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 #include <QtTest/QtTest>
 #include "util.h"
 #include "combobox.h"
@@ -24,7 +25,7 @@ static QString xml_select =
 	"  <item value=\"item2\" caption=\"Item 2\"/>\n"
 	"</combobox>\n";
 
-class TestComboBox: public QObject
+class TestComboBoxEdit: public QObject
 {
 Q_OBJECT
 private slots:
@@ -66,7 +67,7 @@ private slots:
 	}
 };
 
-QTEST_MAIN(TestComboBox)
-#include "testcombobox.moc"
+QTEST_MAIN(TestComboBoxEdit)
+#include "testcomboboxedit.moc"
 
 
diff --git a/client/test/testcomboboxsearch.cc b/client/test/testcomboboxsearch.cc
index 84f03c4..7ac0db4 100644
--- a/client/test/testcomboboxsearch.cc
+++ b/client/test/testcomboboxsearch.cc
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 #include <QtTest/QtTest>
 #include "util.h"
 #include "combobox.h"
diff --git a/client/test/testcomboboxselect.cc b/client/test/testcomboboxselect.cc
index 5294886..1439440 100644
--- a/client/test/testcomboboxselect.cc
+++ b/client/test/testcomboboxselect.cc
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 #include <QtTest/QtTest>
 #include "util.h"
 #include "combobox.h"
@@ -24,7 +25,7 @@ static QString xml_select =
 	"  <item value=\"item2\" caption=\"Item 2\"/>\n"
 	"</combobox>\n";
 
-class TestComboBox: public QObject
+class TestComboBoxSelect: public QObject
 {
 Q_OBJECT
 private slots:
@@ -66,7 +67,7 @@ private slots:
 	}
 };
 
-QTEST_MAIN(TestComboBox)
-#include "testcombobox.moc"
+QTEST_MAIN(TestComboBoxSelect)
+#include "testcomboboxselect.moc"
 
 
diff --git a/client/test/testlineedit.cc b/client/test/testlineedit.cc
index c5ab8b3..8b30295 100644
--- a/client/test/testlineedit.cc
+++ b/client/test/testlineedit.cc
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 #include <QtTest/QtTest>
 #include "util.h"
 #include "lineedit.h"
diff --git a/client/test/util.h b/client/test/util.h
index 98da0e9..89a887d 100644
--- a/client/test/util.h
+++ b/client/test/util.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 #include "macrowindow.h"
 #include <QDomElement>
 
diff --git a/client/widgets/common.cc b/client/widgets/common.cc
index b650701..3d4458d 100644
--- a/client/widgets/common.cc
+++ b/client/widgets/common.cc
@@ -101,5 +101,5 @@ bool isUserSource(QString source)
 {
   if(source == "pentominos") return true;
   if(source == "pracro") return false;
-  return false;
+  return true;
 }