Changeset 6997fa for molecuilder/src/unittests/ObserverTest.cpp

Timestamp:

Feb 2, 2010, 12:00:19 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

795b4d

Parents:

03d7ac

git-author:

Tillmann Crueger <crueger@…> (01/21/10 14:01:16)

git-committer:

Tillmann Crueger <crueger@…> (02/02/10 12:00:19)

Message:

Added a view that displays all molecules using a QTableWidget

File:

• molecuilder/src/unittests/ObserverTest.cpp (modified) (4 diffs)

molecuilder/src/unittests/ObserverTest.cpp

@@ -86 +86 @@
 
 void ObserverTest::setUp() {
-  simpleObservable = new  SimpleObservable();
+  simpleObservable1 = new SimpleObservable();
+  simpleObservable2 = new SimpleObservable();
   callObservable = new CallObservable();
   superObservable = new SuperObservable();
@@ -93 +94 @@
   observer2 = new UpdateCountObserver();
   observer3 = new UpdateCountObserver();
+  observer4 = new UpdateCountObserver();
 }
 
 void ObserverTest::tearDown() {
-  delete simpleObservable;
+  delete simpleObservable1;
+  delete simpleObservable2;
   delete callObservable;
   delete superObservable;
@@ -103 +106 @@
   delete observer2;
   delete observer3;
+  delete observer4;
 }
 
 void ObserverTest::doesUpdateTest()
 {
-  simpleObservable->signOn(observer1);
-  simpleObservable->signOn(observer2);
-  simpleObservable->signOn(observer3);
-
-  simpleObservable->changeMethod();
+  simpleObservable1->signOn(observer1);
+  simpleObservable1->signOn(observer2);
+  simpleObservable1->signOn(observer3);
+  simpleObservable2->signOn(observer2);
+  simpleObservable2->signOn(observer4);
+
+  simpleObservable1->changeMethod();
   CPPUNIT_ASSERT_EQUAL( 1, observer1->updates );
   CPPUNIT_ASSERT_EQUAL( 1, observer2->updates );
   CPPUNIT_ASSERT_EQUAL( 1, observer3->updates );
-
-  simpleObservable->signOff(observer3);
-
-  simpleObservable->changeMethod();
+  CPPUNIT_ASSERT_EQUAL( 0, observer4->updates );
+
+  simpleObservable1->signOff(observer3);
+
+  simpleObservable1->changeMethod();
   CPPUNIT_ASSERT_EQUAL( 2, observer1->updates );
   CPPUNIT_ASSERT_EQUAL( 2, observer2->updates );
   CPPUNIT_ASSERT_EQUAL( 1, observer3->updates );
+  CPPUNIT_ASSERT_EQUAL( 0, observer4->updates );
+
+  simpleObservable2->changeMethod();
+  CPPUNIT_ASSERT_EQUAL( 2, observer1->updates );
+  CPPUNIT_ASSERT_EQUAL( 3, observer2->updates );
+  CPPUNIT_ASSERT_EQUAL( 1, observer3->updates );
+  CPPUNIT_ASSERT_EQUAL( 1, observer4->updates );
 }
 
@@ -155 +169 @@
   cout << "If this test does not complete in a few seconds, kill the test-suite and fix the Error in the circle detection mechanism" << endl;
 
-  cout << endl << endl << "The following error displayed by the observer framwork can be ignored" << endl;
+  cout << endl << endl << "The following errors displayed by the observer framework can be ignored" << endl;
 
   // make this Observable its own subject. NEVER DO THIS IN ACTUAL CODE
-  simpleObservable->signOn(simpleObservable);
-  simpleObservable->changeMethod();
+  simpleObservable1->signOn(simpleObservable1);
+  simpleObservable1->changeMethod();
+
+  // more complex test
+  simpleObservable1->signOff(simpleObservable1);
+  simpleObservable1->signOn(simpleObservable2);
+  simpleObservable2->signOn(simpleObservable1);
+  simpleObservable1->changeMethod();
+  simpleObservable1->signOff(simpleObservable2);
+  simpleObservable2->signOff(simpleObservable1);
   // when we reach this line, although we broke the DAG assumption the circle check works fine
   CPPUNIT_ASSERT(true);