diff options
-rw-r--r-- | src/cmd/papo.go | 25 | ||||
-rw-r--r-- | src/papo.go | 22 | ||||
-rw-r--r-- | tests/papo_test.go | 2 |
3 files changed, 24 insertions, 25 deletions
diff --git a/src/cmd/papo.go b/src/cmd/papo.go index 301e4b0..2f78c4d 100644 --- a/src/cmd/papo.go +++ b/src/cmd/papo.go @@ -1,28 +1,7 @@ package main -import ( - "database/sql" - "fmt" - "log" - "os" - - _ "github.com/mattn/go-sqlite3" - "euandre.org/papo/src" -) - +import "euandre.org/papo/src" func main() { - os.Remove("./foo.db") - - db, err := sql.Open("sqlite3", "./foo.db") - if err != nil { - log.Fatal(err) - } - defer db.Close() - - message := papo.Hello("Xablau") - fmt.Println(message) - fmt.Println(message) - message = papo.Hello("Xupliu") - fmt.Println(message) + papo.Main() } diff --git a/src/papo.go b/src/papo.go index d83ac58..aa55df3 100644 --- a/src/papo.go +++ b/src/papo.go @@ -1,8 +1,28 @@ package papo -import "fmt" +import ( + "database/sql" + "fmt" + "log" + "os" + + _ "github.com/mattn/go-sqlite3" +) func Hello(name string) string { message := fmt.Sprintf("Hi, %v. Welcome!", name) return message } + +func Main() { + fmt.Println(Hello("papo")) + + path := "./foo.db" + + os.Remove(path) + db, err := sql.Open("sqlite3", path) + if err != nil { + log.Fatal(err) + } + defer db.Close() +} diff --git a/tests/papo_test.go b/tests/papo_test.go index ef424fb..f585f57 100644 --- a/tests/papo_test.go +++ b/tests/papo_test.go @@ -7,7 +7,7 @@ import ( ) -func TestConvert(t *testing.T) { +func TestHello(t *testing.T) { if papo.Hello("World") != "Hi, World. Welcome!" { t.Fail() } |