diff options
| author | Garrett Regier <garrettregier@gmail.com> | 2015-11-21 20:07:03 -0800 |
|---|---|---|
| committer | Garrett Regier <garrettregier@gmail.com> | 2015-12-15 16:57:46 -0800 |
| commit | fd59261b2f7e7ca7330e9891ed76681f1ba498dc (patch) | |
| tree | e6768af1a7c0135692919cb8213e479392b50c47 /tests | |
| parent | fb7e9a509af15f880f4cb495a834b23d808a193d (diff) | |
| download | libpeas-fd59261b2f7e7ca7330e9891ed76681f1ba498dc.tar.gz | |
Keep PeasEngine:plugin-list better ordered
This is less confusing that the prior way of ordering.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libpeas/engine.c | 6 | ||||
| -rw-r--r-- | tests/libpeas/plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/libpeas/plugins/two-deps.plugin (renamed from tests/plugins/two-deps.plugin) | 2 | ||||
| -rw-r--r-- | tests/plugins/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/testing-util/testing-util.c | 10 |
5 files changed, 7 insertions, 17 deletions
diff --git a/tests/libpeas/engine.c b/tests/libpeas/engine.c index 8b297b9..26bdc43 100644 --- a/tests/libpeas/engine.c +++ b/tests/libpeas/engine.c @@ -286,9 +286,9 @@ test_engine_plugin_list (PeasEngine *engine) /* Verify that we are finding the furthest dependency in the list */ dependencies = peas_plugin_info_get_dependencies (two_deps_info); - g_assert_cmpint (loadable_index, <, builtin_index); - g_assert_cmpstr (dependencies[0], ==, "loadable"); - g_assert_cmpstr (dependencies[1], ==, "builtin"); + g_assert_cmpint (builtin_index, <, loadable_index); + g_assert_cmpstr (dependencies[0], ==, "builtin"); + g_assert_cmpstr (dependencies[1], ==, "loadable"); /* The two-deps plugin should be ordered after builtin and loadable */ g_assert_cmpint (builtin_index, <, two_deps_index); diff --git a/tests/libpeas/plugins/Makefile.am b/tests/libpeas/plugins/Makefile.am index 5db17a9..cb35f85 100644 --- a/tests/libpeas/plugins/Makefile.am +++ b/tests/libpeas/plugins/Makefile.am @@ -25,6 +25,7 @@ noinst_PLUGIN = \ nonexistent-dep.plugin \ not-loadable.plugin \ os-dependant-help.plugin \ + two-deps.plugin \ unkown-loader.plugin EXTRA_DIST = $(noinst_PLUGIN) diff --git a/tests/plugins/two-deps.plugin b/tests/libpeas/plugins/two-deps.plugin index b463a82..0231c27 100644 --- a/tests/plugins/two-deps.plugin +++ b/tests/libpeas/plugins/two-deps.plugin @@ -1,6 +1,6 @@ [Plugin] Module=two-deps -Depends=loadable;builtin +Depends=builtin;loadable Name=Two Deps Description=This plugin cannot be loaded and has two deps. Authors=Garrett Regier diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index cd5b8cd..d0cb6ba 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -7,9 +7,8 @@ SUBDIRS = \ self-dep noinst_PLUGIN = \ - full-info.plugin \ - min-info.plugin \ - two-deps.plugin \ + full-info.plugin \ + min-info.plugin \ unavailable.plugin EXTRA_DIST = $(noinst_PLUGIN) diff --git a/tests/testing-util/testing-util.c b/tests/testing-util/testing-util.c index 5229945..4763e46 100644 --- a/tests/testing-util/testing-util.c +++ b/tests/testing-util/testing-util.c @@ -249,16 +249,6 @@ testing_util_engine_new_full (gboolean nonglobal_loaders) (GWeakNotify) engine_weak_notify, NULL); - /* The plugins that two-deps depends on must be added - * to the engine before it. This is used to verify that - * the engine will order the plugin list correctly. - */ - peas_engine_add_search_path (engine, - BUILDDIR "/tests/plugins/builtin", - SRCDIR "/tests/plugins/builtin"); - peas_engine_add_search_path (engine, - BUILDDIR "/tests/plugins/loadable", - SRCDIR "/tests/plugins/loadable"); peas_engine_add_search_path (engine, BUILDDIR "/tests/plugins", SRCDIR "/tests/plugins"); |