Changeset 94 in code for trunk

Timestamp:

Aug 11, 2019, 8:28:28 AM (6 years ago)

Author:

alex

Message:

[fix] tests

Location:

trunk

Files:

• .travis.yml (modified) (1 diff)
• contenttype/contenttype_test.go (modified) (9 diffs)
• morty.go (modified) (1 diff)

trunk/.travis.yml

@@ -1 +1 @@
 language: go
-
+sudo: false
 go:
-  - 1.10.3
-
+  - 1.12.x
 script:
-  # static checks
-  - test -z "$(gofmt -l ./)"
-  - test -z "$(go vet -v ./...)"
-
   # run tests on a standard platform
+  - OUT="$(go get -a)"; test -z "$OUT" || (echo "$OUT" && return 1)
+  - OUT="$(gofmt -l -d ./)"; test -z "$OUT" || (echo "$OUT" && return 1)
+  - go vet -v ./...
   - go test -v ./...
 

trunk/contenttype/contenttype_test.go

@@ -2 +2 @@
 
 import (
+        "bytes"
+        "fmt"
         "testing"
 )
@@ -73 +75 @@
 
 type FilterTestCase struct {
+        Description string
         Input       Filter
         TrueValues  []ContentType
@@ -80 +83 @@
 var filterTestCases []FilterTestCase = []FilterTestCase{
         FilterTestCase{
+                "contains xml",
                 NewFilterContains("xml"),
                 []ContentType{
@@ -92 +96 @@
         },
         FilterTestCase{
+                "equals applications/xhtml",
                 NewFilterEquals("application", "xhtml", "*"),
                 []ContentType{
@@ -105 +110 @@
         },
         FilterTestCase{
+                "equals application/*",
                 NewFilterEquals("application", "*", ""),
                 []ContentType{
@@ -116 +122 @@
         },
         FilterTestCase{
+                "equals applications */javascript",
                 NewFilterEquals("*", "javascript", ""),
                 []ContentType{
@@ -127 +134 @@
         },
         FilterTestCase{
+                "equals applications/* or */javascript",
                 NewFilterOr([]Filter{
                         NewFilterEquals("application", "*", ""),
@@ -214 +222 @@
 }
 
+func FilterToString(m map[string]bool) string {
+        b := new(bytes.Buffer)
+        for key, value := range m {
+                if value {
+                        fmt.Fprintf(b, "'%s'=true;", key)
+                } else {
+                        fmt.Fprintf(b, "'%s'=false;", key)
+                }
+        }
+        return b.String()
+}
+
 func TestFilters(t *testing.T) {
         for _, testCase := range filterTestCases {
                 for _, contentType := range testCase.TrueValues {
                         if !testCase.Input(contentType) {
-                                t.Errorf(`Filter "%s" must accept the value "%s"`, testCase.Input, contentType)
+                                t.Errorf(`Filter "%s" must accept the value "%s"`, testCase.Description, contentType)
                         }
                 }
                 for _, contentType := range testCase.FalseValues {
                         if testCase.Input(contentType) {
-                                t.Errorf(`Filter "%s" mustn't accept the value "%s"`, testCase.Input, contentType)
+                                t.Errorf(`Filter "%s" mustn't accept the value "%s"`, testCase.Description, contentType)
                         }
                 }
@@ -242 +262 @@
                 contentTypeOutput := ContentType{"", "", "", testCase.Output}
                 if !contentTypeOutput.Equals(contentType) {
-                        t.Errorf(`FilterParameters error : %s becomes %s with this filter %s`, testCase.Input, contentType.Parameters, testCase.Filter)
-                }
-        }
-}
+                        t.Errorf(`FilterParameters error : %s becomes %s with this filter %s`, testCase.Input, contentType.Parameters, FilterToString(testCase.Filter))
+                }
+        }
+}

trunk/morty.go

@@ -996 +996 @@
                 var err error
                 p.Key, err = base64.StdEncoding.DecodeString(*key)
-                if (err != nil) {
-                   log.Fatal("Error parsing -key", err.Error())
-                   os.Exit(1)
+                if err != nil {
+                        log.Fatal("Error parsing -key", err.Error())
+                        os.Exit(1)
                 }
         }