View | Details | Raw Unified | Return to bug 2251
Collapse All | Expand All

(-)a/src/core/test/callback-test-suite.cc (-4 / +18 lines)
 Lines 641-657   void Link Here 
641
MakeCallbackTemplatesTestCase::DoRun (void)
641
MakeCallbackTemplatesTestCase::DoRun (void)
642
{
642
{
643
  CallbackTestClass that;
643
  CallbackTestClass that;
644
  Callback<void,int> emptyCb = MakeNullCallback<void, int>();
645
646
  Callback<void> t0 = MakeCallback (&CallbackTestClass::TestZero, &that);
647
  Callback<void> t02 = MakeCallback (&CallbackTestClass::TestZero, &that);
648
  Callback<void,int> t1 = MakeCallback (&CallbackTestClass::TestOne, &that);
644
649
645
  MakeCallback (&CallbackTestClass::TestZero, &that);
646
  MakeCallback (&CallbackTestClass::TestOne, &that);
647
  MakeCallback (&CallbackTestClass::TestTwo, &that);
650
  MakeCallback (&CallbackTestClass::TestTwo, &that);
648
  MakeCallback (&CallbackTestClass::TestThree, &that);
651
  MakeCallback (&CallbackTestClass::TestThree, &that);
649
  MakeCallback (&CallbackTestClass::TestFour, &that);
652
  MakeCallback (&CallbackTestClass::TestFour, &that);
650
  MakeCallback (&CallbackTestClass::TestFive, &that);
653
  MakeCallback (&CallbackTestClass::TestFive, &that);
651
  MakeCallback (&CallbackTestClass::TestSix, &that);
654
  MakeCallback (&CallbackTestClass::TestSix, &that);
652
655
653
  MakeCallback (&CallbackTestClass::TestCZero, &that);
656
  Callback<void> c0 = MakeCallback (&CallbackTestClass::TestCZero, &that);
654
  MakeCallback (&CallbackTestClass::TestCOne, &that);
657
  Callback<void, int> c1 = MakeCallback (&CallbackTestClass::TestCOne, &that);
655
  MakeCallback (&CallbackTestClass::TestCTwo, &that);
658
  MakeCallback (&CallbackTestClass::TestCTwo, &that);
656
  MakeCallback (&CallbackTestClass::TestCThree, &that);
659
  MakeCallback (&CallbackTestClass::TestCThree, &that);
657
  MakeCallback (&CallbackTestClass::TestCFour, &that);
660
  MakeCallback (&CallbackTestClass::TestCFour, &that);
 Lines 686-691   MakeCallbackTemplatesTestCase::DoRun (void) Link Here 
686
  MakeBoundCallback (&TestFRFive, 1);
689
  MakeBoundCallback (&TestFRFive, 1);
687
690
688
  that.CheckParentalRights ();
691
  that.CheckParentalRights ();
692
693
  NS_TEST_ASSERT_MSG_EQ(emptyCb.CheckType(t0), false, "These 2 callbacks should not appear as equivalent");
694
695
  NS_TEST_ASSERT_MSG_EQ(t1.CheckType(emptyCb), true, "These 2 callbacks should appear as equivalent");
696
697
  NS_TEST_ASSERT_MSG_EQ(t0.CheckType(emptyCb), false, "These 2 callbacks should not appear as equivalent");
698
  NS_TEST_ASSERT_MSG_EQ(t0.CheckType(t1), false, "These 2 callbacks should not appear as equivalent");
699
  NS_TEST_ASSERT_MSG_EQ(c0.CheckType(c1), false, "These 2 callbacks should not appear as equivalent");
700
701
  NS_TEST_ASSERT_MSG_EQ(emptyCb.CheckType(t1), true, "These 2 callbacks should appear as equivalent");
702
  NS_TEST_ASSERT_MSG_EQ(t0.CheckType(t02), true, "These 2 callbacks should appear as equivalent");
689
}
703
}
690
704
691
// ===========================================================================
705
// ===========================================================================

Return to bug 2251