code review 4950046: net: change the internal form of IPMask for IPv4

src/pkg/net/ip_test.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package net
 
 import (
         "bytes"
         "reflect"
         "testing"
@@ skipping 31 matching lines @@
                         t.Errorf("ParseIP(%#q) = %v, want %v", tt.in, out, tt.out)
                 }
         }
 }
 
 var ipstringtests = []struct {
         in  IP
         out string
 }{
         // cf. RFC 5952 (A Recommendation for IPv6 Address Text Representation)
-        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0x1, 0x23, 0, 0x12, 0, 0x1},
-                "2001:db8::123:12:1"},
-        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1},
-                "2001:db8::1"},
-        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0x1, 0, 0, 0, 0x1, 0, 0, 0, 0x1},
-                "2001:db8:0:1:0:1:0:1"},
-        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0x1, 0, 0, 0, 0x1, 0, 0, 0, 0x1, 0, 0},
-                "2001:db8:1:0:1:0:1:0"},
-        {IP{0x20, 0x1, 0, 0, 0, 0, 0, 0, 0, 0x1, 0, 0, 0, 0, 0, 0x1},
-                "2001::1:0:0:1"},
-        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0x1, 0, 0, 0, 0, 0, 0},
-                "2001:db8:0:0:1::"},
-        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0x1, 0, 0, 0, 0, 0, 0x1},
-                "2001:db8::1:0:0:1"},
-        {IP{0x20, 0x1, 0xD, 0xB8, 0, 0, 0, 0, 0, 0xA, 0, 0xB, 0, 0xC, 0, 0xD},
-                "2001:db8::a:b:c:d"},
+        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0x1, 0x23, 0, 0x12, 0, 0x1}, "2001:db8::123:12:1"},
+        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1}, "2001:db8::1"},
+        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0x1, 0, 0, 0, 0x1, 0, 0, 0, 0x1}, "2001:db8:0:1:0:1:0:1"},
+        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0x1, 0, 0, 0, 0x1, 0, 0, 0, 0x1, 0, 0}, "2001:db8:1:0:1:0:1:0"},
+        {IP{0x20, 0x1, 0, 0, 0, 0, 0, 0, 0, 0x1, 0, 0, 0, 0, 0, 0x1}, "2001::1:0:0:1"},
+        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0x1, 0, 0, 0, 0, 0, 0}, "2001:db8:0:0:1::"},
+        {IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0x1, 0, 0, 0, 0, 0, 0x1}, "2001:db8::1:0:0:1"},
+        {IP{0x20, 0x1, 0xD, 0xB8, 0, 0, 0, 0, 0, 0xA, 0, 0xB, 0, 0xC, 0, 0xD}, "2001:db8::a:b:c:d"},
+        {nil, "<nil>"},
 }
 
 func TestIPString(t *testing.T) {
         for _, tt := range ipstringtests {
                 if out := tt.in.String(); out != tt.out {
                         t.Errorf("IP.String(%v) = %#q, want %#q", tt.in, out, tt.out)
+                }
+        }
+}
+
+var ipmasktests = []struct {
+        in   IP
+        mask IPMask
+        out  IP
+}{
+        {IPv4(192, 168, 1, 127), IPv4Mask(255, 255, 255, 128), IPv4(192, 168, 1, 0)},
+        {IPv4(192, 168, 1, 127), IPMask(ParseIP("255.255.255.192")), IPv4(192, 168, 1, 64)},
+        {IPv4(192, 168, 1, 127), IPMask(ParseIP("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffe0")), IPv4(192, 168, 1, 96)},
+        {IPv4(192, 168, 1, 127), IPv4Mask(255, 0, 255, 0), IPv4(192, 0, 1, 0)},
+        {ParseIP("2001:db8::1"), IPMask(ParseIP("ffff:ff80::")), ParseIP("2001:d80::")},
+        {ParseIP("2001:db8::1"), IPMask(ParseIP("f0f0:0f0f::")), ParseIP("2000:d08::")},
+}
+
+func TestIPMask(t *testing.T) {
+        for _, tt := range ipmasktests {
+                if out := tt.in.Mask(tt.mask); out == nil || !tt.out.Equal(out) {
+                        t.Errorf("IP(%v).Mask(%v) = %v, want %v", tt.in, tt.mask, out, tt.out)
+                }
+        }
+}
+
+var ipmaskstringtests = []struct {
+        in  IPMask
+        out string
+}{
+        {IPv4Mask(255, 255, 255, 240), "fffffff0"},
+        {IPv4Mask(255, 0, 128, 0), "ff008000"},
+        {IPMask(ParseIP("ffff:ff80::")), "ffffff80000000000000000000000000"},
+        {IPMask(ParseIP("ef00:ff80::cafe:0")), "ef00ff800000000000000000cafe0000"},
+        {nil, "<nil>"},
+}
+
+func TestIPMaskString(t *testing.T) {
+        for _, tt := range ipmaskstringtests {
+                if out := tt.in.String(); out != tt.out {
+                        t.Errorf("IPMask.String(%v) = %q, want %q", tt.in, out, tt.out)
                 }
         }
 }
 
 var parsecidrtests = []struct {
         in   string
         ip   IP
         mask IPMask
         err  os.Error
 }{
@@ skipping 10 matching lines @@
         {"abcd:2345::/33", ParseIP("abcd:2345::"), IPMask(ParseIP("ffff:ffff:8000::")), nil},
         {"abcd:2345::/32", ParseIP("abcd:2345::"), IPMask(ParseIP("ffff:ffff::")), nil},
         {"abcd:2344::/31", ParseIP("abcd:2344::"), IPMask(ParseIP("ffff:fffe::")), nil},
         {"abcd:2300::/24", ParseIP("abcd:2300::"), IPMask(ParseIP("ffff:ff00::")), nil},
         {"abcd:2345::/24", nil, nil, &ParseError{"CIDR address", "abcd:2345::/24"}},
         {"2001:DB8::/48", ParseIP("2001:DB8::"), IPMask(ParseIP("ffff:ffff:ffff::")), nil},
 }
 
 func TestParseCIDR(t *testing.T) {
         for _, tt := range parsecidrtests {
-                if ip, mask, err := ParseCIDR(tt.in); !isEqual(ip, tt.ip) || !isEqual(mask, tt.mask) || !reflect.DeepEqual(err, tt.err) {
+                if ip, mask, err := ParseCIDR(tt.in); !tt.ip.Equal(ip) || !isEqual(mask, tt.mask) || !reflect.DeepEqual(err, tt.err) {
                         t.Errorf("ParseCIDR(%q) = %v, %v, %v; want %v, %v, %v", tt.in, ip, mask, err, tt.ip, tt.mask, tt.err)
                 }
         }
 }
 
 var splitjointests = []struct {
         Host string
         Port string
         Join string
 }{
@@ skipping 91 matching lines @@
         return runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
 }
 
 func TestIPAddrScope(t *testing.T) {
         for _, tt := range ipscopetests {
                 if ok := tt.scope(tt.in); ok != tt.ok {
                         t.Errorf("%s(%#q) = %v, want %v", name(tt.scope), tt.in, ok, tt.ok)
                 }
         }
 }