From f3487ad6d20b30acbe0b1cee19c96ebf2c77b82a Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 13:55:36 -0400 Subject: [PATCH 01/10] start adding test for aliases related functions in network package this is the base for the rest of the tests --- network/aliases_test.go | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 network/aliases_test.go diff --git a/network/aliases_test.go b/network/aliases_test.go new file mode 100644 index 00000000..06777c76 --- /dev/null +++ b/network/aliases_test.go @@ -0,0 +1,3 @@ +package network + +import "testing" From 7180f6524e282ea58f4c999d29ec5741ee0ee800 Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 13:56:09 -0400 Subject: [PATCH 02/10] add buildExampleAlaises helper function to be used later --- network/aliases_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/network/aliases_test.go b/network/aliases_test.go index 06777c76..691e5a26 100644 --- a/network/aliases_test.go +++ b/network/aliases_test.go @@ -1,3 +1,7 @@ package network import "testing" + +func buildExampleAlaises() *Aliases { + return &Aliases{} +} From b91a6b51b35905d63fcea1072932ad9232694ac7 Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 13:56:44 -0400 Subject: [PATCH 03/10] add test for LoadAliases function --- network/aliases_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/network/aliases_test.go b/network/aliases_test.go index 691e5a26..5831fd93 100644 --- a/network/aliases_test.go +++ b/network/aliases_test.go @@ -5,3 +5,10 @@ import "testing" func buildExampleAlaises() *Aliases { return &Aliases{} } + +func TestAliasesLoadAliases(t *testing.T) { + err, _ := LoadAliases() + if err != nil { + t.Error(err) + } +} From aab5018de8577336bd0bf8a70e6064d872fa45a7 Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 13:57:03 -0400 Subject: [PATCH 04/10] add test for saveUnlocked function --- network/aliases_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/network/aliases_test.go b/network/aliases_test.go index 5831fd93..29e6bb4d 100644 --- a/network/aliases_test.go +++ b/network/aliases_test.go @@ -12,3 +12,11 @@ func TestAliasesLoadAliases(t *testing.T) { t.Error(err) } } + +func TestAliasesSaveUnlocked(t *testing.T) { + exampleAliases := buildExampleAlaises() + err := exampleAliases.saveUnlocked() + if err != nil { + t.Error(err) + } +} From 383aa509c21b9772955002cfd2bf200271db9a6d Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 13:57:19 -0400 Subject: [PATCH 05/10] add test for Save function --- network/aliases_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/network/aliases_test.go b/network/aliases_test.go index 29e6bb4d..3ddd0dcb 100644 --- a/network/aliases_test.go +++ b/network/aliases_test.go @@ -20,3 +20,11 @@ func TestAliasesSaveUnlocked(t *testing.T) { t.Error(err) } } + +func TestAliasesSave(t *testing.T) { + exampleAliases := buildExampleAlaises() + err := exampleAliases.Save() + if err != nil { + t.Error(err) + } +} From e751ecf6a0d3517f4b0724c24f44fdb894ddb1a3 Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 13:57:39 -0400 Subject: [PATCH 06/10] add test for Get function --- network/aliases_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/network/aliases_test.go b/network/aliases_test.go index 3ddd0dcb..6e25b5ac 100644 --- a/network/aliases_test.go +++ b/network/aliases_test.go @@ -28,3 +28,14 @@ func TestAliasesSave(t *testing.T) { t.Error(err) } } + +func TestAliasesGet(t *testing.T) { + exampleAliases := buildExampleAlaises() + + exp := "" + got := exampleAliases.Get("pi:ca:tw:as:he:re") + + if got != exp { + t.Fatalf("expected '%v', got '%v'", exp, got) + } +} From b387ed86e6ff541363c46230cccda7b46204ef4d Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 13:58:27 -0400 Subject: [PATCH 07/10] add test for Set function --- network/aliases_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/network/aliases_test.go b/network/aliases_test.go index 6e25b5ac..e420de91 100644 --- a/network/aliases_test.go +++ b/network/aliases_test.go @@ -39,3 +39,16 @@ func TestAliasesGet(t *testing.T) { t.Fatalf("expected '%v', got '%v'", exp, got) } } + +func TestAliasesSet(t *testing.T) { + exampleAliases := buildExampleAlaises() + exampleAliases.data = make(map[string]string) + + if exampleAliases.Set("pi:ca:tw:as:he:re", "picat") != nil { + t.Error("unable to set alias") + } + + if exampleAliases.Get("pi:ca:tw:as:he:re") != "picat" { + t.Error("unable to get set alias") + } +} From 0b55b645b1624685d85613c53b6698c65287f103 Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 13:58:42 -0400 Subject: [PATCH 08/10] add test for Find function --- network/aliases_test.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/network/aliases_test.go b/network/aliases_test.go index e420de91..b908ff06 100644 --- a/network/aliases_test.go +++ b/network/aliases_test.go @@ -52,3 +52,19 @@ func TestAliasesSet(t *testing.T) { t.Error("unable to get set alias") } } + +func TestAliasesFind(t *testing.T) { + exampleAliases := buildExampleAlaises() + exampleAliases.data = make(map[string]string) + err := exampleAliases.Set("pi:ca:tw:as:he:re", "picat") + if err != nil { + t.Error(err) + } + mac, found := exampleAliases.Find("picat") + if !found { + t.Error("unable to find mac address for alias") + } + if mac != "pi:ca:tw:as:he:re" { + t.Error("unable to find correct mac address for alias") + } +} From 871bbde89fab7f5ea3dee8bf2a8a01287dd1b38c Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 14:08:57 -0400 Subject: [PATCH 09/10] make coherent lan test due to changes in aliases messing with the Aliases test seems to cause issues for the lan test, this fixes the error --- network/lan_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/network/lan_test.go b/network/lan_test.go index 7cdc7ef8..ce30d1ba 100644 --- a/network/lan_test.go +++ b/network/lan_test.go @@ -112,9 +112,9 @@ func TestAliases(t *testing.T) { exampleAlias := "picat" exampleLAN := buildExampleLAN() exampleEndpoint := buildExampleEndpoint() - exampleLAN.hosts[exampleEndpoint.HwAddress] = exampleEndpoint + exampleLAN.hosts["pi:ca:tw:as:he:re"] = exampleEndpoint exp := exampleAlias - got := exampleLAN.Aliases().Get(exampleEndpoint.HwAddress) + got := exampleLAN.Aliases().Get("pi:ca:tw:as:he:re") if got != exp { t.Fatalf("expected '%v', got '%v'", exp, got) } From db23b34b854ef2819b388cc209da60ff33b1099f Mon Sep 17 00:00:00 2001 From: Kent Gruber Date: Wed, 2 May 2018 14:24:47 -0400 Subject: [PATCH 10/10] change type Alaises to Aliases one day I will learn how to spell --- network/aliases_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/network/aliases_test.go b/network/aliases_test.go index b908ff06..13da477e 100644 --- a/network/aliases_test.go +++ b/network/aliases_test.go @@ -2,7 +2,7 @@ package network import "testing" -func buildExampleAlaises() *Aliases { +func buildExampleAliases() *Aliases { return &Aliases{} } @@ -14,7 +14,7 @@ func TestAliasesLoadAliases(t *testing.T) { } func TestAliasesSaveUnlocked(t *testing.T) { - exampleAliases := buildExampleAlaises() + exampleAliases := buildExampleAliases() err := exampleAliases.saveUnlocked() if err != nil { t.Error(err) @@ -22,7 +22,7 @@ func TestAliasesSaveUnlocked(t *testing.T) { } func TestAliasesSave(t *testing.T) { - exampleAliases := buildExampleAlaises() + exampleAliases := buildExampleAliases() err := exampleAliases.Save() if err != nil { t.Error(err) @@ -30,7 +30,7 @@ func TestAliasesSave(t *testing.T) { } func TestAliasesGet(t *testing.T) { - exampleAliases := buildExampleAlaises() + exampleAliases := buildExampleAliases() exp := "" got := exampleAliases.Get("pi:ca:tw:as:he:re") @@ -41,7 +41,7 @@ func TestAliasesGet(t *testing.T) { } func TestAliasesSet(t *testing.T) { - exampleAliases := buildExampleAlaises() + exampleAliases := buildExampleAliases() exampleAliases.data = make(map[string]string) if exampleAliases.Set("pi:ca:tw:as:he:re", "picat") != nil { @@ -54,7 +54,7 @@ func TestAliasesSet(t *testing.T) { } func TestAliasesFind(t *testing.T) { - exampleAliases := buildExampleAlaises() + exampleAliases := buildExampleAliases() exampleAliases.data = make(map[string]string) err := exampleAliases.Set("pi:ca:tw:as:he:re", "picat") if err != nil {