X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fintegration%2FStandaloneTest.cpp;h=5426b59316e3a0ae678f2c3d86f9a6bb0a723705;hb=fd547423c46412f24fa5ca4ccbb55129ef06ba08;hp=6ad5f77fdcc1957470b424106745d7d9955a0d87;hpb=f85083db1989c218d91a09f43dd92fde9fb179c7;p=blank.git

diff --git a/tst/integration/StandaloneTest.cpp b/tst/integration/StandaloneTest.cpp
index 6ad5f77..5426b59 100644
--- a/tst/integration/StandaloneTest.cpp
+++ b/tst/integration/StandaloneTest.cpp
@@ -2,29 +2,31 @@
 
 #include "TestInstance.hpp"
 
-CPPUNIT_TEST_SUITE_REGISTRATION(blank::test::StandaloneTest);
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(blank::test::StandaloneTest, "headed");
 
 
 namespace blank {
 namespace test {
 
 void StandaloneTest::setUp() {
-
+	instance.reset(new TestInstance({ "--standalone", "--no-vsync", "-d", "-s", "43576325" }));
+	instance->AssertRunning();
 }
 
 void StandaloneTest::tearDown() {
-
+	std::unique_ptr<TestInstance> inst(std::move(instance));
+	if (inst) {
+		inst->Terminate();
+		inst->AssertNoOutput();
+		inst->AssertNoError();
+		inst->AssertExitStatus(0);
+	}
 }
 
 
 void StandaloneTest::testStartup() {
-	TestInstance standalone({ "--no-vsync" });
-	standalone.AssertRunning();
-	standalone.AssertOutputLine("chunk preloading complete");
-	standalone.Terminate();
-	standalone.AssertExitStatus(0);
-	// can't do that because AL blurts out nonsense
-	//standalone.AssertNoError();
+	instance->AssertOutputLine("chunk preloading complete");
 }
 
 }