diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-09-07 18:41:01 +0200 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-09-07 18:41:01 +0200 |
| commit | 7f7b6884d11e0e2b891814b84eb906db284a50b0 (patch) | |
| tree | ed3f2ec29b5efda3fbb628a09628464d98fce336 /state_test.go | |
| parent | 809bc265d11b508903313f5b0a8c1a04add7209b (diff) | |
Refactor: Define FSM state constants inside the public package
Diffstat (limited to 'state_test.go')
| -rw-r--r-- | state_test.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/state_test.go b/state_test.go index 2106f40..b87b1ef 100644 --- a/state_test.go +++ b/state_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/jwijenbergh/eduvpn-common/internal/fsm" httpw "github.com/jwijenbergh/eduvpn-common/internal/http" "github.com/jwijenbergh/eduvpn-common/internal/oauth" "github.com/jwijenbergh/eduvpn-common/internal/server" @@ -63,12 +62,12 @@ func loginOAuthSelenium(t *testing.T, url string, state *VPNState) { func stateCallback( t *testing.T, - oldState StateID, - newState StateID, + oldState FSMStateID, + newState FSMStateID, data interface{}, state *VPNState, ) { - if newState == fsm.OAUTH_STARTED { + if newState == STATE_OAUTH_STARTED { url, ok := data.(string) if !ok { @@ -86,7 +85,7 @@ func Test_server(t *testing.T) { state.Register( "org.eduvpn.app.linux", "configstest", - func(old StateID, new StateID, data interface{}) { + func(old FSMStateID, new FSMStateID, data interface{}) { stateCallback(t, old, new, data, state) }, false, @@ -111,8 +110,8 @@ func test_connect_oauth_parameter( state.Register( "org.eduvpn.app.linux", configDirectory, - func(oldState StateID, newState StateID, data interface{}) { - if newState == fsm.OAUTH_STARTED { + func(oldState FSMStateID, newState FSMStateID, data interface{}) { + if newState == STATE_OAUTH_STARTED { baseURL := "http://127.0.0.1:8000/callback" url, err := httpw.HTTPConstructURL(baseURL, parameters) if err != nil { @@ -190,7 +189,7 @@ func Test_token_expired(t *testing.T) { state.Register( "org.eduvpn.app.linux", "configsexpired", - func(old StateID, new StateID, data interface{}) { + func(old FSMStateID, new FSMStateID, data interface{}) { stateCallback(t, old, new, data, state) }, false, @@ -243,7 +242,7 @@ func Test_token_invalid(t *testing.T) { state.Register( "org.eduvpn.app.linux", "configsinvalid", - func(old StateID, new StateID, data interface{}) { + func(old FSMStateID, new FSMStateID, data interface{}) { stateCallback(t, old, new, data, state) }, false, @@ -293,7 +292,7 @@ func Test_invalid_profile_corrected(t *testing.T) { state.Register( "org.eduvpn.app.linux", "configscancelprofile", - func(old StateID, new StateID, data interface{}) { + func(old FSMStateID, new FSMStateID, data interface{}) { stateCallback(t, old, new, data, state) }, false, |