Consolidate test class into a single file to make writing tests easier and quicker

timlinux · timlinux · commit 3b9540e11c51 · 2006-04-08T00:21:49.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5217 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/tests/src/core/Makefile.am b/tests/src/core/Makefile.am
@@ -21,7 +21,7 @@ GLOBALCXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(P
 # Instruction for running the qt4 meta object compiler 
 #
 
-%.moc.cpp: %.h
+%.moc.cpp: %.cpp
 	$(MOC) -o $@ $<
 
 #
diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp
@@ -1,8 +1,17 @@
 #include <QtTest>
-#include <qgsapplication.h>
-#include "testqgsapplication.h"
 #include <QObject>
 #include <QString>
+#include <QObject>
+//header for class being tested
+#include <qgsapplication.h>
+
+class TestQgsApplication: public QObject
+{
+    Q_OBJECT;
+      public:
+      private slots:
+            void authorsFilePath();
+};
 
 
 void TestQgsApplication::authorsFilePath()
diff --git a/tests/src/core/testqgsapplication.h b/tests/src/core/testqgsapplication.h

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ GLOBALCXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(P`
`21`	`21`	`# Instruction for running the qt4 meta object compiler`
`22`	`22`	`#`
`23`	`23`
`24`		`-%.moc.cpp: %.h`
	`24`	`+%.moc.cpp: %.cpp`
`25`	`25`	`$(MOC) -o $@ $<`
`26`	`26`
`27`	`27`	`#`