menu/application: Remove singleton.

The singleton pattern should not be used in most cases, because it
behaves like global variables.

1 files changed, 9 insertions, 18 deletions

diff --git a/test/menu/application.cpp b/test/menu/application.cpp
index 20be3542..8a14644a 100644
--- a/test/menu/application.cpp
+++ b/test/menu/application.cpp
@@ -41,38 +41,29 @@ namespace usdx
 	private:
 		static log4cpp::Category&  log;
 	public:
-		void setUp()
-		{
-			Application::get_instance();
-		}
-
-		void tearDown()
-		{
-			Application::free();
-		}
-
 		void testQuitBeforeRun()
 		{
 			Timestamp t;
 
-			Application::get_instance()->quit();
-			CPPUNIT_ASSERT_EQUAL(false, Application::get_instance()->is_running());
+			Application app;
+			app.quit();
+			CPPUNIT_ASSERT_EQUAL(false, app.is_running());
 			CPPUNIT_ASSERT_EQUAL(true, t.since(0.2));
 		}
 
 		void testNewInstance()
 		{
 			int fps;
+			Application app;
+			Application app2;
 
 			// change fps
-			fps = Application::get_instance()->get_frames_per_second();
-			Application::get_instance()->set_frames_per_second(fps + 23);
+			fps = app.get_frames_per_second();
+			app.set_frames_per_second(fps + 23);
 
-			// reset instance
-			Application::free();
 
-			// check if fps changed back
-			CPPUNIT_ASSERT_EQUAL(fps, Application::get_instance()->get_frames_per_second());
+			// check if other instance is independent
+			CPPUNIT_ASSERT_EQUAL(fps, app2.get_frames_per_second());
 		}
 	};