From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 14 Nov 2018 14:44:43 +0000 (+0100)
Subject: libvaladoc: Actually assign type_id of Api.Structs
X-Git-Tag: 0.42.4~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86a101fedac8dba1049f1870ab99fa576e75c749;p=thirdparty%2Fvala.git

libvaladoc: Actually assign type_id of Api.Structs
---

diff --git a/libvaladoc/api/struct.vala b/libvaladoc/api/struct.vala
index d35d5ff93..a379b191b 100644
--- a/libvaladoc/api/struct.vala
+++ b/libvaladoc/api/struct.vala
@@ -49,6 +49,7 @@ public class Valadoc.Api.Struct : TypeSymbol {
 		this.destroy_function_cname = destroy_function_cname;
 
 		this.cname = cname;
+		this.type_id = type_id;
 	}
 
 	/**
diff --git a/valadoc/tests/drivers/generic-api-test.vala b/valadoc/tests/drivers/generic-api-test.vala
index 6e3b4cbb5..2e36d8faf 100644
--- a/valadoc/tests/drivers/generic-api-test.vala
+++ b/valadoc/tests/drivers/generic-api-test.vala
@@ -808,7 +808,7 @@ public static void test_class_global (Api.Class? cl, Api.Package pkg, Api.Namesp
 	assert (substru.get_cname () == "TestClassGlobalInnerStruct");
 	assert (substru.get_free_function_cname () == null);
 	assert (substru.get_dup_function_cname () == null);
-	assert (substru.get_type_id () == null);
+	assert (substru.get_type_id () == "TEST_CLASS_GLOBAL_TYPE_INNER_STRUCT");
 	// (.Symbol check)
 	assert (substru.is_deprecated == false);
 	assert (substru.accessibility == Api.SymbolAccessibility.PUBLIC);
@@ -1169,7 +1169,7 @@ public static void test_struct_global (Api.Struct? stru, Api.Package pkg, Api.Na
 	assert (stru.get_cname () == "TestStructGlobal");
 	assert (stru.get_free_function_cname () == null);
 	assert (stru.get_dup_function_cname () == null);
-	assert (stru.get_type_id () == null);
+	assert (stru.get_type_id () == "TYPE_TEST_STRUCT_GLOBAL");
 	// (.Symbol check)
 	assert (stru.is_deprecated == false);
 	assert (stru.accessibility == Api.SymbolAccessibility.PUBLIC);