Revert "Oops, misread some tests !"

This reverts commit b0ef8a83de.
This commit is contained in:
Edznux 2018-10-28 17:36:52 +01:00
commit 3761f1e698

View file

@ -49,29 +49,24 @@ func teardown(t testing.TB) {
func TestSessionEnvironmentWithoutFile(t *testing.T) {
env, err := NewEnvironment("")
if env == nil {
t.Fatal("expected valid environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if len(env.Data) != 0 {
t.Fatalf("expected empty environment, found %d elements", len(env.Data))
}
t.Log("expected valid environment")
}
func TestSessionEnvironmentWithInvalidFile(t *testing.T) {
env, err := NewEnvironment("/idontexist")
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if len(env.Data) != 0 {
t.Fatalf("expected empty environment, found %d elements", len(env.Data))
}
t.Log("expected valid environment")
}
func TestSessionEnvironmentWithEmptyFile(t *testing.T) {
@ -79,15 +74,14 @@ func TestSessionEnvironmentWithEmptyFile(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if len(env.Data) != 0 {
t.Fatalf("expected empty environment, found %d elements", len(env.Data))
}
t.Log("expected environment")
}
func TestSessionEnvironmentWithDataFile(t *testing.T) {
@ -95,9 +89,6 @@ func TestSessionEnvironmentWithDataFile(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatalf("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@ -107,6 +98,7 @@ func TestSessionEnvironmentWithDataFile(t *testing.T) {
if !reflect.DeepEqual(env.Data, testEnvData) {
t.Fatalf("unexpected contents: %v", env.Data)
}
t.Log("expected environment")
}
func TestSessionEnvironmentSaveWithError(t *testing.T) {
@ -114,15 +106,13 @@ func TestSessionEnvironmentSaveWithError(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err = env.Save("/lulz/nope"); err == nil {
t.Fatal("expected error")
}
t.Log("expected environment")
}
func TestSessionEnvironmentSave(t *testing.T) {
@ -130,12 +120,10 @@ func TestSessionEnvironmentSave(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
t.Log("expected environment")
env.Data["new"] = "value"
if err = env.Save(testEnvFile); err != nil {
@ -143,15 +131,13 @@ func TestSessionEnvironmentSave(t *testing.T) {
}
env, err = NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if !reflect.DeepEqual(env.Data, map[string]string{"new": "value"}) {
t.Fatalf("unexpected contents: %v", env.Data)
}
t.Log("expected environment")
}
func TestSessionEnvironmentHas(t *testing.T) {
@ -159,15 +145,13 @@ func TestSessionEnvironmentHas(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if len(env.Data) != len(testEnvData) {
t.Fatalf("expected %d, found %d", len(testEnvData), len(env.Data))
}
t.Log("expected environment")
for k := range testEnvData {
if !env.Has(k) {
@ -187,9 +171,6 @@ func TestSessionEnvironmentSet(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@ -207,6 +188,7 @@ func TestSessionEnvironmentSet(t *testing.T) {
if env.Data["newkey"] != "nk" {
t.Fatalf("unexpected new value: %s", env.Data["newkey"])
}
t.Log("expected environment")
}
func TestSessionEnvironmentSetWithCallback(t *testing.T) {
@ -214,12 +196,10 @@ func TestSessionEnvironmentSetWithCallback(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
t.Log("expected environment")
cbCalled := false
old := env.WithCallback("people", "ok", func(newValue string) {
@ -250,15 +230,13 @@ func TestSessionEnvironmentGet(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if len(env.Data) != len(testEnvData) {
t.Fatalf("expected %d, found %d", len(testEnvData), len(env.Data))
}
t.Log("expected environment")
for k, v := range testEnvData {
found, vv := env.Get(k)
@ -283,15 +261,13 @@ func TestSessionEnvironmentGetInt(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if len(env.Data) != len(testEnvData) {
t.Fatalf("expected %d, found %d", len(testEnvData), len(env.Data))
}
t.Log("expected environment")
for k := range testEnvData {
if err, _ := env.GetInt(k); err == nil {
@ -314,9 +290,6 @@ func TestSessionEnvironmentSorted(t *testing.T) {
defer teardown(t)
env, err := NewEnvironment(testEnvFile)
if env == nil {
t.Fatal("expected environment")
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@ -326,4 +299,5 @@ func TestSessionEnvironmentSorted(t *testing.T) {
if sorted := env.Sorted(); !reflect.DeepEqual(sorted, testEnvSorted) {
t.Fatalf("unexpected sorted keys: %v", sorted)
}
t.Log("expected environment")
}