test some more parameters

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

diff --git a/tst/integration/StandaloneTest.cpp b/tst/integration/StandaloneTest.cpp
index d008ec806ac1a99321463c02a015a851762ba6f3..5426b59316e3a0ae678f2c3d86f9a6bb0a723705 100644 (file)
--- a/tst/integration/StandaloneTest.cpp
+++ b/tst/integration/StandaloneTest.cpp
@@ -2,40 +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();
-       try {
-               standalone.AssertOutputLine("chunk preloading complete");
-               standalone.Terminate();
-       } catch (...) {
-               try {
-                       standalone.Terminate();
-               } catch (...) { }
-               std::string output;
-               standalone.ExhaustError(output);
-               CPPUNIT_ASSERT_EQUAL_MESSAGE(
-                       "process stderr",
-                       std::string(""), output);
-               CPPUNIT_FAIL("exception in runtime");
-       }
-       standalone.AssertExitStatus(0);
-       standalone.AssertNoError();
+       instance->AssertOutputLine("chunk preloading complete");
 }
 
 }