Cancellable: removed copies to not increase complexity, add Renew method instead

(bzr r3227.3.8)

1 files changed, 17 insertions, 37 deletions

diff --git a/tests/test_glib_cancellable.cpp b/tests/test_glib_cancellable.cpp
index 1f3cf3e3b..e2a57dc9d 100644
--- a/tests/test_glib_cancellable.cpp
+++ b/tests/test_glib_cancellable.cpp
@@ -70,61 +70,41 @@ TEST(TestGLibCancellable, Reset)
 cancellable.Cancel();
 ASSERT_TRUE(cancellable.IsCancelled());
 
+ auto obj = cancellable.Get();
 cancellable.Reset();
 EXPECT_FALSE(cancellable.IsCancelled());
+ EXPECT_EQ(obj, cancellable.Get());
 }
 
-TEST(TestGLibCancellable, OperatorGCancellable)
+TEST(TestGLibCancellable, Renew)
 {
 Cancellable cancellable;
 
- EXPECT_EQ(g_cancellable_is_cancelled(cancellable), cancellable.IsCancelled());
-
- g_cancellable_cancel(cancellable);
- EXPECT_EQ(g_cancellable_is_cancelled(cancellable), cancellable.IsCancelled());
-}
-
-TEST(TestGLibCancellable, CopyConstructor)
-{
- Cancellable cancellable1;
- auto obj1 = cancellable1.Get();
-
- Cancellable cancellable2(cancellable1);
- auto obj2 = cancellable2.Get();
-
- Cancellable cancellable3 = cancellable2;
- auto obj3 = cancellable2.Get();
+ cancellable.Cancel();
+ ASSERT_TRUE(cancellable.IsCancelled());
 
- EXPECT_EQ(obj1, obj2);
- EXPECT_EQ(obj1, obj3);
+ auto obj = cancellable.Get();
+ cancellable.Renew();
+ EXPECT_FALSE(cancellable.IsCancelled());
+ EXPECT_NE(obj, cancellable.Get());
 }
 
-TEST(TestGLibCancellable, Assignment)
+TEST(TestGLibCancellable, OperatorGCancellable)
 {
- Cancellable cancellable1;
- auto obj1 = cancellable1.Get();
-
- Cancellable cancellable2;
- auto tmp_obj = cancellable2.Get();
-
- cancellable2 = cancellable1;
- auto obj2 = cancellable2.Get();
+ Cancellable cancellable;
 
- EXPECT_TRUE(g_cancellable_is_cancelled(tmp_obj));
- ASSERT_EQ(obj1, obj2);
+ EXPECT_EQ(g_cancellable_is_cancelled(cancellable), cancellable.IsCancelled());
 
- cancellable2 = cancellable1;
- EXPECT_FALSE(g_cancellable_is_cancelled(obj1));
+ g_cancellable_cancel(cancellable);
+ EXPECT_EQ(g_cancellable_is_cancelled(cancellable), cancellable.IsCancelled());
 }
 
 TEST(TestGLibCancellable, Equality)
 {
- Cancellable cancellable1;
- Cancellable cancellable2 = cancellable1;
+ Cancellable cancellable;
 
- ASSERT_EQ(cancellable1, cancellable2);
- ASSERT_EQ(cancellable1.Get(), cancellable2);
- ASSERT_EQ(cancellable1.Get().RawPtr(), cancellable2);
+ ASSERT_EQ(cancellable.Get(), cancellable);
+ ASSERT_EQ(cancellable.Get().RawPtr(), cancellable);
 }
 
 TEST(TestGLibCancellable, NotEquality)