[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-frameworks-devel
Subject: Re: Review Request 129657: Fix assert (in beginRemoveRows) when deselecting an empty child of a sele
From: Stephen Kelly <steveire () gmail ! com>
Date: 2016-12-16 2:55:15
Message-ID: 20161216025515.4515.65392 () mimi ! kde ! org
[Download RAW message or body]
--===============8069599160370815169==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/129657/#review101464
-----------------------------------------------------------
Ship it!
Thanks for working on this!
I noticed that I could remove the change in beginRemoveRows without any unit test \
failing.
Please add this test on top of your patch:
diff --git a/autotests/kselectionproxymodeltest.cpp \
b/autotests/kselectionproxymodeltest.cpp index e17fa53..68c8678 100644
--- a/autotests/kselectionproxymodeltest.cpp
+++ b/autotests/kselectionproxymodeltest.cpp
@@ -611,6 +611,13 @@ void KSelectionProxyModelTest::removeRows_data()
<< 1
<< QStringList{"9", "9"} << 2;
++testNumber;
+
+ QTest::newRow(QByteArray("test" + QByteArray::number(testNumber)).data())
+ << static_cast<int>(kspm_mode) << connectSelectionModelFirst << \
false + << QStringList{"6", "8", "11"} << 4
+ << 0
+ << QStringList{"8", "8"} << 4;
+ ++testNumber;
}
}
- Stephen Kelly
On Dec. 15, 2016, 11:15 p.m., David Faure wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/129657/
> -----------------------------------------------------------
>
> (Updated Dec. 15, 2016, 11:15 p.m.)
>
>
> Review request for KDE Frameworks and Stephen Kelly.
>
>
> Repository: kitemmodels
>
>
> Description
> -------
>
> After
> int proxyEndRemove = proxyStartRemove;
> proxyEndRemove += rc; was adding 0 (empty root)
> and then --proxyEndRemove; was making us end up with proxyEndRemove < \
> proxyStartRemove.
>
> Diffs
> -----
>
> autotests/kselectionproxymodeltest.cpp 483e7c42dabab6aa560622ff0418ee7f90363e15
> src/kselectionproxymodel.cpp 0f57c70f05d4cbde9b14f4257bff1365ef5443f6
>
> Diff: https://git.reviewboard.kde.org/r/129657/diff/
>
>
> Testing
> -------
>
> New unittest + unchecking calendar in korganizer no longer asserts.
>
>
> Thanks,
>
> David Faure
>
>
--===============8069599160370815169==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/129657/">https://git.reviewboard.kde.org/r/129657/</a>
</td>
</tr>
</table>
<br />
<p>
Ship it!
</p>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Thanks for working on this!</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">I noticed that I could \
remove the change in beginRemoveRows without any unit test failing. </p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Please add this test on top of your patch:</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">diff \
--git a/autotests/kselectionproxymodeltest.cpp \
b/autotests/kselectionproxymodeltest.cpp index e17fa53..68c8678 100644
--- a/autotests/kselectionproxymodeltest.cpp
+++ b/autotests/kselectionproxymodeltest.cpp
@@ -611,6 +611,13 @@ void KSelectionProxyModelTest::removeRows_data()
<< 1
<< QStringList{"9", "9"} << 2;
++testNumber;
+
+ QTest::newRow(QByteArray("test" + QByteArray::number(testNumber)).data())
+ << static_cast<int>(kspm_mode) << \
connectSelectionModelFirst << false + << \
QStringList{"6", "8", "11"} << 4 + << 0
+ << QStringList{"8", "8"} << 4;
+ ++testNumber;
}
}</p></pre>
<br />
<p>- Stephen Kelly</p>
<br />
<p>On December 15th, 2016, 11:15 p.m. UTC, David Faure wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for KDE Frameworks and Stephen Kelly.</div>
<div>By David Faure.</div>
<p style="color: grey;"><i>Updated Dec. 15, 2016, 11:15 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kitemmodels
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">After int proxyEndRemove = proxyStartRemove;
proxyEndRemove += rc; was adding 0 (empty root)
and then --proxyEndRemove; was making us end up with proxyEndRemove < \
proxyStartRemove.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">New unittest + unchecking calendar in korganizer no \
longer asserts.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>autotests/kselectionproxymodeltest.cpp <span style="color: \
grey">(483e7c42dabab6aa560622ff0418ee7f90363e15)</span></li>
<li>src/kselectionproxymodel.cpp <span style="color: \
grey">(0f57c70f05d4cbde9b14f4257bff1365ef5443f6)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/129657/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============8069599160370815169==--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic