From 88992f4def66b4ee7c20c56cdc03a80512fd7bef Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 18 Jan 2015 16:30:56 +0000
Subject: Move embedding test in with other tests

---
 p2pvr/daemon/Jamfile.jam                 | 10 ----------
 p2pvr/daemon/test/dummySelect.sql        |  1 -
 p2pvr/daemon/testEmbedding.cpp           | 14 --------------
 p2pvr/daemon/unittests/Jamfile.jam       |  9 +++++++++
 p2pvr/daemon/unittests/dummySelect.sql   |  1 +
 p2pvr/daemon/unittests/testEmbedding.cpp | 14 ++++++++++++++
 6 files changed, 24 insertions(+), 25 deletions(-)
 delete mode 100644 p2pvr/daemon/test/dummySelect.sql
 delete mode 100644 p2pvr/daemon/testEmbedding.cpp
 create mode 100644 p2pvr/daemon/unittests/dummySelect.sql
 create mode 100644 p2pvr/daemon/unittests/testEmbedding.cpp

diff --git a/p2pvr/daemon/Jamfile.jam b/p2pvr/daemon/Jamfile.jam
index 5913af1..d5d5b1d 100644
--- a/p2pvr/daemon/Jamfile.jam
+++ b/p2pvr/daemon/Jamfile.jam
@@ -1,4 +1,3 @@
-import testing ;
 lib slicer : : <name>slicer : : <include>/usr/include/slicer ;
 
 cpp-pch pch : pch.hpp :
@@ -29,14 +28,5 @@ lib p2pvrdaemon :
 	<library>slicer
 	;
 
-unit-test testEmbedding :
-	testEmbedding.cpp
-	test/dummySelect.sql
-	:
-	<define>BOOST_TEST_DYN_LINK
-	<library>..//boost_utf
-	<library>../lib//p2pvrlib
-	;
-
 build-project unittests ;
 
diff --git a/p2pvr/daemon/test/dummySelect.sql b/p2pvr/daemon/test/dummySelect.sql
deleted file mode 100644
index 3f9397b..0000000
--- a/p2pvr/daemon/test/dummySelect.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT stuff FROM things
diff --git a/p2pvr/daemon/testEmbedding.cpp b/p2pvr/daemon/testEmbedding.cpp
deleted file mode 100644
index b0e01f1..0000000
--- a/p2pvr/daemon/testEmbedding.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#define BOOST_TEST_MODULE embedding
-#include <boost/test/unit_test.hpp>
-
-#include "resources.h"
-
-ResourceString(DummySql, sql_dummySelect);
-
-BOOST_AUTO_TEST_CASE( embed )
-{
-	BOOST_REQUIRE_EQUAL(25, DummySql.length());
-	BOOST_REQUIRE_EQUAL(sql_dummySelect_len, DummySql.length());
-	BOOST_REQUIRE_EQUAL("SELECT stuff FROM things\n", DummySql);
-}
-
diff --git a/p2pvr/daemon/unittests/Jamfile.jam b/p2pvr/daemon/unittests/Jamfile.jam
index c9ebc5a..0bc5ce0 100644
--- a/p2pvr/daemon/unittests/Jamfile.jam
+++ b/p2pvr/daemon/unittests/Jamfile.jam
@@ -7,6 +7,15 @@ lib Ice ;
 
 path-constant me : . ;
 
+unit-test testEmbedding :
+	testEmbedding.cpp
+	dummySelect.sql
+	:
+	<define>BOOST_TEST_DYN_LINK
+	<library>../..//boost_utf
+	<library>../../lib//p2pvrlib
+	;
+
 unit-test testp2ice :
 	testp2ice.cpp
 	:
diff --git a/p2pvr/daemon/unittests/dummySelect.sql b/p2pvr/daemon/unittests/dummySelect.sql
new file mode 100644
index 0000000..3f9397b
--- /dev/null
+++ b/p2pvr/daemon/unittests/dummySelect.sql
@@ -0,0 +1 @@
+SELECT stuff FROM things
diff --git a/p2pvr/daemon/unittests/testEmbedding.cpp b/p2pvr/daemon/unittests/testEmbedding.cpp
new file mode 100644
index 0000000..b0e01f1
--- /dev/null
+++ b/p2pvr/daemon/unittests/testEmbedding.cpp
@@ -0,0 +1,14 @@
+#define BOOST_TEST_MODULE embedding
+#include <boost/test/unit_test.hpp>
+
+#include "resources.h"
+
+ResourceString(DummySql, sql_dummySelect);
+
+BOOST_AUTO_TEST_CASE( embed )
+{
+	BOOST_REQUIRE_EQUAL(25, DummySql.length());
+	BOOST_REQUIRE_EQUAL(sql_dummySelect_len, DummySql.length());
+	BOOST_REQUIRE_EQUAL("SELECT stuff FROM things\n", DummySql);
+}
+
-- 
cgit v1.2.3