From 7799d636a491938702116c9fd3913ca54238585e Mon Sep 17 00:00:00 2001
From: Daniel Czerwonk <daniel@dan-nrw.de>
Date: Fri, 14 Jan 2022 11:59:10 +0100
Subject: [PATCH] move ospf test

---
 parser/ospf.go        |  2 +-
 parser/ospf_test.go   | 44 +++++++++++++++++++++++++++++++++++++
 parser/parser_test.go | 51 -------------------------------------------
 3 files changed, 45 insertions(+), 52 deletions(-)
 create mode 100644 parser/ospf_test.go

diff --git a/parser/ospf.go b/parser/ospf.go
index 71817cc..982a719 100644
--- a/parser/ospf.go
+++ b/parser/ospf.go
@@ -30,7 +30,7 @@ func init() {
 
 var ospf *ospfRegex
 
-func ParseOspf(data []byte) []*protocol.OspfArea {
+func ParseOSPF(data []byte) []*protocol.OspfArea {
 	reader := bytes.NewReader(data)
 	scanner := bufio.NewScanner(reader)
 
diff --git a/parser/ospf_test.go b/parser/ospf_test.go
new file mode 100644
index 0000000..96785dd
--- /dev/null
+++ b/parser/ospf_test.go
@@ -0,0 +1,44 @@
+package parser
+
+import (
+	"testing"
+
+	"github.com/czerwonk/testutils/assert"
+)
+
+func TestOSPFArea(t *testing.T) {
+	data := "ospf1:\n" +
+		"RFC1583 compatibility: disabled\n" +
+		"Stub router: No\n" +
+		"RT scheduler tick: 1\n" +
+		"Number of areas: 2\n" +
+		"Number of LSAs in DB:   33\n" +
+		"    Area: 0.0.0.0 (0) [BACKBONE]\n" +
+		"        Stub:   No\n" +
+		"        NSSA:   No\n" +
+		"        Transit:    No\n" +
+		"        Number of interfaces:   3\n" +
+		"        Number of neighbors:    2\n" +
+		"        Number of adjacent neighbors:   1\n" +
+		"    Area: 0.0.0.1 (1)\n" +
+		"        Stub:   No\n" +
+		"        NSSA:   No\n" +
+		"        Transit:    No\n" +
+		"        Number of interfaces:   4\n" +
+		"        Number of neighbors:    6\n" +
+		"        Number of adjacent neighbors:   5\n"
+	a := ParseOSPF([]byte(data))
+	assert.IntEqual("areas", 2, len(a), t)
+
+	a1 := a[0]
+	assert.StringEqual("Area1 Name", "0", a1.Name, t)
+	assert.Int64Equal("Area1 InterfaceCount", 3, a1.InterfaceCount, t)
+	assert.Int64Equal("Area1 NeighborCount", 2, a1.NeighborCount, t)
+	assert.Int64Equal("Area1 NeighborAdjacentCount", 1, a1.NeighborAdjacentCount, t)
+
+	a2 := a[1]
+	assert.StringEqual("Area2 Name", "1", a2.Name, t)
+	assert.Int64Equal("Area2 InterfaceCount", 4, a2.InterfaceCount, t)
+	assert.Int64Equal("Area2 NeighborCount", 6, a2.NeighborCount, t)
+	assert.Int64Equal("Area2 NeighborAdjacentCount", 5, a2.NeighborAdjacentCount, t)
+}
diff --git a/parser/parser_test.go b/parser/parser_test.go
index 46c9999..4328045 100644
--- a/parser/parser_test.go
+++ b/parser/parser_test.go
@@ -280,57 +280,6 @@ func TestOSPFCurrentTimeFormat(t *testing.T) {
 	assert.IntEqual("uptime", 60, x.Uptime, t)
 }
 
-func TestOSPFProtocolDown(t *testing.T) {
-	data := "o_hrz    OSPF     t_hrz    down   1494926415  \n  Preference:     150\n  Input filter:   ACCEPT\n  Output filter:  REJECT\nxxx"
-	p := ParseProtocols([]byte(data), "6")
-	assert.IntEqual("protocols", 1, len(p), t)
-
-	x := p[0]
-	assert.StringEqual("name", "o_hrz", x.Name, t)
-	assert.IntEqual("proto", int(protocol.OSPF), int(x.Proto), t)
-	assert.IntEqual("up", 0, x.Up, t)
-	assert.Int64Equal("imported", 0, x.Imported, t)
-	assert.Int64Equal("exported", 0, x.Exported, t)
-	assert.StringEqual("ipVersion", "6", x.IPVersion, t)
-}
-
-func TestOSPFArea(t *testing.T) {
-	data := "ospf1:\n" +
-		"RFC1583 compatibility: disabled\n" +
-		"Stub router: No\n" +
-		"RT scheduler tick: 1\n" +
-		"Number of areas: 2\n" +
-		"Number of LSAs in DB:   33\n" +
-		"    Area: 0.0.0.0 (0) [BACKBONE]\n" +
-		"        Stub:   No\n" +
-		"        NSSA:   No\n" +
-		"        Transit:    No\n" +
-		"        Number of interfaces:   3\n" +
-		"        Number of neighbors:    2\n" +
-		"        Number of adjacent neighbors:   1\n" +
-		"    Area: 0.0.0.1 (1)\n" +
-		"        Stub:   No\n" +
-		"        NSSA:   No\n" +
-		"        Transit:    No\n" +
-		"        Number of interfaces:   4\n" +
-		"        Number of neighbors:    6\n" +
-		"        Number of adjacent neighbors:   5\n"
-	a := ParseOspf([]byte(data))
-	assert.IntEqual("areas", 2, len(a), t)
-
-	a1 := a[0]
-	assert.StringEqual("Area1 Name", "0", a1.Name, t)
-	assert.Int64Equal("Area1 InterfaceCount", 3, a1.InterfaceCount, t)
-	assert.Int64Equal("Area1 NeighborCount", 2, a1.NeighborCount, t)
-	assert.Int64Equal("Area1 NeighborAdjacentCount", 1, a1.NeighborAdjacentCount, t)
-
-	a2 := a[1]
-	assert.StringEqual("Area2 Name", "1", a2.Name, t)
-	assert.Int64Equal("Area2 InterfaceCount", 4, a2.InterfaceCount, t)
-	assert.Int64Equal("Area2 NeighborCount", 6, a2.NeighborCount, t)
-	assert.Int64Equal("Area2 NeighborAdjacentCount", 5, a2.NeighborAdjacentCount, t)
-}
-
 func TestRPKIUp(t *testing.T) {
 	data := "rpki1      RPKI       ---        up     2021-12-31 13:04:29  Established"
 	p := ParseProtocols([]byte(data), "4")