From 8d40943163eb67ee74d962bcf981f5a6dde82de6 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 1 Jan 2018 17:18:20 +0000
Subject: General test config for alternative setups

---
 netfs/unittests/Jamfile.jam      |  3 ++-
 netfs/unittests/altDaemon.xml    | 11 +++++++++++
 netfs/unittests/altFuse.xml      | 15 +++++++++++++++
 netfs/unittests/fgwritesFuse.xml | 15 ---------------
 netfs/unittests/testCore.cpp     | 20 ++++++++++++++------
 5 files changed, 42 insertions(+), 22 deletions(-)
 create mode 100644 netfs/unittests/altDaemon.xml
 create mode 100644 netfs/unittests/altFuse.xml
 delete mode 100644 netfs/unittests/fgwritesFuse.xml

diff --git a/netfs/unittests/Jamfile.jam b/netfs/unittests/Jamfile.jam
index 114895c..dbbecda 100644
--- a/netfs/unittests/Jamfile.jam
+++ b/netfs/unittests/Jamfile.jam
@@ -36,7 +36,8 @@ run testCore.cpp
 	: : :
 	<dependency>defaultDaemon.xml
 	<dependency>defaultFuse.xml
-	<dependency>fgwritesFuse.xml
+	<dependency>altDaemon.xml
+	<dependency>altFuse.xml
 	<dependency>secureDaemon.xml
 	<dependency>secureFuse.xml
 	<define>BOOST_TEST_DYN_LINK
diff --git a/netfs/unittests/altDaemon.xml b/netfs/unittests/altDaemon.xml
new file mode 100644
index 0000000..76711cc
--- /dev/null
+++ b/netfs/unittests/altDaemon.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ascii"?>
+<config>
+  <exports>
+    <export>
+      <name>testvol</name>
+      <export>
+        <root>/overridden</root>
+      </export>
+    </export>
+  </exports>
+</config>
diff --git a/netfs/unittests/altFuse.xml b/netfs/unittests/altFuse.xml
new file mode 100644
index 0000000..37f55a3
--- /dev/null
+++ b/netfs/unittests/altFuse.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ascii"?>
+<config>
+	<resources>
+		<resource>
+			<name>testvol</name>
+			<resource>
+				<export>testvol</export>
+				<endpoints>
+					<endpoint>overridden</endpoint>
+				</endpoints>
+			</resource>
+		</resource>
+	</resources>
+</config>
+
diff --git a/netfs/unittests/fgwritesFuse.xml b/netfs/unittests/fgwritesFuse.xml
deleted file mode 100644
index 37f55a3..0000000
--- a/netfs/unittests/fgwritesFuse.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ascii"?>
-<config>
-	<resources>
-		<resource>
-			<name>testvol</name>
-			<resource>
-				<export>testvol</export>
-				<endpoints>
-					<endpoint>overridden</endpoint>
-				</endpoints>
-			</resource>
-		</resource>
-	</resources>
-</config>
-
diff --git a/netfs/unittests/testCore.cpp b/netfs/unittests/testCore.cpp
index 4aa2619..de5c9d2 100644
--- a/netfs/unittests/testCore.cpp
+++ b/netfs/unittests/testCore.cpp
@@ -61,6 +61,11 @@ class Core {
 		const fuse_operations * fuse;
 };
 
+class AltCore : public Core {
+	public:
+		AltCore() : Core("altDaemon.xml", "altFuse.xml") { }
+};
+
 BOOST_FIXTURE_TEST_SUITE( NetfsCore, Core );
 
 BOOST_AUTO_TEST_CASE(fuse_operations_correct)
@@ -495,25 +500,28 @@ BOOST_AUTO_TEST_CASE( utimens )
 
 BOOST_AUTO_TEST_SUITE_END();
 
+BOOST_FIXTURE_TEST_SUITE( NetfsAltCore, AltCore );
+
 BOOST_AUTO_TEST_CASE( testFGWrites )
 {
-	Core c("defaultDaemon.xml", "fgwritesFuse.xml");
 	struct fuse_file_info fi;
 	memset(&fi, 0, sizeof(fi));
 	struct stat st;
 	memset(&st, 0, sizeof(st));
 	fi.flags = O_RDWR;
-	BOOST_REQUIRE_EQUAL(c.fuse->create("/test", 0600, &fi), 0);
-	BOOST_REQUIRE_EQUAL(c.fuse->write("/test", "some test buffer", 16, 0, &fi), 16);
-	BOOST_REQUIRE_EQUAL(c.fuse->getattr("/test", &st), 0);
+	BOOST_REQUIRE_EQUAL(fuse->create("/test", 0600, &fi), 0);
+	BOOST_REQUIRE_EQUAL(fuse->write("/test", "some test buffer", 16, 0, &fi), 16);
+	BOOST_REQUIRE_EQUAL(fuse->getattr("/test", &st), 0);
 	BOOST_REQUIRE_EQUAL(st.st_size, 16);
 	char buf[11];
 	memset(&buf, 0, sizeof(buf));
-	BOOST_REQUIRE_EQUAL(c.fuse->read("/test", buf, 10, 5, &fi), 10);
+	BOOST_REQUIRE_EQUAL(fuse->read("/test", buf, 10, 5, &fi), 10);
 	BOOST_REQUIRE_EQUAL(buf, "test buffe");
-	BOOST_REQUIRE_EQUAL(c.fuse->release("/test", &fi), 0);
+	BOOST_REQUIRE_EQUAL(fuse->release("/test", &fi), 0);
 }
 
+BOOST_AUTO_TEST_SUITE_END();
+
 BOOST_AUTO_TEST_CASE( testNoAuthNoPass )
 {
 	Core c("defaultDaemon.xml", "defaultFuse.xml");
-- 
cgit v1.2.3