Added JSON-RPC over WebSocket.

Wslay library must be placed under deps/wslay.

1 files changed, 12 insertions, 19 deletions

diff --git a/test/SingletonHolderTest.cc b/test/SingletonHolderTest.cc
index b2dc2c84..cb62bf4d 100644
--- a/test/SingletonHolderTest.cc
+++ b/test/SingletonHolderTest.cc
@@ -1,8 +1,11 @@
 #include "SingletonHolder.h"
-#include "SharedHandle.h"
+
 #include <iostream>
+
 #include <cppunit/extensions/HelperMacros.h>
 
+#include "SharedHandle.h"
+
 namespace aria2 {
 
 class SingletonHolderTest : public CppUnit::TestFixture {
@@ -35,26 +38,16 @@ public:
   }
 };
 
-typedef SharedHandle<M> MHandle;
-typedef SharedHandle<int> IntHandle;
-
 void SingletonHolderTest::testInstance()
 {
-  MHandle m(new M("Hello world."));
-  SingletonHolder<MHandle>::instance(m);
-
-  std::cerr << SingletonHolder<MHandle>::instance()->greeting() << std::endl;
-
-  SingletonHolder<MHandle>::instance()->greeting("Yes, it worked!");
-
-  std::cerr << SingletonHolder<MHandle>::instance()->greeting() << std::endl;
-
-  IntHandle i(new int(100));
-  SingletonHolder<IntHandle>::instance(i);
-  std::cerr << *SingletonHolder<IntHandle>::instance() << std::endl;
-
-  std::cerr << SingletonHolder<MHandle>::instance()->greeting() << std::endl;
-
+  M m("Hello world.");
+  SingletonHolder<M>::instance(&m);
+  CPPUNIT_ASSERT_EQUAL(std::string("Hello world."),
+                       SingletonHolder<M>::instance()->greeting());
+
+  SingletonHolder<M>::instance()->greeting("Yes, it worked!");
+  CPPUNIT_ASSERT_EQUAL(std::string("Yes, it worked!"),
+                       SingletonHolder<M>::instance()->greeting());
 }
 
 } // namespace aria2