Fix and re-enable some ignored tests

xsd-parser/tests/any/expected.rs

@@ -4,3 +4,6 @@ pub struct FooType {
     #[yaserde(prefix = "tns", rename = "Name")]
     pub name: String,
 }
+
+impl Validate for FooType {}
+// pub type Foo = FooType;

xsd-parser/tests/any/mod.rs

@@ -3,6 +3,7 @@ use super::utils;
 #[test]
 fn deserialization_works() {
     mod expected {
+        use xsd_parser::generator::validator::Validate;
         use yaserde_derive::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
@@ -21,7 +22,6 @@ fn generator_does_not_panic() {
 }
 
 #[test]
-#[ignore]
 fn generator_output_has_correct_ast() {
     utils::ast_test(include_str!("input.xsd"), include_str!("expected.rs"));
 }

xsd-parser/tests/choice/expected.rs

@@ -1,9 +1,13 @@
 #[derive(Default, PartialEq, Debug, UtilsTupleIo, UtilsDefaultSerde)]
 pub struct BarType(pub String);
 
+impl Validate for BarType {}
+
 #[derive(Default, PartialEq, Debug, UtilsTupleIo, UtilsDefaultSerde)]
 pub struct BazType(pub i32);
 
+impl Validate for BazType {}
+
 #[derive(PartialEq, Debug, YaSerialize, YaDeserialize)]
 #[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
 pub enum FooTypeChoice {
@@ -18,9 +22,14 @@ impl Default for FooTypeChoice {
     }
 }
 
+impl Validate for FooTypeChoice {}
+
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 #[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
 pub struct FooType {
     #[yaserde(flatten)]
     pub foo_type_choice: FooTypeChoice,
 }
+
+impl Validate for FooType {}
+// pub type Foo = FooType;

xsd-parser/tests/choice/mod.rs

@@ -6,6 +6,7 @@ fn deserialization_works() {
         use std::str::FromStr;
 
         use xsd_macro_utils::*;
+        use xsd_parser::generator::validator::Validate;
         use yaserde_derive::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
@@ -27,7 +28,6 @@ fn generator_does_not_panic() {
 }
 
 #[test]
-#[ignore] // Validation is not needed in this case
 fn generator_output_has_correct_ast() {
     utils::ast_test(include_str!("input.xsd"), include_str!("expected.rs"));
 }

xsd-parser/tests/mod.rs

@@ -14,8 +14,8 @@ mod rename_only_where_needed;
 mod restriction_any_type;
 mod simple_type;
 mod tuple_with_integer;
-mod tuple_with_string;
-mod tuple_with_vec;
+mod tuple_with_vec_int;
+mod tuple_with_vec_string;
 mod type_name_clash;
 mod union;
 mod xsd_string;

xsd-parser/tests/simple_type/expected.rs

@@ -1,2 +1,5 @@
 #[derive(Default, PartialEq, Debug, UtilsTupleIo, UtilsDefaultSerde)]
-pub struct FooType (pub String);
+pub struct FooType(pub String);
+
+impl Validate for FooType {}
+// pub type Foo = FooType;

xsd-parser/tests/simple_type/mod.rs

@@ -4,12 +4,8 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use std::str::FromStr;
-
         use xsd_macro_utils::*;
-
-        trait Validate {
-            fn validate(&self) -> Result<(), String>;
-        }
+        use xsd_parser::generator::validator::Validate;
 
         include!("expected.rs");
     }
@@ -27,7 +23,6 @@ fn generator_does_not_panic() {
 }
 
 #[test]
-#[ignore] // Validation is not needed in this case
 fn generator_output_has_correct_ast() {
     utils::ast_test(include_str!("input.xsd"), include_str!("expected.rs"));
 }

xsd-parser/tests/tuple_with_integer/expected.rs

@@ -1,2 +1,5 @@
 #[derive(Default, PartialEq, Debug, UtilsTupleIo, UtilsDefaultSerde)]
-pub struct FooType (pub Integer);
+pub struct FooType(pub xs::Integer);
+
+impl Validate for FooType {}
+// pub type Foo = FooType;

xsd-parser/tests/tuple_with_integer/mod.rs

@@ -7,9 +7,10 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use std::str::FromStr;
+        use xsd_parser::generator::validator::Validate;
 
         use xsd_macro_utils::*;
-        use xsd_types::types::Integer;
+        use xsd_types::types as xs;
 
         include!("expected.rs");
     }
@@ -27,7 +28,6 @@ fn generator_does_not_panic() {
 }
 
 #[test]
-#[ignore] // Validation is not needed in this case
 fn generator_output_has_correct_ast() {
     utils::ast_test(include_str!("input.xsd"), include_str!("expected.rs"));
 }

xsd-parser/tests/tuple_with_vec/expected.rs → xsd-parser/tests/tuple_with_vec_int/expected.rs

@@ -1,2 +1,5 @@
 #[derive(Default, PartialEq, Debug, UtilsTupleIo, UtilsDefaultSerde)]
 pub struct FooType(pub Vec<i32>);
+
+impl Validate for FooType {}
+// pub type Foo = FooType;

xsd-parser/tests/tuple_with_string/input.xsd → xsd-parser/tests/tuple_with_vec_int/input.xsd

@@ -4,7 +4,7 @@
            targetNamespace="http://example.com"
            elementFormDefault="qualified">
     <xs:simpleType name="FooType">
-        <xs:restriction base="xs:string"/>
+        <xs:list itemType="xs:int"/>
     </xs:simpleType>
 
     <xs:element name="Foo" type="tns:FooType"/>

xsd-parser/tests/tuple_with_vec/mod.rs → xsd-parser/tests/tuple_with_vec_int/mod.rs

@@ -4,6 +4,7 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use std::str::FromStr;
+        use xsd_parser::generator::validator::Validate;
 
         use xsd_macro_utils::*;
 
@@ -28,7 +29,6 @@ fn generator_does_not_panic() {
 }
 
 #[test]
-#[ignore] // Validation is not needed in this case
 fn generator_output_has_correct_ast() {
     utils::ast_test(include_str!("input.xsd"), include_str!("expected.rs"));
 }

xsd-parser/tests/tuple_with_vec_string/example.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><exam:Foo xmlns:exam="http://example.com">1 2 3</exam:Foo>

xsd-parser/tests/tuple_with_vec_string/expected.rs

@@ -0,0 +1,5 @@
+#[derive(Default, PartialEq, Debug, UtilsTupleIo, UtilsDefaultSerde)]
+pub struct FooType(pub Vec<String>);
+
+impl Validate for FooType {}
+// pub type Foo = FooType;

xsd-parser/tests/tuple_with_vec_string/mod.rs

@@ -0,0 +1,34 @@
+use super::utils;
+
+#[test]
+fn deserialization_works() {
+    mod expected {
+        use std::str::FromStr;
+        use xsd_parser::generator::validator::Validate;
+
+        use xsd_macro_utils::*;
+
+        include!("expected.rs");
+    }
+
+    let ser = include_str!("example.xml");
+
+    let de: expected::FooType = yaserde::de::from_str(ser).unwrap();
+
+    assert_eq!(de, expected::FooType(vec!["1".to_string(), "2".to_string(), "3".to_string()]));
+
+    assert_eq!(
+        r#"<?xml version="1.0" encoding="utf-8"?><FooType>1 2 3</FooType>"#,
+        yaserde::ser::to_string(&de).unwrap()
+    );
+}
+
+#[test]
+fn generator_does_not_panic() {
+    println!("{}", utils::generate(include_str!("input.xsd")))
+}
+
+#[test]
+fn generator_output_has_correct_ast() {
+    utils::ast_test(include_str!("input.xsd"), include_str!("expected.rs"));
+}