test(server): some unit test fails on windows (#392)

reearth · Apr 14, 2023 · bc89f30 · bc89f30
1 parent 8d688c5
commit bc89f30
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ node_modules
 /data
 /.env
 /.env.*
+/.idea
diff --git a/server/pkg/cache/cache_test.go b/server/pkg/cache/cache_test.go
@@ -38,16 +38,24 @@ func TestCache_Get(t *testing.T) {
 	assert.NoError(t, e)
 	assert.Same(t, data, res)
 	assert.Equal(t, 1, called)
+	time.Sleep(1 * time.Nanosecond)
 
 	res, e = cache.Get(ctx) // second
 	assert.NoError(t, e)
 	assert.Same(t, data, res)
 	assert.Equal(t, 2, called)
+	time.Sleep(1 * time.Nanosecond)
 
 	res, e = cache.Get(ctx) // third
 	assert.Same(t, err, e)
 	assert.Same(t, data, res)
 	assert.Equal(t, 3, called)
+	time.Sleep(1 * time.Nanosecond)
+
+	res, e = cache.Get(ctx) // forth
+	assert.NoError(t, e)
+	assert.Same(t, data, res)
+	assert.Equal(t, 4, called)
 }
 
 func TestCache_Get2(t *testing.T) {

diff --git a/server/pkg/file/file_test.go b/server/pkg/file/file_test.go
@@ -3,6 +3,7 @@ package file
 import (
 	"io"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/spf13/afero"
@@ -166,18 +167,18 @@ func TestFilteredIterator(t *testing.T) {
 
 func TestFsIterator(t *testing.T) {
 	fs := afero.NewMemMapFs()
-	_ = fs.MkdirAll("a/b", 0755)
+	_ = fs.MkdirAll(filepath.Join("a", "b"), 0755)
 	f, _ := fs.Create("b")
 	_, _ = f.WriteString("hello")
 	_ = f.Close()
-	_, _ = fs.Create("a/b/c")
+	_, _ = fs.Create(filepath.Join("a", "b", "c"))
 
 	a, err := NewFsIterator(fs)
 	assert.NoError(t, err)
 
 	n, err := a.Next()
 	assert.NoError(t, err)
-	assert.Equal(t, "a/b/c", n.Path)
+	assert.Equal(t, filepath.Join("a", "b", "c"), n.Path)
 	nd, err := io.ReadAll(n.Content)
 	assert.NoError(t, err)
 	assert.Equal(t, []byte{}, nd)

diff --git a/server/pkg/layer/encoding/shp_test.go b/server/pkg/layer/encoding/shp_test.go
@@ -21,6 +21,7 @@ func TestEncodeSHP(t *testing.T) {
 		want  shp.Shape
 	}{
 		{
+			name: "polygon",
 			layer: &merging.SealedLayerItem{
 				SealedLayerCommon: merging.SealedLayerCommon{
 					Merged: layer.Merged{
@@ -141,13 +142,14 @@ func TestEncodeSHP(t *testing.T) {
 			assert.NoError(t, err)
 			en := NewSHPEncoder(tmpFile)
 			assert.NoError(t, en.Encode(tt.layer))
+			assert.NoError(t, tmpFile.Close())
 
 			shape, err := shp.Open(tmpFile.Name())
+			assert.NoError(t, err)
 			assert.True(t, shape.Next())
 
-			assert.NoError(t, err)
-			assert.NoError(t, os.Remove(tmpFile.Name()))
 			assert.NoError(t, shape.Close())
+			assert.NoError(t, os.Remove(tmpFile.Name()))
 
 			_, p := shape.Shape()
 			assert.Equal(t, tt.want, p)