← Back to branch summary

~compiz-team/compiz/compiz.fix_1041310

« back to all changes in this revision

Viewing changes to compizconfig/gsettings/tests/test_gsettings_tests.cpp

Make valgrind shut up about some known "leaks" in python and glib.
Fix some leaks in the tests in the process.. Fixes: . Approved by Daniel van Vugt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
compizconfig/gsettings/tests/test_gsettings_tests.cpp
106
106
};
107
107
 
108
108
class CCSGSettingsTestVariantTypeFixture :
109
 
    public ::testing::TestWithParam <CCSTypeIsVariantType>
 
109
    public ::testing::TestWithParam <CCSTypeIsVariantType>,
 
110
    public CCSGSettingsTestingEnv
110
111
{
111
112
    public:
112
113
 
113
114
        virtual void SetUp ()
114
115
        {
 
116
            CCSGSettingsTestingEnv::SetUpEnv ();
115
117
            mType = GetParam ();
116
118
        }
117
119
 
 
120
        virtual void TearDown ()
 
121
        {
 
122
            CCSGSettingsTestingEnv::TearDownEnv ();
 
123
        }
 
124
 
 
125
 
118
126
    protected:
119
127
 
120
128
        CCSTypeIsVariantType mType;
293
301
}
294
302
 
295
303
class CCSGSettingsTestArrayVariantSubTypeFixture :
296
 
    public ::testing::TestWithParam <ArrayVariantInfo>
 
304
    public ::testing::TestWithParam <ArrayVariantInfo>,
 
305
    public CCSGSettingsTestingEnv
297
306
{
298
307
    public:
299
308
 
300
309
        virtual void SetUp ()
301
310
        {
 
311
            CCSGSettingsTestingEnv::SetUpEnv ();
302
312
            mAVInfo = GetParam ();
303
313
        }
304
314
 
305
315
        virtual void TearDown ()
306
316
        {
 
317
            CCSGSettingsTestingEnv::TearDownEnv ();
307
318
            g_variant_unref (v);
308
319
        }
309
320
 
365
376
 
366
377
        virtual void SetUp ()
367
378
        {
368
 
            builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
369
 
 
370
 
            g_variant_builder_add (builder, "s", "foo");
371
 
            g_variant_builder_add (builder, "s", "bar");
372
 
 
373
 
            writtenPlugins = g_variant_new ("as", builder);
374
 
 
375
 
            g_variant_builder_unref (builder);
 
379
            CCSGSettingsTestIndependent::SetUp ();
 
380
            GVariantBuilder builder;
 
381
 
 
382
            g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
 
383
 
 
384
            g_variant_builder_add (&builder, "s", "foo");
 
385
            g_variant_builder_add (&builder, "s", "bar");
 
386
 
 
387
            writtenPlugins = g_variant_builder_end (&builder);
376
388
 
377
389
            newWrittenPlugins = NULL;
378
390
            newWrittenPluginsSize = 0;
382
394
        {
383
395
            g_variant_unref (writtenPlugins);
384
396
            g_strfreev (newWrittenPlugins);
 
397
            CCSGSettingsTestIndependent::TearDown ();
385
398
        }
386
399
 
387
400
    protected:
425
438
 
426
439
        virtual void SetUp ()
427
440
        {
 
441
            CCSGSettingsTestIndependent::SetUp ();
428
442
            g_type_init ();
429
443
 
430
444
            objectSchemaList = NULL;
442
456
 
443
457
            g_list_free (objectSchemaList);
444
458
            objectSchemaList = NULL;
 
459
            CCSGSettingsTestIndependent::TearDown ();
445
460
        }
446
461
 
447
462
        CCSGSettingsWrapGSettings * AddObjectWithSchemaName (const std::string &schemaName)
479
494
 
480
495
        virtual void SetUp ()
481
496
        {
 
497
            CCSGSettingsTestIndependent::SetUp ();
482
498
            settingList = NULL;
483
499
        }
484
500
 
486
502
        {
487
503
            ccsSettingListFree (settingList, TRUE);
488
504
            settingList = NULL;
 
505
            CCSGSettingsTestIndependent::TearDown ();
489
506
        }
490
507
 
491
508
        CCSSetting * AddMockSettingWithNameAndType (char              *name,
726
743
 
727
744
            typedef boost::function <GList * (void)> PopulateFunc;
728
745
 
729
 
            GListContainerEqualityBase (const PopulateFunc &populateGList) :
730
 
                mList (populateGList ())
 
746
            GListContainerEqualityBase (const PopulateFunc &populateGList)
731
747
            {
 
748
                setenv ("G_SLICE", "always-malloc", 1);
 
749
                mList = populateGList ();
 
750
                unsetenv ("G_SLICE");
732
751
            }
733
752
 
734
753
            GListContainerEqualityBase (const GListContainerEqualityBase &other) :
845
864
}
846
865
 
847
866
class CCSGSettingsTestVariantTypeToCCSTypeListFixture :
848
 
    public ::testing::TestWithParam <GListContainerVariantTypeWrapper>
 
867
    public ::testing::TestWithParam <GListContainerVariantTypeWrapper>,
 
868
    public CCSGSettingsTestingEnv
849
869
{
850
870
    public:
851
871
 
854
874
        {
855
875
        }
856
876
 
 
877
        virtual void SetUp ()
 
878
        {
 
879
            CCSGSettingsTestingEnv::SetUpEnv ();
 
880
        }
 
881
 
 
882
        virtual void TearDown ()
 
883
        {
 
884
            CCSGSettingsTestingEnv::TearDownEnv ();
 
885
        }
 
886
 
857
887
    protected:
858
888
 
859
889
        GListContainerVariantTypeWrapper mListContainer;