1 files changed, 42 insertions, 54 deletions

diff --git a/test/test_discovery.c b/test/test_discovery.c
index 2585959..7d38207 100644
--- a/test/test_discovery.c
+++ b/test/test_discovery.c
@@ -1,18 +1,5 @@
-/*
-  Copyright 2007-2020 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
+// Copyright 2007-2020 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
 
 #undef NDEBUG
 
@@ -39,58 +26,59 @@ static int discovery_plugin_found = 0;
 static void
 discovery_verify_plugin(const LilvTestEnv* env, const LilvPlugin* plugin)
 {
-	const LilvNode* value = lilv_plugin_get_uri(plugin);
-	if (lilv_node_equals(value, env->plugin1_uri)) {
-		const LilvNode* lib_uri = NULL;
-		assert(!lilv_node_equals(value, env->plugin2_uri));
-		discovery_plugin_found = 1;
-		lib_uri                = lilv_plugin_get_library_uri(plugin);
-		assert(lib_uri);
-		assert(lilv_node_is_uri(lib_uri));
-		assert(lilv_node_as_uri(lib_uri));
-		assert(strstr(lilv_node_as_uri(lib_uri), "foo" SHLIB_EXT));
-		assert(lilv_plugin_verify(plugin));
-	}
+  const LilvNode* value = lilv_plugin_get_uri(plugin);
+  if (lilv_node_equals(value, env->plugin1_uri)) {
+    const LilvNode* lib_uri = NULL;
+    assert(!lilv_node_equals(value, env->plugin2_uri));
+    discovery_plugin_found = 1;
+    lib_uri                = lilv_plugin_get_library_uri(plugin);
+    assert(lib_uri);
+    assert(lilv_node_is_uri(lib_uri));
+    assert(lilv_node_as_uri(lib_uri));
+    assert(strstr(lilv_node_as_uri(lib_uri), "foo" SHLIB_EXT));
+    assert(lilv_plugin_verify(plugin));
+  }
 }
 
 int
 main(void)
 {
-	LilvTestEnv* const env   = lilv_test_env_new();
-	LilvWorld* const   world = env->world;
+  LilvTestEnv* const env   = lilv_test_env_new();
+  LilvWorld* const   world = env->world;
 
-	if (start_bundle(env, SIMPLE_MANIFEST_TTL, plugin_ttl)) {
-		return 1;
-	}
+  if (create_bundle(env, "discovery.lv2", SIMPLE_MANIFEST_TTL, plugin_ttl)) {
+    return 1;
+  }
 
-	const LilvPlugins* plugins = lilv_world_get_all_plugins(world);
-	assert(lilv_plugins_size(plugins) > 0);
+  lilv_world_load_specifications(env->world);
+  lilv_world_load_bundle(env->world, env->test_bundle_uri);
 
-	const LilvPlugin* plug1 =
-	    lilv_plugins_get_by_uri(plugins, env->plugin1_uri);
+  const LilvPlugins* plugins = lilv_world_get_all_plugins(world);
+  assert(lilv_plugins_size(plugins) > 0);
 
-	const LilvPlugin* plug2 =
-	    lilv_plugins_get_by_uri(plugins, env->plugin2_uri);
+  const LilvPlugin* plug1 = lilv_plugins_get_by_uri(plugins, env->plugin1_uri);
 
-	assert(plug1);
-	assert(!plug2);
+  const LilvPlugin* plug2 = lilv_plugins_get_by_uri(plugins, env->plugin2_uri);
 
-	{
-		LilvNode* name = lilv_plugin_get_name(plug1);
-		assert(!strcmp(lilv_node_as_string(name), "Test plugin"));
-		lilv_node_free(name);
-	}
+  assert(plug1);
+  assert(!plug2);
 
-	discovery_plugin_found = 0;
-	LILV_FOREACH (plugins, i, plugins) {
-		discovery_verify_plugin(env, lilv_plugins_get(plugins, i));
-	}
+  {
+    LilvNode* name = lilv_plugin_get_name(plug1);
+    assert(!strcmp(lilv_node_as_string(name), "Test plugin"));
+    lilv_node_free(name);
+  }
 
-	assert(discovery_plugin_found);
-	plugins = NULL;
+  discovery_plugin_found = 0;
+  LILV_FOREACH (plugins, i, plugins) {
+    discovery_verify_plugin(env, lilv_plugins_get(plugins, i));
+  }
 
-	delete_bundle(env);
-	lilv_test_env_free(env);
+  assert(discovery_plugin_found);
+  plugins = NULL;
 
-	return 0;
+  delete_bundle(env);
+  lilv_test_env_free(env);
+
+  return 0;
 }