X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fintegration%2FStandaloneTest.cpp;h=240777509a739d58931acf21c5600a9197412545;hb=e927325f8b92c0d03c87fed77118f8e55df1b0c9;hp=6ad5f77fdcc1957470b424106745d7d9955a0d87;hpb=f85083db1989c218d91a09f43dd92fde9fb179c7;p=blank.git diff --git a/tst/integration/StandaloneTest.cpp b/tst/integration/StandaloneTest.cpp index 6ad5f77..2407775 100644 --- a/tst/integration/StandaloneTest.cpp +++ b/tst/integration/StandaloneTest.cpp @@ -2,29 +2,28 @@ #include "TestInstance.hpp" -CPPUNIT_TEST_SUITE_REGISTRATION(blank::test::StandaloneTest); + +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(blank::test::StandaloneTest, "integration"); namespace blank { namespace test { void StandaloneTest::setUp() { - + instance.reset(new TestInstance({ "--no-vsync" })); + instance->AssertRunning(); } void StandaloneTest::tearDown() { - + std::unique_ptr inst(std::move(instance)); + inst->Terminate(); + inst->AssertExitStatus(0); + inst->AssertNoError(); } 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"); } }