added testutils ref

parser_test.go

@@ -1,71 +1,63 @@
 package main
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/czerwonk/testutils/assert"
+)
 
 func TestEstablishedBirdOldFormat(t *testing.T) {
 	data := "foo    BGP      master   up     1481973060  Established\ntest\nbar\n  Routes:         12 imported, 1 filtered, 34 exported, 100 preferred\nxxx"
 	s := parseOutput([]byte(data), 4)
-	assertInt("sessions", 1, len(s), t)
+	assert.IntEqual("sessions", 1, len(s), t)
 
 	x := s[0]
-	assertString("name", "foo", x.name, t)
-	assertInt("established", 1, x.established, t)
-	assertInt("imported", 12, int(x.imported), t)
-	assertInt("exported", 34, int(x.exported), t)
-	assertInt("ipVersion", 4, x.ipVersion, t)
+	assert.StringEqual("name", "foo", x.name, t)
+	assert.IntEqual("established", 1, x.established, t)
+	assert.Int64Equal("imported", 12, x.imported, t)
+	assert.Int64Equal("exported", 34, x.exported, t)
+	assert.IntEqual("ipVersion", 4, x.ipVersion, t)
 }
 
 func TestEstablishedBirdCurrentFormat(t *testing.T) {
 	data := "foo    BGP      master   up     00:01:00  Established\ntest\nbar\n  Routes:         12 imported, 1 filtered, 34 exported, 100 preferred\nxxx"
 	s := parseOutput([]byte(data), 4)
-	assertInt("sessions", 1, len(s), t)
+	assert.IntEqual("sessions", 1, len(s), t)
 
 	x := s[0]
-	assertString("name", "foo", x.name, t)
-	assertInt("established", 1, x.established, t)
-	assertInt("imported", 12, int(x.imported), t)
-	assertInt("exported", 34, int(x.exported), t)
-	assertInt("ipVersion", 4, x.ipVersion, t)
-	assertInt("uptime", 60, int(x.uptime), t)
+	assert.StringEqual("name", "foo", x.name, t)
+	assert.IntEqual("established", 1, x.established, t)
+	assert.Int64Equal("imported", 12, x.imported, t)
+	assert.Int64Equal("exported", 34, x.exported, t)
+	assert.IntEqual("ipVersion", 4, x.ipVersion, t)
+	assert.IntEqual("uptime", 60, x.uptime, t)
 }
 
 func TestIpv6(t *testing.T) {
 	data := "foo    BGP      master   up     00:01:00  Established\ntest\nbar\n  Routes:         12 imported, 1 filtered, 34 exported, 100 preferred\nxxx"
 	s := parseOutput([]byte(data), 6)
-	assertInt("sessions", 1, len(s), t)
+	assert.IntEqual("sessions", 1, len(s), t)
 
 	x := s[0]
-	assertInt("ipVersion", 6, x.ipVersion, t)
+	assert.IntEqual("ipVersion", 6, x.ipVersion, t)
 }
 
 func TestActive(t *testing.T) {
 	data := "bar    BGP      master   start   2016-01-01    Active\ntest\nbar"
 	s := parseOutput([]byte(data), 4)
-	assertInt("sessions", 1, len(s), t)
+	assert.IntEqual("sessions", 1, len(s), t)
 
 	x := s[0]
-	assertString("name", "bar", x.name, t)
-	assertInt("established", 0, x.established, t)
-	assertInt("imported", 0, int(x.imported), t)
-	assertInt("exported", 0, int(x.exported), t)
-	assertInt("ipVersion", 4, x.ipVersion, t)
-	assertInt("uptime", 0, int(x.uptime), t)
+	assert.StringEqual("name", "bar", x.name, t)
+	assert.IntEqual("established", 0, x.established, t)
+	assert.IntEqual("imported", 0, int(x.imported), t)
+	assert.IntEqual("exported", 0, int(x.exported), t)
+	assert.IntEqual("ipVersion", 4, x.ipVersion, t)
+	assert.IntEqual("uptime", 0, int(x.uptime), t)
 }
 
 func Test2Sessions(t *testing.T) {
 	data := "foo    BGP      master   up     00:01:00  Established\ntest\n  Routes:         12 imported, 1 filtered, 34 exported, 100 preferred\nbar    BGP      master   start   2016-01-01    Active\nxxx"
 	s := parseOutput([]byte(data), 4)
-	assertInt("sessions", 2, len(s), t)
-}
-
-func assertString(name string, expected string, current string, t *testing.T) {
-	if current != expected {
-		t.Fatalf("%s: expected %s but got %s", name, expected, current)
-	}
-}
-
-func assertInt(name string, expected int, current int, t *testing.T) {
-	if current != expected {
-		t.Fatalf("%s: expected %d but got %d", name, expected, current)
-	}
+	assert.IntEqual("sessions", 2, len(s), t)
 }

vendor/github.com/czerwonk/testutils/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Daniel Czerwonk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

vendor/github.com/czerwonk/testutils/assert/assert.go

@@ -0,0 +1,77 @@
+package assert
+
+import "testing"
+
+const equalError string = "%s: expected %v but got %v"
+
+func StringEqual(name string, expected, current string, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func IntEqual(name string, expected, current int, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func ByteEqual(name string, expected, current byte, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func Int32Equal(name string, expected, current int32, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func Int64Equal(name string, expected, current int64, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func Float32Equal(name string, expected, current float32, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func Float64Equal(name string, expected, current float64, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func Complex64Equal(name string, expected, current complex64, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func Complex128Equal(name string, expected, current complex128, t *testing.T) {
+	if current != expected {
+		t.Fatalf(equalError, name, expected, current)
+	}
+}
+
+func True(name string, current bool, t *testing.T) {
+	if current {
+		t.Fatalf(equalError, name, true, false)
+	}
+}
+
+func False(name string, current bool, t *testing.T) {
+	if !current {
+		t.Fatalf(equalError, name, false, true)
+	}
+}
+
+func That(name, text string, assertion func() bool, t *testing.T) {
+	if !assertion() {
+		t.Fatalf("%s: %s", name, text)
+	}
+}

vendor/vendor.json

@@ -0,0 +1,13 @@
+{
+	"comment": "",
+	"ignore": "test",
+	"package": [
+		{
+			"checksumSHA1": "N4WKFoRf6d0PYFjgHkjuz3v2lcA=",
+			"path": "github.com/czerwonk/testutils/assert",
+			"revision": "b1a52ed26acf6fd5536b55224257cd7fb0aa04de",
+			"revisionTime": "2016-12-18T11:32:53Z"
+		}
+	],
+	"rootPath": "github.com/czerwonk/bird_bgp_exporter"
+}