[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/rempt/impex-refactoring] plugins/impex/libkra/tests: Fix memory leak asserts in KisKraSaverTe
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2016-11-09 11:00:03
Message-ID: E1c4Qbr-0005yj-5M () code ! kde ! org
[Download RAW message or body]

Git commit 89bedcd421f5dcc10d963f3375f48ce04a7f9f28 by Dmitry Kazakov.
Committed on 09/11/2016 at 10:41.
Pushed by dkazakov into branch 'rempt/impex-refactoring'.

Fix memory leak asserts in KisKraSaverTest

M  +9    -6    plugins/impex/libkra/tests/kis_kra_saver_test.cpp

http://commits.kde.org/krita/89bedcd421f5dcc10d963f3375f48ce04a7f9f28

diff --git a/plugins/impex/libkra/tests/kis_kra_saver_test.cpp \
b/plugins/impex/libkra/tests/kis_kra_saver_test.cpp index 1312207..f3c5f66 100644
--- a/plugins/impex/libkra/tests/kis_kra_saver_test.cpp
+++ b/plugins/impex/libkra/tests/kis_kra_saver_test.cpp
@@ -95,10 +95,10 @@ void KisKraSaverTest::testRoundTrip()
     QCOMPARE(doc2->image()->defaultProjectionColor(), bgColor);
 
     // test round trip of a transform mask
-    KisNodeSP tnode =
-        TestUtil::findNode(doc2->image()->rootLayer(), "testTransformMask");
+    KisNode* tnode =
+        TestUtil::findNode(doc2->image()->rootLayer(), "testTransformMask").data();
     QVERIFY(tnode);
-    KisTransformMask *tmask = dynamic_cast<KisTransformMask*>(tnode.data());
+    KisTransformMask *tmask = dynamic_cast<KisTransformMask*>(tnode);
     QVERIFY(tmask);
     KisDumbTransformMaskParams *params = \
dynamic_cast<KisDumbTransformMaskParams*>(tmask->transformParams().data());  \
QVERIFY(params); @@ -140,10 +140,12 @@ void testRoundTripFillLayerImpl(const QString \
&testName, KisFilterConfigurationS  {
     TestUtil::ExternalImageChecker chk(testName, "fill_layer");
 
+    QScopedPointer<KisDocument> doc(KisPart::instance()->createDocument());
+
+    // mask parent should be destructed before the document!
     QRect refRect(0,0,512,512);
     TestUtil::MaskParent p(refRect);
 
-    QScopedPointer<KisDocument> doc(KisPart::instance()->createDocument());
     doc->setCurrentImage(p.image);
     doc->documentInfo()->setAboutInfo("title", p.image->objectName());
 
@@ -158,7 +160,6 @@ void testRoundTripFillLayerImpl(const QString &testName, \
KisFilterConfigurationS  
     doc->exportDocument(QUrl::fromLocalFile("roundtrip_fill_layer_test.kra"));
 
-
     QScopedPointer<KisDocument> doc2(KisPart::instance()->createDocument());
     doc2->loadNativeFormat("roundtrip_fill_layer_test.kra");
 
@@ -211,6 +212,9 @@ void KisKraSaverTest::testRoundTripLayerStyles()
 
     QRect imageRect(0,0,512,512);
 
+    // the document should be created before the image!
+    QScopedPointer<KisDocument> doc(KisPart::instance()->createDocument());
+
     const KoColorSpace * cs = KoColorSpaceRegistry::instance()->rgb8();
     KisImageSP image = new KisImage(new KisSurrogateUndoStore(), imageRect.width(), \
                imageRect.height(), cs, "test image");
     KisPaintLayerSP layer1 = new KisPaintLayer(image, "paint1", OPACITY_OPAQUE_U8);
@@ -220,7 +224,6 @@ void KisKraSaverTest::testRoundTripLayerStyles()
     image->addNode(layer2);
     image->addNode(layer3);
 
-    QScopedPointer<KisDocument> doc(KisPart::instance()->createDocument());
     doc->setCurrentImage(image);
     doc->documentInfo()->setAboutInfo("title", image->objectName());
 


[prev in list] [next in list] [prev in thread] [next in thread]