Skip to content

Commit 6b55bb5

Browse files
tcr-abletontcr-ableton
committed
Cleanup unit tests
1 parent 15d0c70 commit 6b55bb5

File tree

6 files changed

+43
-82
lines changed

6 files changed

+43
-82
lines changed

‎cmd/trousseau/commands.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func PullCommand() cli.Command {
148148
trousseau.ErrorLogger.Fatal(err)
149149
}
150150

151-
trousseau.InfoLogger.Println("Encrypted data store succesfully pulled from remote storage\n")
151+
trousseau.InfoLogger.Println("Encrypted data store succesfully pulled from remote storage")
152152

153153
return nil
154154
},

‎internal/store/kv_test.go

+26-24
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,32 @@ package store
22

33
import (
44
"testing"
5+
6+
"github.com/stretchr/testify/assert"
57
)
68

79
func TestKVStoreGet(t *testing.T) {
810
kvStore := make(KVStore)
911
kvStore["abc"] = 123
1012

1113
v, err := kvStore.Get("abc")
12-
ok(t, err)
13-
equals(t, v, 123)
14+
assert.Nil(t, err)
15+
assert.Equal(t, v, 123)
1416
}
1517

1618
func TestKVStoreGet_errors_on_non_existing_key(t *testing.T) {
1719
kvStore := make(KVStore)
1820

1921
v, err := kvStore.Get("easy as")
20-
notOk(t, err)
21-
equals(t, v, "")
22+
assert.NotNil(t, err)
23+
assert.Equal(t, v, "")
2224
}
2325

2426
func TestKVStoreSet(t *testing.T) {
2527
kvStore := make(KVStore)
2628

2729
kvStore.Set("abc", 123)
28-
equals(t, kvStore["abc"], 123)
30+
assert.Equal(t, kvStore["abc"], 123)
2931
}
3032

