diff --git a/test/GXmlDomTest.vala b/test/GXmlDomTest.vala index babaa38de42bbf4a832df03e64cb27927361fc45..ccdd02f14490e9610d35be699cd89e761e5eef5f 100644 --- a/test/GXmlDomTest.vala +++ b/test/GXmlDomTest.vala @@ -29,7 +29,6 @@ class GXmlTest { // Sets 29 as fatal flags, 16 + 8 + 4 + 1; bits 0,2,3,4, recursion,error,critical,warning; we'll want to undo that warning one so we can catch it Test.init (ref args); - SerializationTest.add_tests (); GomSchemaTest.add_tests (); CssSelectorTest.add_tests (); diff --git a/test/SerializationTest.vala b/test/SerializationTest.vala index 87e4ba77b758049d06506424fe99820a3c3dcd13..42c482d97af3b27e54eeb49e513729d376499687 100644 --- a/test/SerializationTest.vala +++ b/test/SerializationTest.vala @@ -302,7 +302,7 @@ class ComputerStore : GXml.Element { } } -class SerializationTest : GXmlTest { +class SerializationTest : GLib.Object { public class Book : GXml.Element { [Description (nick="::Name")] public string name { get; set; } @@ -631,7 +631,8 @@ class SerializationTest : GXmlTest { } } } - public static void add_tests () { + public static int main (string[] args) { + Test.init (ref args); Test.add_func ("/gxml/serialization/write/properties", () => { try { var b = new Book (); @@ -1661,5 +1662,9 @@ class SerializationTest : GXmlTest { warning ("Error: %s", e.message); } }); + + Test.run (); + + return 0; } } diff --git a/test/meson.build b/test/meson.build index 40d7e11a7c91c2e15a05e171cd64cdc3bfda4038..ad59dc01a4677a6ba36ccc3a52a569c9d0bf8b6d 100644 --- a/test/meson.build +++ b/test/meson.build @@ -26,7 +26,6 @@ test ('libxml-tests', xt) files_tests = files ([ 'GXmlDomTest.vala', 'CssSelectorTest.vala', - 'SerializationTest.vala', 'XsdSchemaTest.vala', ]) @@ -65,6 +64,19 @@ telement = executable('element', files_element_tests + configvapi + configtestva test ('element', telement) +files_serialization_tests = files ([ + 'SerializationTest.vala', + ]) + +tserialization = executable('serialization', files_serialization_tests + configvapi + configtestvapi, + vala_args : [], + c_args: tests_cargs, + dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep], + link_with: libgxml +) + +test ('serialization', tserialization) + html_tests = files ([ 'HtmlDocumentTest.vala',