ktutorial-commits

[<dan...@us...>]

Revision: 330
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=330&view=rev
Author:   danxuliu
Date:     2011-06-21 15:24:13 +0000 (Tue, 21 Jun 2011)

Log Message:
-----------
Fix memory leak in test.

Modified Paths:
--------------
    trunk/ktutorial/ktutorial-library/tests/WaitForStepActivationTest.cpp

Modified: trunk/ktutorial/ktutorial-library/tests/WaitForStepActivationTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/tests/WaitForStepActivationTest.cpp	2011-06-21 15:18:34 UTC (rev 329)
+++ trunk/ktutorial/ktutorial-library/tests/WaitForStepActivationTest.cpp	2011-06-21 15:24:13 UTC (rev 330)
@@ -132,26 +132,26 @@
     Step* startStep = new Step("start");
     tutorial.addStep(startStep);
 
-    WaitForStepActivation* waitForStepActivation =
-                                new WaitForStepActivation(&tutorial, startStep);
-    waitForStepActivation->setActive(true);
+    WaitForStepActivation waitForStepActivation(&tutorial, startStep);
+    waitForStepActivation.setActive(true);
 
-    QVERIFY(!waitForStepActivation->conditionMet());
+    QVERIFY(!waitForStepActivation.conditionMet());
 
     //WaitFor* must be registered in order to be used with QSignalSpy
     int waitForStarType = qRegisterMetaType<WaitFor*>("WaitFor*");
-    QSignalSpy waitEndedSpy(waitForStepActivation, SIGNAL(waitEnded(WaitFor*)));
+    QSignalSpy waitEndedSpy(&waitForStepActivation,
+                            SIGNAL(waitEnded(WaitFor*)));
 
-    connect(waitForStepActivation, SIGNAL(waitEnded(WaitFor*)),
+    connect(&waitForStepActivation, SIGNAL(waitEnded(WaitFor*)),
             this, SLOT(assertConditionMet(WaitFor*)));
 
     tutorial.start();
 
-    QVERIFY(!waitForStepActivation->conditionMet());
+    QVERIFY(!waitForStepActivation.conditionMet());
     QCOMPARE(waitEndedSpy.count(), 1);
     QVariant argument = waitEndedSpy.at(0).at(0);
     QCOMPARE(argument.userType(), waitForStarType);
-    QCOMPARE(qvariant_cast<WaitFor*>(argument), waitForStepActivation);
+    QCOMPARE(qvariant_cast<WaitFor*>(argument), &waitForStepActivation);
 }
 
 //Should not happen, as WaitForStepActivation is meant to be used only with the
@@ -161,16 +161,16 @@
     Step* startStep = new Step("start");
     tutorial.addStep(startStep);
 
-    WaitForStepActivation* waitForStepActivation =
-                                new WaitForStepActivation(&tutorial, startStep);
+    WaitForStepActivation waitForStepActivation(&tutorial, startStep);
 
     //WaitFor* must be registered in order to be used with QSignalSpy
     qRegisterMetaType<WaitFor*>("WaitFor*");
-    QSignalSpy waitEndedSpy(waitForStepActivation, SIGNAL(waitEnded(WaitFor*)));
+    QSignalSpy waitEndedSpy(&waitForStepActivation,
+                            SIGNAL(waitEnded(WaitFor*)));
 
     tutorial.start();
 
-    QVERIFY(!waitForStepActivation->conditionMet());
+    QVERIFY(!waitForStepActivation.conditionMet());
     QCOMPARE(waitEndedSpy.count(), 0);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.