@@ -132,6 +132,7 @@ void ResultsTest::testSpecialIcons_data()
132 QTest::addColumn<GVariantWrapper>("metadata");
132 QTest::addColumn<GVariantWrapper>("metadata");
133 QTest::addColumn<QString>("result");
133 QTest::addColumn<QString>("result");
135 GVariantBuilder builder, inner_builder;
136 GVariantBuilder builder, inner_builder;
137 g_variant_builder_init(&inner_builder, G_VARIANT_TYPE_VARDICT);
138 g_variant_builder_init(&inner_builder, G_VARIANT_TYPE_VARDICT);
@@ -146,11 +147,25 @@ void ResultsTest::testSpecialIcons_data()
146 g_variant_builder_init(&inner_builder, G_VARIANT_TYPE_VARDICT);
147 g_variant_builder_init(&inner_builder, G_VARIANT_TYPE_VARDICT);
147 g_variant_builder_add(&inner_builder, "{sv}", "artist", g_variant_new_string("U2"));
148 g_variant_builder_add(&inner_builder, "{sv}", "artist", g_variant_new_string("U2"));
148 g_variant_builder_add(&inner_builder, "{sv}", "album", g_variant_new_string("War/Joshua tree"));
149 g_variant_builder_add(&inner_builder, "{sv}", "album", g_variant_new_string("War/Joshua tree"));
150+ inner = g_variant_builder_end(&inner_builder);
150 g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
152 g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
151− g_variant_builder_add(&builder, "{sv}", "content", g_variant_builder_end(&inner_builder));
153+ g_variant_builder_add(&builder, "{sv}", "content", inner);
153 QTest::newRow("with-slash") << "file:///foo.mp3" << GVariantWrapper(g_variant_builder_end(&builder)) << "image://albumart/U2/War%2FJoshua%20tree";
155 QTest::newRow("with-slash") << "file:///foo.mp3" << GVariantWrapper(g_variant_builder_end(&builder)) << "image://albumart/U2/War%2FJoshua%20tree";
157+ g_variant_builder_init(&inner_builder, G_VARIANT_TYPE_VARDICT);
158+ g_variant_builder_add(&inner_builder, "{sv}", "artist", g_variant_new_string("U2"));
159+ g_variant_builder_add(&inner_builder, "{sv}", "album", g_variant_new_string("War"));
160+ inner = g_variant_builder_end(&inner_builder);
162+ g_variant_builder_init(&inner_builder, G_VARIANT_TYPE_VARDICT);
163+ g_variant_builder_add(&inner_builder, "{sv}", "content", inner);
165+ g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
166+ g_variant_builder_add(&builder, "{sv}", "content", g_variant_builder_end(&inner_builder));
168+ QTest::newRow("nested") << "file:///foo.mp3" << GVariantWrapper(g_variant_builder_end(&builder)) << "image://albumart/U2/War";
156void ResultsTest::testSpecialIcons()
171void ResultsTest::testSpecialIcons()