fixed cache tests

master
Oliver Tonnhofer 2013-05-17 15:33:36 +02:00
parent 03dc885462
commit 81d818a0c4
2 changed files with 3 additions and 74 deletions

View File

@ -80,8 +80,8 @@ func TestMarshalRelation(t *testing.T) {
rel.Tags = make(element.Tags)
rel.Tags["name"] = "test"
rel.Tags["landusage"] = "forest"
rel.Members = append(rel.Members, element.Member{123, element.WAY, "outer"})
rel.Members = append(rel.Members, element.Member{124, element.WAY, "inner"})
rel.Members = append(rel.Members, element.Member{123, element.WAY, "outer", nil})
rel.Members = append(rel.Members, element.Member{124, element.WAY, "inner", nil})
data, _ := MarshalRelation(rel)
rel, _ = UnmarshalRelation(data)

73
cache/db_test.go vendored
View File

@ -11,7 +11,7 @@ func TestCreateCache(t *testing.T) {
cache_dir, _ := ioutil.TempDir("", "goposm_test")
defer os.RemoveAll(cache_dir)
cache, err := NewCoordsCache(cache_dir)
cache, err := NewNodesCache(cache_dir)
if err != nil {
t.Fatal()
}
@ -22,32 +22,6 @@ func TestCreateCache(t *testing.T) {
}
}
func TestReadWriteCoord(t *testing.T) {
cache_dir, _ := ioutil.TempDir("", "goposm_test")
defer os.RemoveAll(cache_dir)
cache, err := NewCoordsCache(cache_dir)
if err != nil {
t.Fatal()
}
node := &element.Node{}
node.Id = 1
cache.PutCoord(node)
cache.Close()
cache, err = NewCoordsCache(cache_dir)
if err != nil {
t.Fatal()
}
defer cache.Close()
data, _ := cache.GetCoord(1)
if data.Id != 1 {
t.Errorf("unexpected result of GetNode(1): %v", data)
}
}
func TestReadWriteNode(t *testing.T) {
cache_dir, _ := ioutil.TempDir("", "goposm_test")
defer os.RemoveAll(cache_dir)
@ -181,48 +155,3 @@ func BenchmarkReadWay(b *testing.B) {
}
}
func BenchmarkWriteCoord(b *testing.B) {
b.StopTimer()
cache_dir, _ := ioutil.TempDir("", "goposm_test")
defer os.RemoveAll(cache_dir)
cache, err := NewCoordsCache(cache_dir)
if err != nil {
b.Fatal()
}
defer cache.Close()
b.StartTimer()
node := &element.Node{}
for i := 0; i < b.N; i++ {
node.Id = int64(i)
cache.PutCoord(node)
}
}
func BenchmarkReadCoord(b *testing.B) {
b.StopTimer()
cache_dir, _ := ioutil.TempDir("", "goposm_test")
defer os.RemoveAll(cache_dir)
cache, err := NewCoordsCache(cache_dir)
if err != nil {
b.Fatal()
}
defer cache.Close()
node := &element.Node{}
for i := 0; i < b.N; i++ {
node.Id = int64(i)
cache.PutCoord(node)
}
b.StartTimer()
for i := int64(0); i < int64(b.N); i++ {
if coord, err := cache.GetCoord(i); err == nil || coord.Id != i {
b.Fail()
}
}
}