mirror of
https://github.com/TECHNOFAB11/jsonnet-bundler.git
synced 2025-12-11 23:50:05 +01:00
refactor: remove dead code
This commit is contained in:
parent
0588b89c07
commit
1caefa556e
3 changed files with 0 additions and 99 deletions
|
|
@ -32,28 +32,6 @@ const (
|
|||
|
||||
var ErrNoFile = errors.New("no jsonnetfile")
|
||||
|
||||
func Choose(dir string) (string, bool, error) {
|
||||
jsonnetfileLock := filepath.Join(dir, LockFile)
|
||||
jsonnetfile := filepath.Join(dir, File)
|
||||
|
||||
lockExists, err := Exists(jsonnetfileLock)
|
||||
if err != nil {
|
||||
return "", false, err
|
||||
}
|
||||
if lockExists {
|
||||
return jsonnetfileLock, true, nil
|
||||
}
|
||||
|
||||
fileExists, err := Exists(jsonnetfile)
|
||||
if err != nil {
|
||||
return "", false, err
|
||||
}
|
||||
if fileExists {
|
||||
return jsonnetfile, false, nil
|
||||
}
|
||||
|
||||
return "", false, ErrNoFile
|
||||
}
|
||||
|
||||
func Load(filepath string) (spec.JsonnetFile, error) {
|
||||
m := spec.JsonnetFile{}
|
||||
|
|
|
|||
|
|
@ -29,63 +29,6 @@ import (
|
|||
|
||||
const notExist = "/this/does/not/exist"
|
||||
|
||||
func TestChoose(t *testing.T) {
|
||||
testcases := []struct {
|
||||
Name string
|
||||
Jsonnetfile []byte
|
||||
JsonnetfileLock []byte
|
||||
ExpectedFilename string
|
||||
ExpectedLock bool
|
||||
ExpectedError error
|
||||
}{{
|
||||
Name: "NoFiles",
|
||||
ExpectedFilename: "",
|
||||
ExpectedLock: false,
|
||||
ExpectedError: jsonnetfile.ErrNoFile,
|
||||
}, {
|
||||
Name: "Jsonnetfile",
|
||||
Jsonnetfile: []byte(`{}`),
|
||||
ExpectedFilename: jsonnetfile.File,
|
||||
ExpectedLock: false,
|
||||
ExpectedError: nil,
|
||||
}, {
|
||||
Name: "JsonnetfileLock",
|
||||
Jsonnetfile: []byte(`{}`),
|
||||
JsonnetfileLock: []byte(`{}`),
|
||||
ExpectedFilename: jsonnetfile.LockFile,
|
||||
ExpectedLock: true,
|
||||
ExpectedError: nil,
|
||||
}}
|
||||
|
||||
for _, tc := range testcases {
|
||||
t.Run(tc.Name, func(t *testing.T) {
|
||||
dir, err := ioutil.TempDir("", "jsonnetfile-choose")
|
||||
assert.Nil(t, err)
|
||||
defer os.Remove(dir)
|
||||
|
||||
if tc.Jsonnetfile != nil {
|
||||
err := ioutil.WriteFile(filepath.Join(dir, jsonnetfile.File), tc.Jsonnetfile, os.ModePerm)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
if tc.JsonnetfileLock != nil {
|
||||
err := ioutil.WriteFile(filepath.Join(dir, jsonnetfile.LockFile), tc.JsonnetfileLock, os.ModePerm)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
filename, isLock, err := jsonnetfile.Choose(dir)
|
||||
|
||||
assert.Equal(t, tc.ExpectedFilename, strings.TrimPrefix(filename, dir+"/"))
|
||||
assert.Equal(t, tc.ExpectedLock, isLock)
|
||||
|
||||
if tc.ExpectedError != nil {
|
||||
assert.EqualError(t, err, tc.ExpectedError.Error())
|
||||
} else {
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoad(t *testing.T) {
|
||||
empty := spec.JsonnetFile{}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,23 +13,3 @@
|
|||
// limitations under the License.
|
||||
|
||||
package pkg
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/jsonnet-bundler/jsonnet-bundler/spec"
|
||||
)
|
||||
|
||||
func TestInsertDependency(t *testing.T) {
|
||||
deps := []spec.Dependency{{Name: "test1", Version: "latest"}}
|
||||
dep := spec.Dependency{Name: "test2", Version: "latest"}
|
||||
|
||||
res, err := insertDependency(deps, dep)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if len(res) != 2 {
|
||||
t.Fatal("Incorrectly inserted")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue