perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: the various db key functions should be instance methods

Browse Source
This commit is contained in:
Jakob Borg
2015-10-31 07:20:35 +01:00
parent e6277d799f
commit faf4267c73
5 changed files with 196 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/db/leveldb_test.go
View File

@@ -16,17 +16,19 @@ func TestDeviceKey(t *testing.T) {
dev := []byte("device67890123456789012345678901")
name := []byte("name")
key := deviceKey(fld, dev, name)
db := &dbInstance{}
fld2 := deviceKeyFolder(key)
key := db.deviceKey(fld, dev, name)
fld2 := db.deviceKeyFolder(key)
if bytes.Compare(fld2, fld) != 0 {
t.Errorf("wrong folder %q != %q", fld2, fld)
}
dev2 := deviceKeyDevice(key)
dev2 := db.deviceKeyDevice(key)
if bytes.Compare(dev2, dev) != 0 {
t.Errorf("wrong device %q != %q", dev2, dev)
}
name2 := deviceKeyName(key)
name2 := db.deviceKeyName(key)
if bytes.Compare(name2, name) != 0 {
t.Errorf("wrong name %q != %q", name2, name)
}
@@ -36,13 +38,15 @@ func TestGlobalKey(t *testing.T) {
fld := []byte("folder6789012345678901234567890123456789012345678901234567890123")
name := []byte("name")
key := globalKey(fld, name)
db := &dbInstance{}
fld2 := globalKeyFolder(key)
key := db.globalKey(fld, name)
fld2 := db.globalKeyFolder(key)
if bytes.Compare(fld2, fld) != 0 {
t.Errorf("wrong folder %q != %q", fld2, fld)
}
name2 := globalKeyName(key)
name2 := db.globalKeyName(key)
if bytes.Compare(name2, name) != 0 {
t.Errorf("wrong name %q != %q", name2, name)
}