Changeset 53 in code for trunk

Timestamp:

Nov 29, 2016, 11:11:00 PM (9 years ago)

Author:

asciimoo

Message:

[enh] add url proxifier tests ++ fix proxification user url part handling

Location:

trunk

Files:

• morty.go (modified) (1 diff)
• morty_test.go (modified) (3 diffs)

trunk/morty.go

@@ -656 +656 @@
         // some web pages describe the whole link https://same:auth@same.host/same.path?same.query#new.fragment
         if u.Scheme == rc.BaseURL.Scheme &&
-                ((u.User == nil && rc.BaseURL.User == nil) || (u.User.String() == rc.BaseURL.User.String())) &&
+                (rc.BaseURL.User == nil || (u.User != nil && u.User.String() == rc.BaseURL.User.String())) &&
                 u.Host == rc.BaseURL.Host &&
                 u.Path == rc.BaseURL.Path &&

trunk/morty_test.go

@@ -11 +11 @@
         AttrValue      []byte
         ExpectedOutput []byte
+}
+
+type StringTestCase struct {
+        Input          string
+        ExpectedOutput string
 }
 
@@ -36 +41 @@
 }
 
+var urlTestData []*StringTestCase = []*StringTestCase{
+        &StringTestCase{
+                "http://x.com/",
+                "./?mortyurl=http%3A%2F%2Fx.com%2F",
+        },
+        &StringTestCase{
+                "http://a@x.com/",
+                "./?mortyurl=http%3A%2F%2Fa%40x.com%2F",
+        },
+}
+
 func TestAttrSanitizer(t *testing.T) {
         u, _ := url.Parse("http://127.0.0.1/")
@@ -45 +61 @@
                 if !bytes.Equal(res, testCase.ExpectedOutput) {
                         t.Errorf(
-                                `Attribute parse error. Name: "%s", Value: "%s", Expected: %s, Got: %s`,
+                                `Attribute parse error. Name: "%s", Value: "%s", Expected: %s, Got: "%s"`,
                                 testCase.AttrName,
                                 testCase.AttrValue,
                                 testCase.ExpectedOutput,
                                 res,
+                        )
+                }
+        }
+}
+
+func TestURLProxifier(t *testing.T) {
+        u, _ := url.Parse("http://127.0.0.1/")
+        rc := &RequestConfig{BaseURL: u}
+        for _, testCase := range urlTestData {
+                newUrl, err := rc.ProxifyURI(testCase.Input)
+                if err != nil {
+                        t.Errorf("Failed to parse URL: %s", testCase.Input)
+                }
+                if newUrl != testCase.ExpectedOutput {
+                        t.Errorf(
+                                `URL proxifier error. Expected: "%s", Got: "%s"`,
+                                testCase.ExpectedOutput,
+                                newUrl,
                         )
                 }