Use runtime.GOOS to identify Windows specific path tests

This commit is contained in:
bep 2015-01-27 23:01:32 +01:00
parent 0b5f8c8cb3
commit e52a76f559
3 changed files with 32 additions and 54 deletions

View file

@ -6,6 +6,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"strconv" "strconv"
"strings" "strings"
"testing" "testing"
@ -398,6 +399,16 @@ func TestAbsPathify(t *testing.T) {
{"dir", filepath.FromSlash("/work"), filepath.FromSlash("/work/dir")}, {"dir", filepath.FromSlash("/work"), filepath.FromSlash("/work/dir")},
} }
windowsData := []test{
{"c:\\banana\\..\\dir", "c:\\foo", "c:\\dir"},
{"\\dir", "c:\\foo", "c:\\foo\\dir"},
{"c:\\", "c:\\foo", "c:\\"},
}
unixData := []test{
{"/banana/../dir/", "/work", "/dir"},
}
for i, d := range data { for i, d := range data {
// todo see comment in AbsPathify // todo see comment in AbsPathify
viper.Set("WorkingDir", d.workingDir) viper.Set("WorkingDir", d.workingDir)
@ -407,6 +418,27 @@ func TestAbsPathify(t *testing.T) {
t.Errorf("Test %d failed. Expected %q but got %q", i, d.expected, expected) t.Errorf("Test %d failed. Expected %q but got %q", i, d.expected, expected)
} }
} }
t.Logf("Running platform specific path tests for %s", runtime.GOOS)
if runtime.GOOS == "windows" {
for i, d := range windowsData {
viper.Set("WorkingDir", d.workingDir)
expected := AbsPathify(d.inPath)
if d.expected != expected {
t.Errorf("Test %d failed. Expected %q but got %q", i, d.expected, expected)
}
}
} else {
for i, d := range unixData {
viper.Set("WorkingDir", d.workingDir)
expected := AbsPathify(d.inPath)
if d.expected != expected {
t.Errorf("Test %d failed. Expected %q but got %q", i, d.expected, expected)
}
}
}
} }
func TestFilename(t *testing.T) { func TestFilename(t *testing.T) {

View file

@ -1,27 +0,0 @@
// +build !windows
package helpers
import (
"github.com/spf13/viper"
"testing"
)
func TestPlatformAbsPathify(t *testing.T) {
type test struct {
inPath, workingDir, expected string
}
data := []test{
{"/banana/../dir/", "/work", "/dir"},
}
for i, d := range data {
// todo see comment in AbsPathify
viper.Set("WorkingDir", d.workingDir)
expected := AbsPathify(d.inPath)
if d.expected != expected {
t.Errorf("Test %d failed. Expected %q but got %q", i, d.expected, expected)
}
}
}

View file

@ -1,27 +0,0 @@
package helpers
import (
"github.com/spf13/viper"
"testing"
)
func TestPlatformAbsPathify(t *testing.T) {
type test struct {
inPath, workingDir, expected string
}
data := []test{
{"c:\\banana\\..\\dir", "c:\\foo", "c:\\dir"},
{"\\dir", "c:\\foo", "c:\\foo\\dir"},
{"c:\\", "c:\\foo", "c:\\"},
}
for i, d := range data {
// todo see comment in AbsPathify
viper.Set("WorkingDir", d.workingDir)
expected := AbsPathify(d.inPath)
if d.expected != expected {
t.Errorf("Test %d failed. Expected %q but got %q", i, d.expected, expected)
}
}
}