Refactor

tests/support.rs

@@ -20,22 +20,25 @@ pub fn setup_range(count: usize) -> (TestMoreThanText, TestDocument) {
 }
 
 pub struct TestDocument {
+    docdef: DocDef,
     doc_name: Name,
     field_names: Vec<Name>,
-    field_types: Vec<FieldType>,
 }
 
 impl TestDocument {
     pub fn new(fields: Vec<FieldType>) -> Self {
+        let doc_name = random_name();
+        let mut docdef = DocDef::new(doc_name.clone());
         let mut fnames = Vec::new();
         for i in 0..fields.len() {
             let name = Name::english(format!("field{}", i).as_str());
+            docdef.add_field(name.clone(), fields[i].clone());
             fnames.push(name);
         }
         Self {
-            doc_name: random_name(),
+            docdef: docdef,
+            doc_name: doc_name,
             field_names: fnames,
-            field_types: fields,
         }
     }
 
@@ -44,11 +47,7 @@ impl TestDocument {
     }
 
     pub fn get_docdef(&self) -> DocDef {
-        let mut output = DocDef::new(self.doc_name.clone());
-        for i in 0..self.field_types.len() {
-            output.add_field(self.field_names[i].clone(), self.field_types[i].clone());
-        }
-        output
+        self.docdef.clone()
     }
 
     pub fn get_field_name(&self, position: usize) -> Name {