← Back to branch summary

~townsend/unity/fix-waiting-to-install

« back to all changes in this revision

Viewing changes to tests/test_glib_variant.cpp

  • Committer: Chris Townsend
  • Date: 2013-07-17 16:24:40 UTC
  • mfrom: (3379.1.48 trunk)
  • Revision ID: christopher.townsend@canonical.com-20130717162440-zbeyzlbq0kdvnypo
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_glib_variant.cpp
57
57
{
58
58
  Variant v (g_variant_new_string ("foo"));
59
59
 
60
 
  EXPECT_TRUE(IsVariant(v));
 
60
  ASSERT_TRUE(IsVariant(v));
61
61
  EXPECT_FALSE(IsFloating(v));
62
62
}
63
63
 
67
67
  g_variant_ref_sink (gv);
68
68
  Variant v (gv, StealRef());
69
69
 
70
 
  EXPECT_TRUE(IsVariant(v));
 
70
  ASSERT_TRUE(IsVariant(v));
71
71
  EXPECT_FALSE(IsFloating(v));
72
72
}
73
73
 
76
76
  Variant v1 (g_variant_new_string ("bar"));
77
77
  Variant v2 (v1);
78
78
 
79
 
  EXPECT_TRUE(IsVariant(v1));
80
 
  EXPECT_TRUE(IsVariant(v2));
 
79
  ASSERT_TRUE(IsVariant(v1));
 
80
  ASSERT_TRUE(IsVariant(v2));
81
81
  EXPECT_FALSE(IsFloating(v1));
82
82
  EXPECT_FALSE(IsFloating(v2));
83
83
  EXPECT_TRUE(IsSameVariant(v1, v2));
84
84
  EXPECT_TRUE(ValuesEqual(v1, v2));
85
85
}
86
86
 
 
87
TEST(TestGLibVariant, Assign)
 
88
{
 
89
  Variant v;
 
90
  GVariant *raw_variant = g_variant_new_string("bar");
 
91
  v = raw_variant;
 
92
 
 
93
  ASSERT_TRUE(IsVariant(v));
 
94
  EXPECT_FALSE(IsFloating(v));
 
95
  EXPECT_TRUE(IsSameVariant(v, raw_variant));
 
96
  EXPECT_TRUE(ValuesEqual(v, raw_variant));
 
97
}
 
98
 
 
99
TEST(TestGLibVariant, AssignSame)
 
100
{
 
101
  GVariant *raw_variant = g_variant_new_string("bar");
 
102
  Variant v(raw_variant);
 
103
  v = raw_variant;
 
104
 
 
105
  ASSERT_TRUE(IsVariant(v));
 
106
  EXPECT_FALSE(IsFloating(v));
 
107
  EXPECT_TRUE(IsSameVariant(v, raw_variant));
 
108
  EXPECT_TRUE(ValuesEqual(v, raw_variant));
 
109
}
 
110
 
87
111
TEST(TestGLibVariant, KeepsRef)
88
112
{
89
113
  GVariant *gv = g_variant_new_int32 (456);
91
115
 
92
116
  Variant v (gv);
93
117
 
94
 
  EXPECT_TRUE(IsVariant(v));
 
118
  ASSERT_TRUE(IsVariant(v));
95
119
  EXPECT_FALSE(IsFloating(v));
96
120
 
97
121
  g_variant_unref (gv);
98
122
 
99
 
  EXPECT_TRUE(IsVariant(v));
 
123
  ASSERT_TRUE(IsVariant(v));
100
124
  EXPECT_FALSE(IsFloating(v));
101
125
  EXPECT_EQ(v.GetInt32(), 456);
102
126
}
105
129
{
106
130
  Variant v (g_variant_new_int32 (123));
107
131
 
108
 
  EXPECT_TRUE(IsVariant(v));
 
132
  ASSERT_TRUE(IsVariant(v));
109
133
  EXPECT_FALSE(IsFloating(v));
110
134
  EXPECT_EQ(v.GetInt32(), 123);
111
135
 
132
156
  GVariant *dict_variant = g_variant_builder_end (&b);
133
157
  Variant dict (g_variant_new_tuple (&dict_variant, 1));
134
158
 
135
 
  EXPECT_TRUE(IsVariant(dict));
 
159
  ASSERT_TRUE(IsVariant(dict));
136
160
  EXPECT_FALSE(IsFloating(dict));
137
161
 
138
162
  HintsMap hints;
150
174
 
151
175
  // throw away all references to the original variant
152
176
  dict = g_variant_new_string ("bar");
153
 
  EXPECT_TRUE(IsVariant(dict));
 
177
  ASSERT_TRUE(IsVariant(dict));
154
178
  EXPECT_FALSE(IsFloating(dict));
155
179
  EXPECT_EQ(dict.GetString(), "bar");
156
180