idk/gojava
1
0
Fork 0
mirror of https://github.com/go-i2p/gojava.git synced 2025-07-01 17:13:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Run lint tools

Browse Source
This commit is contained in:
sridharv
2016-11-12 22:08:30 +01:00
parent 6e81294963
commit e3ed04cfbf
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gojava.go
View File

@ -70,8 +70,12 @@ func initBuild() (string, func(), error) {
return "", nil, err return "", nil, err
} }
return tmpDir, func() { return tmpDir, func() {
os.RemoveAll(tmpDir) if err := os.RemoveAll(tmpDir); err != nil {
os.Chdir(cwd) fmt.Fprintln(os.Stderr, "failed to remove temp dir:", tmpDir, err)
}
if err := os.Chdir(cwd); err != nil {
fmt.Fprintln(os.Stderr, "failed to change to dir:", cwd, err)
}
}, nil }, nil
} }
@ -137,7 +141,7 @@ func addExtraFiles(javaDir, sourceDir string) ([]string, error) {
if sourceDir == "" { if sourceDir == "" {
return nil, nil return nil, nil
} }
extraFiles := make([]string, 0) var extraFiles []string
err := filepath.Walk(sourceDir, func(path string, info os.FileInfo, walkErr error) error { err := filepath.Walk(sourceDir, func(path string, info os.FileInfo, walkErr error) error {
if walkErr != nil { if walkErr != nil {
return walkErr return walkErr
@ -187,10 +191,8 @@ func createSupportFiles(bindDir, javaDir, mainFile string) error {
} }
inc1, inc2 := filepath.Join(javaHome, "include"), filepath.Join(javaHome, "include", runtime.GOOS) inc1, inc2 := filepath.Join(javaHome, "include"), filepath.Join(javaHome, "include", runtime.GOOS)
flagFile := filepath.Join(bindDir, "gojavacimport.go") flagFile := filepath.Join(bindDir, "gojavacimport.go")
if err := ioutil.WriteFile(flagFile, []byte(fmt.Sprintf(javaInclude, inc1, inc2)), 0600); err != nil {
return err return ioutil.WriteFile(flagFile, []byte(fmt.Sprintf(javaInclude, inc1, inc2)), 0600)
}
return nil
} }
func buildGo(classDir, mainDir string) error { func buildGo(classDir, mainDir string) error {
@ -278,7 +280,7 @@ func bindToJar(target string, sourceDir string, pkgs ...string) error {
jarDir := filepath.Join(tmpDir, "classes") jarDir := filepath.Join(tmpDir, "classes")
classDir := filepath.Join(tmpDir, "classes/go") classDir := filepath.Join(tmpDir, "classes/go")
if err := createDirs(classDir, javaDir, mainDir); err != nil { if err = createDirs(classDir, javaDir, mainDir); err != nil {
return err return err
} }

8
gojava_test.go
View File

@ -9,6 +9,8 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"github.com/surullabs/lint"
) )
var javaTest = flag.String("javatest", ".*", "Run only java tests matching the regular expression") var javaTest = flag.String("javatest", ".*", "Run only java tests matching the regular expression")
@ -17,6 +19,12 @@ func init() {
verbose = testing.Verbose() verbose = testing.Verbose()
} }
func TestLint(t *testing.T) {
if err := lint.Default.Check("."); err != nil {
t.Fatal(err)
}
}
func TestJavaBind(t *testing.T) { func TestJavaBind(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "gojavatest") tmpDir, err := ioutil.TempDir("", "gojavatest")
if err != nil { if err != nil {