From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 2 Jan 2019 22:32:26 +0000 (+0100)
Subject: valadoc: Update API tests
X-Git-Tag: 0.43.4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=881333fe7a8ecf64de21633c165b0db0db2e41ff;p=thirdparty%2Fvala.git

valadoc: Update API tests
---

diff --git a/valadoc/tests/drivers/generic-api-test.vala b/valadoc/tests/drivers/generic-api-test.vala
index 24ef6954f..f1f866832 100644
--- a/valadoc/tests/drivers/generic-api-test.vala
+++ b/valadoc/tests/drivers/generic-api-test.vala
@@ -26,6 +26,7 @@ using Valadoc;
 [CCode (cname = "TOP_SRC_DIR")]
 extern const string TOP_SRC_DIR;
 
+const string TEST_DATA_FILENAME = TOP_SRC_DIR + "/valadoc/tests/drivers/api-test.data.vapi";
 
 public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespace global_ns) {
 	assert (en != null);
@@ -39,7 +40,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
 	assert (en.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (en.get_full_name () == "TestEnumGlobal");
-	assert (en.get_filename () == "api-test.data.vapi");
+	assert (en.get_filename () == TEST_DATA_FILENAME);
 	assert (en.name == "TestEnumGlobal");
 	assert (en.nspace == global_ns);
 	assert (en.package == pkg);
@@ -67,7 +68,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
 			assert (enval.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (enval.get_full_name () == "TestEnumGlobal.ENVAL1");
-			assert (enval.get_filename () == "api-test.data.vapi");
+			assert (enval.get_filename () == TEST_DATA_FILENAME);
 			assert (enval.nspace == global_ns);
 			assert (enval.package == pkg);
 
@@ -84,7 +85,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
 			assert (enval.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (enval.get_full_name () == "TestEnumGlobal.ENVAL2");
-			assert (enval.get_filename () == "api-test.data.vapi");
+			assert (enval.get_filename () == TEST_DATA_FILENAME);
 			assert (enval.nspace == global_ns);
 			assert (enval.package == pkg);
 
@@ -125,7 +126,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestEnumGlobal.method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -156,7 +157,7 @@ public static void test_enum_global (Api.Enum? en, Api.Package pkg, Api.Namespac
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestEnumGlobal.static_method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "static_method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -200,7 +201,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
 	assert (err.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (err.get_full_name () == "TestErrDomGlobal");
-	assert (err.get_filename () == "api-test.data.vapi");
+	assert (err.get_filename () == TEST_DATA_FILENAME);
 	assert (err.name == "TestErrDomGlobal");
 	assert (err.nspace == global_ns);
 	assert (err.package == pkg);
@@ -226,7 +227,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
 			assert (errc.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (errc.get_full_name () == "TestErrDomGlobal.ERROR1");
-			assert (errc.get_filename () == "api-test.data.vapi");
+			assert (errc.get_filename () == TEST_DATA_FILENAME);
 			assert (errc.nspace == global_ns);
 			assert (errc.package == pkg);
 
@@ -241,7 +242,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
 			assert (errc.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (errc.get_full_name () == "TestErrDomGlobal.ERROR2");
-			assert (errc.get_filename () == "api-test.data.vapi");
+			assert (errc.get_filename () == TEST_DATA_FILENAME);
 			assert (errc.nspace == global_ns);
 			assert (errc.package == pkg);
 
@@ -282,7 +283,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestErrDomGlobal.method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -313,7 +314,7 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestErrDomGlobal.static_method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "static_method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -368,7 +369,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	// (.Node)
 	//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
 	assert (cl.get_full_name () == "TestClassGlobal");
-	assert (cl.get_filename () == "api-test.data.vapi");
+	assert (cl.get_filename () == TEST_DATA_FILENAME);
 	assert (cl.name == "TestClassGlobal");
 	assert (cl.nspace == global_ns);
 	assert (cl.package == pkg);
@@ -398,7 +399,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestClassGlobal.method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -429,7 +430,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestClassGlobal.static_method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "static_method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -464,7 +465,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 				assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 				// (.Node)
 				assert (method.get_full_name () == "TestClassGlobal.TestClassGlobal");
-				assert (method.get_filename () == "api-test.data.vapi");
+				assert (method.get_filename () == TEST_DATA_FILENAME);
 				assert (method.nspace == global_ns);
 				assert (method.package == pkg);
 
@@ -490,7 +491,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 				assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 				// (.Node)
 				assert (method.get_full_name () == "TestClassGlobal.TestClassGlobal.named");
-				assert (method.get_filename () == "api-test.data.vapi");
+				assert (method.get_filename () == TEST_DATA_FILENAME);
 				assert (method.nspace == global_ns);
 				assert (method.package == pkg);
 
@@ -532,7 +533,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestClassGlobal.property_1");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -547,7 +548,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestClassGlobal.property_2");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -562,7 +563,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestClassGlobal.property_2");
-			assert (property.setter.get_filename () == "api-test.data.vapi");
+			assert (property.setter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.setter.nspace == global_ns);
 			assert (property.setter.package == pkg);
 
@@ -584,7 +585,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestClassGlobal.property_2");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -598,7 +599,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestClassGlobal.property_2");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -621,7 +622,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestClassGlobal.property_3");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -635,7 +636,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -650,7 +651,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
-			assert (property.setter.get_filename () == "api-test.data.vapi");
+			assert (property.setter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.setter.nspace == global_ns);
 			assert (property.setter.package == pkg);
 
@@ -682,7 +683,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	assert (del.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
-	assert (del.get_filename () == "api-test.data.vapi");
+	assert (del.get_filename () == TEST_DATA_FILENAME);
 	assert (del.nspace == global_ns);
 	assert (del.package == pkg);
 
@@ -704,7 +705,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	assert (sig.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	//assert (sig.get_full_name () == "TestClassGlobal.property_3");
-	assert (sig.get_filename () == "api-test.data.vapi");
+	assert (sig.get_filename () == TEST_DATA_FILENAME);
 	assert (sig.nspace == global_ns);
 	assert (sig.package == pkg);
 
@@ -722,7 +723,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	assert (constant.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (constant.get_full_name () == "TestClassGlobal.constant");
-	assert (constant.get_filename () == "api-test.data.vapi");
+	assert (constant.get_filename () == TEST_DATA_FILENAME);
 	assert (constant.name == "constant");
 	assert (constant.nspace == global_ns);
 	assert (constant.package == pkg);
@@ -747,7 +748,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (field.get_full_name () == "TestClassGlobal.field1");
-			assert (field.get_filename () == "api-test.data.vapi");
+			assert (field.get_filename () == TEST_DATA_FILENAME);
 			assert (field.nspace == global_ns);
 			assert (field.package == pkg);
 
@@ -764,7 +765,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 			assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (field.get_full_name () == "TestClassGlobal.field2");
-			assert (field.get_filename () == "api-test.data.vapi");
+			assert (field.get_filename () == TEST_DATA_FILENAME);
 			assert (field.nspace == global_ns);
 			assert (field.package == pkg);
 
@@ -792,7 +793,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	assert (subcl.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (subcl.get_full_name () == "TestClassGlobal.InnerClass");
-	assert (subcl.get_filename () == "api-test.data.vapi");
+	assert (subcl.get_filename () == TEST_DATA_FILENAME);
 	assert (subcl.nspace == global_ns);
 	assert (subcl.package == pkg);
 
@@ -814,7 +815,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	assert (substru.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (substru.get_full_name () == "TestClassGlobal.InnerStruct");
-	assert (substru.get_filename () == "api-test.data.vapi");
+	assert (substru.get_filename () == TEST_DATA_FILENAME);
 	assert (substru.name == "InnerStruct");
 	assert (substru.nspace == global_ns);
 	assert (substru.package == pkg);
@@ -852,7 +853,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 	assert (iface.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (iface.get_full_name () == "TestInterfaceGlobal");
-	assert (iface.get_filename () == "api-test.data.vapi");
+	assert (iface.get_filename () == TEST_DATA_FILENAME);
 	assert (iface.name == "TestInterfaceGlobal");
 	assert (iface.nspace == global_ns);
 	assert (iface.package == pkg);
@@ -882,7 +883,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestInterfaceGlobal.method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -913,7 +914,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestInterfaceGlobal.static_method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "static_method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -944,7 +945,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestInterfaceGlobal.property_1");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -959,7 +960,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -974,7 +975,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 			assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
-			assert (property.setter.get_filename () == "api-test.data.vapi");
+			assert (property.setter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.setter.nspace == global_ns);
 			assert (property.setter.package == pkg);
 
@@ -996,7 +997,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestInterfaceGlobal.property_2");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -1010,7 +1011,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -1033,7 +1034,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestInterfaceGlobal.property_3");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -1047,7 +1048,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_3");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -1062,7 +1063,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 			assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_3");
-			assert (property.setter.get_filename () == "api-test.data.vapi");
+			assert (property.setter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.setter.nspace == global_ns);
 			assert (property.setter.package == pkg);
 
@@ -1095,7 +1096,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 	assert (del.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	//assert (del.get_full_name () == "TestClassGlobal.property_3");
-	assert (del.get_filename () == "api-test.data.vapi");
+	assert (del.get_filename () == TEST_DATA_FILENAME);
 	assert (del.nspace == global_ns);
 	assert (del.package == pkg);
 
@@ -1117,7 +1118,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 	assert (sig.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	//assert (sig.get_full_name () == "TestClassGlobal.property_3");
-	assert (sig.get_filename () == "api-test.data.vapi");
+	assert (sig.get_filename () == TEST_DATA_FILENAME);
 	assert (sig.nspace == global_ns);
 	assert (sig.package == pkg);
 
@@ -1135,7 +1136,7 @@ public static void test_interface_global (Api.Interface? iface, Api.Package pkg,
 	assert (constant.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (constant.get_full_name () == "TestInterfaceGlobal.constant");
-	assert (constant.get_filename () == "api-test.data.vapi");
+	assert (constant.get_filename () == TEST_DATA_FILENAME);
 	assert (constant.name == "constant");
 	assert (constant.nspace == global_ns);
 	assert (constant.package == pkg);
@@ -1176,7 +1177,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 	// (.Node)
 	//assert (property.getter.get_full_name () == "TestClassGlobal.property_3");
 	assert (stru.get_full_name () == "TestStructGlobal");
-	assert (stru.get_filename () == "api-test.data.vapi");
+	assert (stru.get_filename () == TEST_DATA_FILENAME);
 	assert (stru.name == "TestStructGlobal");
 	assert (stru.nspace == global_ns);
 	assert (stru.package == pkg);
@@ -1206,7 +1207,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestStructGlobal.method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -1237,7 +1238,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "TestStructGlobal.static_method");
-	assert (method.get_filename () == "api-test.data.vapi");
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "static_method");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -1272,7 +1273,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 				assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 				// (.Node)
 				assert (method.get_full_name () == "TestStructGlobal.TestStructGlobal");
-				assert (method.get_filename () == "api-test.data.vapi");
+				assert (method.get_filename () == TEST_DATA_FILENAME);
 				assert (method.nspace == global_ns);
 				assert (method.package == pkg);
 
@@ -1298,7 +1299,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 				assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 				// (.Node)
 				assert (method.get_full_name () == "TestStructGlobal.TestStructGlobal.named");
-				assert (method.get_filename () == "api-test.data.vapi");
+				assert (method.get_filename () == TEST_DATA_FILENAME);
 				assert (method.nspace == global_ns);
 				assert (method.package == pkg);
 
@@ -1327,7 +1328,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 	assert (constant.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (constant.get_full_name () == "TestStructGlobal.constant");
-	assert (constant.get_filename () == "api-test.data.vapi");
+	assert (constant.get_filename () == TEST_DATA_FILENAME);
 	assert (constant.name == "constant");
 	assert (constant.nspace == global_ns);
 	assert (constant.package == pkg);
@@ -1353,7 +1354,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (field.get_full_name () == "TestStructGlobal.field1");
-			assert (field.get_filename () == "api-test.data.vapi");
+			assert (field.get_filename () == TEST_DATA_FILENAME);
 			assert (field.nspace == global_ns);
 			assert (field.package == pkg);
 
@@ -1370,7 +1371,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (field.get_full_name () == "TestStructGlobal.field2");
-			assert (field.get_filename () == "api-test.data.vapi");
+			assert (field.get_filename () == TEST_DATA_FILENAME);
 			assert (field.nspace == global_ns);
 			assert (field.package == pkg);
 
@@ -1411,7 +1412,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestStructGlobal.property_1");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -1426,7 +1427,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -1441,7 +1442,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
-			assert (property.setter.get_filename () == "api-test.data.vapi");
+			assert (property.setter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.setter.nspace == global_ns);
 			assert (property.setter.package == pkg);
 
@@ -1463,7 +1464,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestStructGlobal.property_2");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -1477,7 +1478,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_2");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -1499,7 +1500,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (property.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (property.get_full_name () == "TestStructGlobal.property_3");
-			assert (property.get_filename () == "api-test.data.vapi");
+			assert (property.get_filename () == TEST_DATA_FILENAME);
 			assert (property.nspace == global_ns);
 			assert (property.package == pkg);
 
@@ -1513,7 +1514,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (property.getter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_3");
-			assert (property.getter.get_filename () == "api-test.data.vapi");
+			assert (property.getter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.getter.nspace == global_ns);
 			assert (property.getter.package == pkg);
 
@@ -1528,7 +1529,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 			assert (property.setter.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			//assert (property.getter.get_full_name () == "TestInterfaceGlobal.property_3");
-			assert (property.setter.get_filename () == "api-test.data.vapi");
+			assert (property.setter.get_filename () == TEST_DATA_FILENAME);
 			assert (property.setter.nspace == global_ns);
 			assert (property.setter.package == pkg);
 
@@ -1640,7 +1641,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_2.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -1676,7 +1677,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_3.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -1712,7 +1713,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_4.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -1748,7 +1749,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_5.o");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "o");
@@ -1784,7 +1785,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_6.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -1820,7 +1821,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == null);
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == null);
@@ -1847,7 +1848,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_8.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -1883,7 +1884,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_9.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -1915,7 +1916,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_9.b");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "b");
@@ -1947,7 +1948,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_9.c");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "c");
@@ -1979,7 +1980,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_9.d");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "d");
@@ -2011,7 +2012,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_9.e");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "e");
@@ -2043,7 +2044,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_9.f");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "f");
@@ -2075,7 +2076,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == null);
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == null);
@@ -2102,7 +2103,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_10.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -2140,7 +2141,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_11.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -2179,7 +2180,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_12.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -2218,7 +2219,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_13.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -2257,7 +2258,7 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 			assert (param.accessibility == Vala.SymbolAccessibility.PUBLIC);
 			// (.Node)
 			assert (param.get_full_name () == "ParamTest.test_function_param_14.a");
-			assert (param.get_filename () == "api-test.data.vapi");
+			assert (param.get_filename () == TEST_DATA_FILENAME);
 			assert (param.nspace == ns);
 			assert (param.package == pkg);
 			assert (param.name == "a");
@@ -2691,7 +2692,8 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
 	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (method.get_full_name () == "test_function_global");
-	assert (method.get_filename () == "api-test.data.vapi");
+	stderr.printf ("%s\n", method.get_filename ());
+	assert (method.get_filename () == TEST_DATA_FILENAME);
 	assert (method.name == "test_function_global");
 	assert (method.nspace == global_ns);
 	assert (method.package == pkg);
@@ -2713,7 +2715,7 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
 	assert (del.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (del.get_full_name () == "test_delegate_global");
-	assert (del.get_filename () == "api-test.data.vapi");
+	assert (del.get_filename () == TEST_DATA_FILENAME);
 	assert (del.name == "test_delegate_global");
 	assert (del.nspace == global_ns);
 	assert (del.package == pkg);
@@ -2734,7 +2736,7 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
 	assert (field.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (field.get_full_name () == "test_field_global");
-	assert (field.get_filename () == "api-test.data.vapi");
+	assert (field.get_filename () == TEST_DATA_FILENAME);
 	assert (field.name == "test_field_global");
 	assert (field.nspace == global_ns);
 	assert (field.package == pkg);
@@ -2753,7 +2755,7 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
 	assert (constant.accessibility == Vala.SymbolAccessibility.PUBLIC);
 	// (.Node)
 	assert (constant.get_full_name () == "test_const_global");
-	assert (constant.get_filename () == "api-test.data.vapi");
+	assert (constant.get_filename () == TEST_DATA_FILENAME);
 	assert (constant.name == "test_const_global");
 	assert (constant.nspace == global_ns);
 	assert (constant.package == pkg);
@@ -2840,7 +2842,7 @@ public static void test_global_ns (Api.Namespace global_ns, Api.Package pkg) {
 
 
 public static void test_package_out (Api.Package pkg) {
-	assert (pkg.is_package == false);
+	assert (pkg.is_package == true);
 	assert (pkg.nspace == null);
 	assert (pkg.package == pkg);
 	//assert (pkg.get_full_name () == null);
@@ -2871,7 +2873,7 @@ public static void test_driver () {
 	var reporter = new ErrorReporter ();
 
 	settings.source_files = {
-			TOP_SRC_DIR + "/valadoc/tests/drivers/api-test.data.vapi"
+			TEST_DATA_FILENAME
 		};
 
 	settings._protected = false;
@@ -2917,7 +2919,7 @@ public static void test_driver () {
 			gobj = true;
 			break;
 
-		case "@out":
+		case "api-test.data":
 			test_package_out (pkg);
 			test = true;
 			break;