test missing option arguments

[blank.git] / tst / integration / StandaloneTest.cpp

diff --git a/tst/integration/StandaloneTest.cpp b/tst/integration/StandaloneTest.cpp
index 6ad5f77fdcc1957470b424106745d7d9955a0d87..0431b5778d3f9de636674bcd402c69fd377c3850 100644 (file)
--- 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" }));
+       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");
 }
 
 }