test_retype: Break into smaller tests.

murraycu · murraycu · commit 9f6ecb3c5f9d · 2016-03-16T12:32:07.000+01:00
diff --git a/tests/test_retype.cc b/tests/test_retype.cc
@@ -10,6 +10,8 @@
 
 namespace
 {
+
+TestUtilities* util = nullptr;
 std::ostringstream result_stream;
 
 struct foo : public sigc::trackable
@@ -32,40 +34,76 @@ void bar(short s)
   result_stream << "bar(short " << s << ")";
 }
 
-} // end anonymous namespace
-
-int main(int argc, char* argv[])
+void test_member_int()
 {
-  auto util = TestUtilities::get_instance();
-
-  if (!util->check_command_args(argc, argv))
-    return util->get_result_and_delete_instance() ? EXIT_SUCCESS : EXIT_FAILURE;
-
   foo foo_;
   result_stream << sigc::retype(sigc::mem_fun(foo_, &foo::test_int))(1.234f);
   util->check_result(result_stream, "foo::test_int(int 1) 1.5");
+}
 
+void test_member_float()
+{
+  foo foo_;
   result_stream << sigc::retype(sigc::mem_fun(foo_, &foo::test_float))(5);
   util->check_result(result_stream, "foo::test_float(float 5) 25");
+}
 
+void test_ptr_fun()
+{
   sigc::retype(sigc::ptr_fun(&bar))(6.789f);
   util->check_result(result_stream, "bar(short 6)");
+}
 
+void test_member_int_with_slot()
+{
+  foo foo_;
   sigc::slot<float,float> s1 = sigc::retype(sigc::mem_fun(foo_, &foo::test_int));
-  sigc::slot<float,int>   s2 = sigc::retype(sigc::mem_fun(foo_, &foo::test_float));
-  sigc::slot<void,double> s3 = sigc::retype(sigc::ptr_fun(&bar));
   result_stream << s1(1.234f);
   util->check_result(result_stream, "foo::test_int(int 1) 1.5");
+}
 
+void test_member_float_with_slot()
+{
+  foo foo_;
+  sigc::slot<float,int> s2 = sigc::retype(sigc::mem_fun(foo_, &foo::test_float));
   result_stream << s2(5);
   util->check_result(result_stream, "foo::test_float(float 5) 25");
+}
 
+void test_ptr_fun_with_slot()
+{
+  sigc::slot<void,double> s3 = sigc::retype(sigc::ptr_fun(&bar));
   s3(6.789);
   util->check_result(result_stream, "bar(short 6)");
+}
 
-  s2 = sigc::retype(s1);
+void test_retype_slot()
+{
+  foo foo_;
+  sigc::slot<float,float> s1 = sigc::retype(sigc::mem_fun(foo_, &foo::test_int));
+  sigc::slot<float,int> s2 = sigc::retype(s1);
   result_stream << s2(5);
   util->check_result(result_stream, "foo::test_int(int 5) 7.5");
+}
+
+} // end anonymous namespace
+
+int main(int argc, char* argv[])
+{
+  util = TestUtilities::get_instance();
+
+  if (!util->check_command_args(argc, argv))
+    return util->get_result_and_delete_instance() ? EXIT_SUCCESS : EXIT_FAILURE;
+
+  test_member_int();
+  test_member_float();
+  test_ptr_fun();
+
+  test_member_int_with_slot();
+  test_member_float_with_slot();
+  test_ptr_fun_with_slot();
+
+  test_retype_slot();
 
   return util->get_result_and_delete_instance() ? EXIT_SUCCESS : EXIT_FAILURE;
 }
