Fix oval tests based on new data struct

Goval parser introduced new data types which caused failure in out tests. This commit fixed data types in oval tests.
quay · May 20, 2020 · b284357 · b284357
1 parent 41c9dc6
commit b284357
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/oracle/parser_test.go b/oracle/parser_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/xml"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/quay/goval-parser/oval"
 
@@ -74,9 +75,9 @@ var ovalDef = oval.Definition{XMLName: xml.Name{Space: "http://oval.mitre.org/XM
 				CveID: "CVE-2016-5416",
 				Href:  "http://linux.oracle.com/cve/CVE-2016-5416.html"},
 		},
-		Issued: struct {
-			Date string "xml:\"date,attr\""
-		}{Date: "2016-11-09"},
+		Issued: oval.Date{
+			Date: time.Date(2016, 11, 9, 0, 0, 0, 0, time.UTC),
+		},
 	},
 	Criteria: oval.Criteria{XMLName: xml.Name{Space: "http://oval.mitre.org/XMLSchema/oval-definitions-5", Local: "criteria"},
 		Operator: "AND",

diff --git a/rhel/parse_test.go b/rhel/parse_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/xml"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/quay/goval-parser/oval"
 
@@ -155,15 +156,14 @@ var ovalDef = oval.Definition{XMLName: xml.Name{Space: "http://oval.mitre.org/XM
 		AffectedCPEList: []string{"cpe:/o:redhat:enterprise_linux:3"},
 		Refs:            []oval.Ref(nil),
 		Bugs:            []oval.Bug(nil),
-		Issued: struct {
-			Date string "xml:\"date,attr\""
-		}{
-			Date: "2010-05-06"},
-		Updated: struct {
-			Date string "xml:\"date,attr\""
-		}{
-			Date: "2010-05-06"}},
-	Debian: oval.Debian{XMLName: xml.Name{Space: "", Local: ""}, MoreInfo: "", Date: ""},
+		Issued: oval.Date{
+			Date: time.Date(2010, 5, 6, 0, 0, 0, 0, time.UTC),
+		},
+		Updated: oval.Date{
+			Date: time.Date(2010, 5, 6, 0, 0, 0, 0, time.UTC),
+		},
+	},
+	Debian: oval.Debian{XMLName: xml.Name{Space: "", Local: ""}, MoreInfo: "", Date: oval.Date{Date: time.Time{}}},
 	Criteria: oval.Criteria{XMLName: xml.Name{Space: "http://oval.mitre.org/XMLSchema/oval-definitions-5", Local: "criteria"},
 		Operator: "AND",
 		Criterias: []oval.Criteria{