3133
func TestKVStoreDel(t *testing.T) {
@@ -34,7 +36,7 @@ func TestKVStoreDel(t *testing.T) {
3436

3537
kvStore.Del("abc")
3638
_, in := kvStore["abc"]
37-
assert(t, in == false, "Expected 'abc' key to be removed from KVStore Container")
39+
assert.True(t, in == false, "Expected 'abc' key to be removed from KVStore Container")
3840
}
3941

4042
func TestKVStoreRename_without_overwrite_and_non_existing_destination_key(t *testing.T) {
@@ -45,10 +47,10 @@ func TestKVStoreRename_without_overwrite_and_non_existing_destination_key(t *tes
4547
_, srcIn := kvStore["abc"]
4648
_, destIn := kvStore["easy as"]
4749

48-
ok(t, err)
49-
assert(t, srcIn == false, "Expected source key to have been removed from KVStore")
50-
assert(t, destIn == true, "Expected destination key to be present in KVStore")
51-
equals(t, kvStore["easy as"], 123)
50+
assert.Nil(t, err)
51+
assert.True(t, srcIn == false, "Expected source key to have been removed from KVStore")
52+
assert.True(t, destIn == true, "Expected destination key to be present in KVStore")
53+
assert.Equal(t, kvStore["easy as"], 123)
5254
}
5355

5456
func TestKVStoreRename_without_overwrite_and_existing_destination_key(t *testing.T) {
@@ -60,10 +62,10 @@ func TestKVStoreRename_without_overwrite_and_existing_destination_key(t *testing
6062
_, srcIn := kvStore["abc"]
6163
_, destIn := kvStore["easy as"]
6264

63-
notOk(t, err)
64-
assert(t, srcIn == true, "Expected source key to have been removed from KVStore")
65-
assert(t, destIn == true, "Expected destination key to be present in KVStore")
66-
equals(t, kvStore["easy as"], "do re mi")
65+
assert.NotNil(t, err)
66+
assert.True(t, srcIn == true, "Expected source key to have been removed from KVStore")
67+
assert.True(t, destIn == true, "Expected destination key to be present in KVStore")
68+
assert.Equal(t, kvStore["easy as"], "do re mi")
6769
}
6870

6971
func TestKVStoreRename_with_overwrite_and_existing_destination_key(t *testing.T) {
@@ -75,10 +77,10 @@ func TestKVStoreRename_with_overwrite_and_existing_destination_key(t *testing.T)
7577
_, srcIn := kvStore["abc"]
7678
_, destIn := kvStore["easy as"]
7779

78-
ok(t, err)
79-
assert(t, srcIn == false, "Expected source key to have been removed from KVStore")
80-
assert(t, destIn == true, "Expected destination key to be present in KVStore")
81-
equals(t, kvStore["easy as"], 123)
80+
assert.Nil(t, err)
81+
assert.True(t, srcIn == false, "Expected source key to have been removed from KVStore")
82+
assert.True(t, destIn == true, "Expected destination key to be present in KVStore")
83+
assert.Equal(t, kvStore["easy as"], 123)
8284
}
8385

8486
func TestKVStoreRename_with_overwrite_and_non_existing_destination_key(t *testing.T) {
@@ -89,10 +91,10 @@ func TestKVStoreRename_with_overwrite_and_non_existing_destination_key(t *testin
8991
_, srcIn := kvStore["abc"]
9092
_, destIn := kvStore["easy as"]
9193

92-
ok(t, err)
93-
assert(t, srcIn == false, "Expected source key to have been removed from KVStore")
94-
assert(t, destIn == true, "Expected destination key to be present in KVStore")
95-
equals(t, kvStore["easy as"], 123)
94+
assert.Nil(t, err)
95+
assert.True(t, srcIn == false, "Expected source key to have been removed from KVStore")
96+
assert.True(t, destIn == true, "Expected destination key to be present in KVStore")
97+
assert.Equal(t, kvStore["easy as"], 123)
9698
}
9799

98100
func TestKVStoreKeys(t *testing.T) {
@@ -101,7 +103,7 @@ func TestKVStoreKeys(t *testing.T) {
101103
kvStore["easy as"] = "do re mi"
102104

103105
keys := kvStore.Keys()
104-
equals(t, keys, []string{"abc", "easy as"})
106+
assert.Equal(t, keys, []string{"abc", "easy as"})
105107
}
106108

107109
func TestKVStoreItems(t *testing.T) {
@@ -114,5 +116,5 @@ func TestKVStoreItems(t *testing.T) {
114116
"abc": 123,
115117
"easy as": "do re mi",
116118
}
117-
equals(t, items, expected)
119+
assert.Equal(t, items, expected)
118120
}

‎internal/trousseau/test_helpers.go

-44
This file was deleted.

‎internal/trousseau/trousseau_test.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/oleiade/tempura"
87
"os"
8+
9+
"github.com/oleiade/tempura"
10+
"github.com/stretchr/testify/assert"
911
)
1012

1113
func TestOpenTrousseau(t *testing.T) {
@@ -24,9 +26,9 @@ func TestOpenTrousseau(t *testing.T) {
2426
t.Fatal(err)
2527
}
2628

27-
assert(t, tr.CryptoType == ASYMMETRIC_ENCRYPTION, "Wrong encryption type")
28-
assert(t, tr.CryptoAlgorithm == GPG_ENCRYPTION, "Wrong encryption algorithm")
29-
equals(t, tr.Data, []byte("abc"))
29+
assert.True(t, tr.CryptoType == ASYMMETRIC_ENCRYPTION, "Wrong encryption type")
30+
assert.True(t, tr.CryptoAlgorithm == GPG_ENCRYPTION, "Wrong encryption algorithm")
31+
assert.Equal(t, tr.Data, []byte("abc"))
3032
}
3133

3234
func TestOpenTrousseau_returns_err_when_file_does_not_exist(t *testing.T) {

‎internal/trousseau/upgrade_test.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@ import (
55
"testing"
66

77
"github.com/oleiade/serrure/openpgp"
8+
"github.com/stretchr/testify/assert"
89
)
910

1011
func TestIsVersionZeroDotThree(t *testing.T) {
1112
data := []byte(openpgp.PGP_MESSAGE_HEADER +
1213
"12kjd091jd192jd0192jd" +
1314
openpgp.PGP_MESSAGE_FOOTER)
1415

15-
assert(t,
16+
assert.True(t,
1617
isVersionZeroDotThreeDotZero(data) == true,
1718
"Input test data were suppose to match version 0.3.N")
1819
}
1920

2021
func TestIsVersionZeroDotThree_fails_with_data_shorter_than_pgp_header(t *testing.T) {
2122
data := []byte("abc123")
22-
assert(t,
23+
assert.True(t,
2324
isVersionZeroDotThreeDotZero(data) == false,
2425
"Input test data weren't suppose to match version 0.3.N")
2526
}
@@ -36,7 +37,7 @@ func TestIsVersionZeroDotFour(t *testing.T) {
3637
t.Error(err)
3738
}
3839

39-
assert(t,
40+
assert.True(t,
4041
isVersionZeroDotThreeDotOne(data) == true,
4142
"Input test data were suppose to match version 0.4.N")
4243
}
@@ -49,7 +50,7 @@ func TestDiscoverVersion_with_only_one_valid_version_in_mapping(t *testing.T) {
4950
"0.3.0": isVersionZeroDotThreeDotZero,
5051
}
5152

52-
assert(t,
53+
assert.True(t,
5354
DiscoverVersion(data, mapping) == "0.3.0",
5455
"Version 0.3.0 was supposed to be discovered")
5556
}
@@ -70,7 +71,7 @@ func TestDiscoverVersion_with_two_valid_versions_in_mapping(t *testing.T) {
7071
t.Error(err)
7172
}
7273

73-
assert(t,
74+
assert.True(t,
7475
DiscoverVersion(data, mapping) == "0.4.0",
7576
"Version 0.4.0 was supposed to be discovered")
7677
}
@@ -84,7 +85,7 @@ func TestDiscoverVersion_with_two_matching_version_returns_the_lowest(t *testing
8485
"0.3.1": isVersionZeroDotThreeDotZero,
8586
}
8687

87-
assert(t,
88+
assert.True(t,
8889
DiscoverVersion(data, mapping) == "0.3.0",
8990
"Version 0.3.0 was supposed to be discovered")
9091

@@ -97,5 +98,5 @@ func TestDiscoverVersion_with_no_matching_version(t *testing.T) {
9798
"0.4.0": isVersionZeroDotThreeDotOne,
9899
}
99100

100-
equals(t, DiscoverVersion(data, mapping), "")
101+
assert.Equal(t, DiscoverVersion(data, mapping), "")
101102
}

‎pkg/gpgagent/gpgagent_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestPrompt(t *testing.T) {
3737
Desc: "Type 'foo' for testing",
3838
Error: "seriously, or I'll be an error.",
3939
Prompt: "foo",
40-
CacheKey: fmt.Sprintf("gpgagent_test-cachekey-%d", time.Now()),
40+
CacheKey: fmt.Sprintf("gpgagent_test-cachekey-%d", time.Now().Unix()),
4141
}
4242
s1, err := conn.GetPassphrase(req)
4343
if err != nil {
@@ -73,7 +73,7 @@ func TestPrompt(t *testing.T) {
7373
Desc: "Press Cancel for testing",
7474
Error: "seriously, or I'll be an error.",
7575
Prompt: "cancel!",
76-
CacheKey: fmt.Sprintf("gpgagent_test-cachekey-%d", time.Now()),
76+
CacheKey: fmt.Sprintf("gpgagent_test-cachekey-%d", time.Now().Unix()),
7777
})
7878
if err != ErrCancel {
7979
t.Errorf("expected cancel, got %q, %v", s4, err)

0 commit comments

Comments
 (0)