pass test

khanhtc1202 · Jan 31, 2019 · 842758d · 842758d
1 parent f40546d
commit 842758d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/bin/chio-darwin-64 b/bin/chio-darwin-64
diff --git a/bin/chio-linux-64 b/bin/chio-linux-64
diff --git a/pkg/module.go b/pkg/module.go
@@ -20,11 +20,7 @@ type Module struct {
 func NewModule(rootPath string) *Module {
 	absPath, _ := filepath.Abs(rootPath)
 	return &Module{
-<<<<<<< HEAD
 		RootPath:    absPath + "/", // module dir path end with '/'
-=======
-		RootPath:    absPath,
->>>>>>> 7cae6a0c7f1057cbc163dd35969511074d6f8c1e
 		SourceFiles: EmptySourceFiles(),
 	}
 }

diff --git a/pkg/module_test.go b/pkg/module_test.go
@@ -13,7 +13,7 @@ func TestModule_AddSourceFile_FirstTimeAddFileToEmptyModule(t *testing.T) {
 
 	err := emptyModule.AddSourceFile(file)
 	assert.Nil(t, err)
-	assert.Equal(t, "/home/user/go/src/sample", emptyModule.RootPath)
+	assert.Equal(t, "/home/user/go/src/sample/", emptyModule.RootPath)
 }
 
 func TestModule_AddSourceFile_AddFileToExistedModule(t *testing.T) {
@@ -24,7 +24,7 @@ func TestModule_AddSourceFile_AddFileToExistedModule(t *testing.T) {
 	err := emptyModule.AddSourceFile(file1)
 	err = emptyModule.AddSourceFile(file2)
 	assert.Nil(t, err)
-	assert.Equal(t, "/home/user/go/src/sample", emptyModule.RootPath)
+	assert.Equal(t, "/home/user/go/src/sample/", emptyModule.RootPath)
 }
 
 func TestModule_GetSourceFilesPath(t *testing.T) {