go: move app logic to xkcdreader package
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
7550acc8ab
commit
f099f43f05
23
main.go
23
main.go
@ -4,34 +4,17 @@ import (
|
||||
"fmt"
|
||||
|
||||
"git.dotya.ml/wanderer/go-xkcdreader/cmd"
|
||||
|
||||
"fyne.io/fyne/v2/app"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.dotya.ml/wanderer/go-xkcdreader/xkcdreader"
|
||||
)
|
||||
|
||||
const appGreeting = "welcome to go-xkcdreader"
|
||||
|
||||
var version = cmd.GetShortVersion()
|
||||
|
||||
func main() {
|
||||
cmd.Execute()
|
||||
|
||||
fmt.Println("Starting " + cmd.GetAppName() + " " + getVersion())
|
||||
fmt.Println("Starting " + cmd.GetAppName() + " " + version)
|
||||
|
||||
a := app.New()
|
||||
w := a.NewWindow(cmd.GetAppName())
|
||||
|
||||
w.SetContent(makeGreeting())
|
||||
|
||||
w.ShowAndRun()
|
||||
xkcdreader.RunApp()
|
||||
|
||||
fmt.Println("Exited")
|
||||
}
|
||||
|
||||
func makeGreeting() *widget.Label {
|
||||
return widget.NewLabel(appGreeting)
|
||||
}
|
||||
|
||||
func getVersion() string {
|
||||
return version
|
||||
}
|
||||
|
20
main_test.go
20
main_test.go
@ -2,28 +2,8 @@ package main
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"git.dotya.ml/wanderer/go-xkcdreader/cmd"
|
||||
)
|
||||
|
||||
func TestGreetingText(t *testing.T) {
|
||||
want := "welcome to " + cmd.GetAppName()
|
||||
got := makeGreeting()
|
||||
|
||||
if got.Text != want {
|
||||
t.Errorf("Incorrect initial greeting, want: %q, got: %q", want, got.Text)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLocalgetVersion(t *testing.T) {
|
||||
want := version
|
||||
got := getVersion()
|
||||
|
||||
if got != want {
|
||||
t.Errorf("Incorrect version from getVersion, want: %q, got: %q", want, got)
|
||||
}
|
||||
}
|
||||
|
||||
// does this test even make sense?
|
||||
func TestExecMain(t *testing.T) {
|
||||
go main()
|
||||
|
24
xkcdreader/app.go
Normal file
24
xkcdreader/app.go
Normal file
@ -0,0 +1,24 @@
|
||||
package xkcdreader
|
||||
|
||||
import (
|
||||
"fyne.io/fyne/v2/app"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.dotya.ml/wanderer/go-xkcdreader/cmd"
|
||||
)
|
||||
|
||||
const appGreeting = "welcome to go-xkcdreader"
|
||||
|
||||
// RunApp performs sets up and runs the main application
|
||||
func RunApp() {
|
||||
a := app.New()
|
||||
w := a.NewWindow(cmd.GetAppName())
|
||||
|
||||
w.SetContent(makeGreeting())
|
||||
|
||||
w.ShowAndRun()
|
||||
}
|
||||
|
||||
// makeGreeting creates a greeting label
|
||||
func makeGreeting() *widget.Label {
|
||||
return widget.NewLabel(appGreeting)
|
||||
}
|
16
xkcdreader/app_test.go
Normal file
16
xkcdreader/app_test.go
Normal file
@ -0,0 +1,16 @@
|
||||
package xkcdreader
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"git.dotya.ml/wanderer/go-xkcdreader/cmd"
|
||||
)
|
||||
|
||||
func TestGreetingText(t *testing.T) {
|
||||
want := "welcome to " + cmd.GetAppName()
|
||||
got := makeGreeting()
|
||||
|
||||
if got.Text != want {
|
||||
t.Errorf("Incorrect initial greeting, want: %q, got: %q", want, got.Text)
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user