X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fintegration%2FStandaloneTest.cpp;h=0431b5778d3f9de636674bcd402c69fd377c3850;hb=8368621fd8996569e3ca8fc6fd68ac0168742392;hp=2e1b67d68c0d1010bbdeb02c34f167153753ee8d;hpb=3ff7bfeecf8ddc8d5b384683246a39bc05f9794d;p=blank.git diff --git a/tst/integration/StandaloneTest.cpp b/tst/integration/StandaloneTest.cpp index 2e1b67d..0431b57 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" })); + instance->AssertRunning(); } void StandaloneTest::tearDown() { - + std::unique_ptr inst(std::move(instance)); + if (inst) { + inst->Terminate(); + inst->AssertNoOutput(); + inst->AssertNoError(); + inst->AssertExitStatus(0); + } } void StandaloneTest::testStartup() { - TestInstance standalone({ }); - 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"); } }