diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-10-23 15:41:47 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-10-23 15:41:47 +0200 |
| commit | 9402b71be88b352d557dbc34e54df66161c95893 (patch) | |
| tree | de29cd0ebd1a0630700ecdb30d17a86a0efe04b3 /tests | |
| parent | e93f1abd4cdb004cb943ebcf185a2539ad0aae5b (diff) | |
| download | ufo-filters-9402b71be88b352d557dbc34e54df66161c95893.tar.gz ufo-filters-9402b71be88b352d557dbc34e54df66161c95893.tar.bz2 ufo-filters-9402b71be88b352d557dbc34e54df66161c95893.tar.xz ufo-filters-9402b71be88b352d557dbc34e54df66161c95893.zip | |
Fix tests after merging ufo-core restructuring
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/integration_tests/test-complete-local-setup.c | 6 | ||||
| -rw-r--r-- | tests/integration_tests/test-complete-remote-setup.c | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/tests/integration_tests/test-complete-local-setup.c b/tests/integration_tests/test-complete-local-setup.c index a4e10a5..f7766e0 100644 --- a/tests/integration_tests/test-complete-local-setup.c +++ b/tests/integration_tests/test-complete-local-setup.c @@ -22,14 +22,12 @@ #include "test-suite.h" typedef struct { - UfoConfig *config; gchar *tmpdir; } Fixture; static void setup (Fixture *fixture, gconstpointer data) { - fixture->config = ufo_config_new (); fixture->tmpdir = g_strdup ("ufotemp-XXXXXX"); g_mkdtemp (fixture->tmpdir); } @@ -46,7 +44,7 @@ test_simple_invert (Fixture *fixture, gconstpointer unused) { //double-invert an image should equal original image - UfoPluginManager *mgr = ufo_plugin_manager_new (NULL); + UfoPluginManager *mgr = ufo_plugin_manager_new (); const gchar *input_image = "../data/sinogram-00000.tif"; const gchar *output_image = g_strconcat (fixture->tmpdir, "/", "sinogram-00000-inverted.tif", NULL); @@ -96,7 +94,7 @@ test_simple_invert (Fixture *fixture, ufo_graph_connect_nodes (graph, UFO_NODE (cl1), UFO_NODE (cl2), NULL); ufo_graph_connect_nodes (graph, UFO_NODE (cl2), UFO_NODE (writer), NULL); - UfoBaseScheduler *sched = ufo_scheduler_new (NULL, NULL); + UfoBaseScheduler *sched = ufo_scheduler_new (); ufo_base_scheduler_run (sched, UFO_TASK_GRAPH (graph), NULL); // test that an output was generated diff --git a/tests/integration_tests/test-complete-remote-setup.c b/tests/integration_tests/test-complete-remote-setup.c index 94c5381..cd67f61 100644 --- a/tests/integration_tests/test-complete-remote-setup.c +++ b/tests/integration_tests/test-complete-remote-setup.c @@ -22,7 +22,6 @@ #include "test-suite.h" typedef struct { - UfoConfig *config; UfoDaemon *daemon; gchar *tmpdir; } Fixture; @@ -30,11 +29,9 @@ typedef struct { static void setup (Fixture *fixture, gconstpointer data) { - fixture->config = ufo_config_new (); gchar *addr = g_strdup ("tcp://127.0.0.1:5555"); - fixture->config = ufo_config_new (); - fixture->daemon = ufo_daemon_new (fixture->config, addr); + fixture->daemon = ufo_daemon_new (addr); ufo_daemon_start (fixture->daemon); fixture->tmpdir = g_strdup ("ufotemp-XXXXXX"); @@ -56,7 +53,7 @@ test_simple_invert (Fixture *fixture, gconstpointer unused) { //double-invert an image should equal original image - UfoPluginManager *mgr = ufo_plugin_manager_new (NULL); + UfoPluginManager *mgr = ufo_plugin_manager_new (); const gchar *input_image = "../data/sinogram-00000.tif"; const gchar *output_image = g_strconcat (fixture->tmpdir, "/", "sinogram-00000-inverted.tif", NULL); @@ -108,7 +105,7 @@ test_simple_invert (Fixture *fixture, gchar *remote = g_strdup ("tcp://127.0.0.1:5555"); GList *remotes = g_list_append (NULL, remote); - UfoBaseScheduler *sched = ufo_scheduler_new (NULL, remotes); + UfoBaseScheduler *sched = ufo_scheduler_new (); ufo_base_scheduler_run (sched, UFO_TASK_GRAPH (graph), NULL); g_free(remote); |