Clean up tests

4 files changed, 33 insertions, 25 deletions

diff --git a/tests/empty.ingen/graph.ttl b/tests/empty.ingen/graph.ttl
index aaaf6087..3f8c8ed5 100644
--- a/tests/empty.ingen/graph.ttl
+++ b/tests/empty.ingen/graph.ttl
@@ -1,18 +1,20 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix atom: <http://lv2plug.in/ns/ext/atom#> .
-@prefix patch: <http://lv2plug.in/ns/ext/patch#> .
 @prefix doap: <http://usefulinc.com/ns/doap#> .
 @prefix ingen: <http://drobilla.net/ns/ingen#> .
 @prefix lv2: <http://lv2plug.in/ns/lv2core#> .
-@prefix lv2ev: <http://lv2plug.in/ns/ext/event#> .
 @prefix midi: <http://lv2plug.in/ns/ext/midi#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix patch: <http://lv2plug.in/ns/ext/patch#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 <control_in>
+	ingen:canvasX 32.0 ;
+	ingen:canvasY 32.0 ;
 	ingen:polyphonic false ;
 	atom:bufferType atom:Sequence ;
+	<http://lv2plug.in/ns/ext/resize-port#minimumSize> 4096 ;
 	lv2:index 0 ;
 	lv2:name "Control" ;
 	lv2:portProperty lv2:connectionOptional ;
@@ -21,10 +23,14 @@
 		lv2:InputPort .
 
 <control_out>
+	ingen:canvasX 128.0 ;
+	ingen:canvasY 32.0 ;
 	ingen:polyphonic false ;
 	atom:bufferType atom:Sequence ;
+	<http://lv2plug.in/ns/ext/resize-port#minimumSize> 4096 ;
 	lv2:index 1 ;
 	lv2:name "Control" ;
+	lv2:portProperty lv2:connectionOptional ;
 	lv2:symbol "control_out" ;
 	a atom:AtomPort ,
 		lv2:OutputPort .
diff --git a/tests/enable_graph.ttl b/tests/enable_graph.ttl
index b16a0332..481cc93a 100644
--- a/tests/enable_graph.ttl
+++ b/tests/enable_graph.ttl
@@ -3,15 +3,13 @@
 @prefix patch: <http://lv2plug.in/ns/ext/patch#> .
 
 <msg0>
-	a patch:Put ;
+	a patch:Set ;
 	patch:subject <ingen:/graph> ;
-	patch:body [
-		ingen:enabled true
-	] .
+	patch:property ingen:enabled ;
+	patch:value true .
 
 <msg1>
-	a patch:Put ;
+	a patch:Set ;
 	patch:subject <ingen:/graph> ;
-	patch:body [
-		ingen:enabled false
-	] .
+	patch:property ingen:enabled ;
+	patch:value false .
diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp
index 542636a2..ee2c4924 100644
--- a/tests/ingen_test.cpp
+++ b/tests/ingen_test.cpp
@@ -1,6 +1,6 @@
 /*
   This file is part of Ingen.
-  Copyright 2007-2015 David Robillard <http://drobilla.net/>
+  Copyright 2007-2016 David Robillard <http://drobilla.net/>
 
   Ingen is free software: you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free
@@ -126,6 +126,16 @@ ingen_try(bool cond, const char* msg)
 	}
 }
 
+static void
+flush_events(Ingen::World* world)
+{
+	while (world->engine()->pending_events()) {
+		world->engine()->run(4096);
+		world->engine()->main_iteration();
+		g_usleep(1000);
+	}
+}
+
 int
 main(int argc, char** argv)
 {
@@ -175,11 +185,7 @@ main(int argc, char** argv)
 		cerr << "error: failed to load initial graph " << start_graph << endl;
 		return EXIT_FAILURE;
 	}
-	while (world->engine()->pending_events()) {
-		world->engine()->run(4096);
-		world->engine()->main_iteration();
-		g_usleep(1000);
-	}
+	flush_events(world);
 
 	// Read commands
 
diff --git a/tests/set_graph_poly.ttl b/tests/set_graph_poly.ttl
index 0e830c4a..7c730639 100644
--- a/tests/set_graph_poly.ttl
+++ b/tests/set_graph_poly.ttl
@@ -3,15 +3,13 @@
 @prefix patch: <http://lv2plug.in/ns/ext/patch#> .
 
 <msg0>
-	a patch:Put ;
+	a patch:Set ;
 	patch:subject <ingen:/graph/> ;
-	patch:body [
-		ingen:polyphony 4
-	] .
+	patch:property ingen:polyphony ;
+	patch:value 4 .
 
 <msg1>
-	a patch:Put ;
+	a patch:Set ;
 	patch:subject <ingen:/graph/> ;
-	patch:body [
-		ingen:polyphony 1
-	] .
+	patch:property ingen:polyphony ;
+	patch:value 1 .