ewintr
/
planner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

This commit is contained in:
Erik Winter 2024-11-15 07:25:23 +01:00
parent e50e08eefd
commit aeda0158dc
3 changed files with 250 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plan/command/add.go
View File

@ -43,7 +43,9 @@ func (add *AddCmd) Parse(main []string, flags map[string]string) error {
return ErrWrongCommand
}
as := add.argSet
if len(main) > 1 {
as.Main = strings.Join(main[1:], " ")
}
for k := range as.Flags {
if err := as.Set(k, flags[k]); err != nil {
return fmt.Errorf("could not set %s: %v", k, err)

296
plan/command/add_test.go
View File

@ -2,10 +2,7 @@ package command_test
import (
"testing"
"time"
"github.com/google/go-cmp/cmp"
"go-mod.ewintr.nl/planner/item"
"go-mod.ewintr.nl/planner/plan/command"
"go-mod.ewintr.nl/planner/plan/storage/memory"
)
@ -14,30 +11,33 @@ func TestAddParse(t *testing.T) {
t.Parallel()
aDateStr := "2024-11-02"
aDate := time.Date(2024, 11, 9, 0, 0, 0, 0, time.UTC)
// aDate := time.Date(2024, 11, 9, 0, 0, 0, 0, time.UTC)
aTimeStr := "12:00"
aTime := time.Date(0, 0, 0, 12, 0, 0, 0, time.UTC)
aDayStr := "24h"
aDay := time.Duration(24) * time.Hour
// aTime := time.Date(0, 0, 0, 12, 0, 0, 0, time.UTC)
// aDayStr := "24h"
// aDay := time.Duration(24) * time.Hour
flagOn := &command.FlagDate{
Name: command.FlagOn,
Value: aDate,
}
flagAt := &command.FlagTime{
Name: command.FlagAt,
Value: aTime,
}
flagFor := &command.FlagDuration{
Name: command.FlagFor,
Value: aDay,
}
// flagOn := &command.FlagDate{
// Name: command.FlagOn,
// Value: aDate,
// }
// flagAt := &command.FlagTime{
// Name: command.FlagAt,
// Value: aTime,
// }
// flagFor := &command.FlagDuration{
// Name: command.FlagFor,
// Value: aDay,
// }
cmd := command.AddCmd{}
eventRepo := memory.NewEvent()
localRepo := memory.NewLocalID()
syncRepo := memory.NewSync()
cmd := command.NewAddCmd(localRepo, eventRepo, syncRepo)
for _, tc := range []struct {
name string
main []string
flags map[string]command.Flag
flags map[string]string
expErr bool
}{
{
@ -47,8 +47,8 @@ func TestAddParse(t *testing.T) {
{
name: "title missing",
main: []string{"add"},
flags: map[string]command.Flag{
command.FlagOn: flagOn,
flags: map[string]string{
command.FlagOn: aDateStr,
},
expErr: true,
},
@ -60,16 +60,16 @@ func TestAddParse(t *testing.T) {
{
name: "minimal",
main: []string{"add", "title"},
flags: map[string]command.Flag{
command.FlagOn: flagOn,
flags: map[string]string{
command.FlagOn: aDateStr,
},
},
{
name: "start",
main: []string{"add", "title"},
flags: map[string]command.Flag{
command.FlagOn: flagOn,
command.FlagAt: flagAt,
flags: map[string]string{
command.FlagOn: aDateStr,
command.FlagAt: aTimeStr,
},
},
// {
@ -95,135 +95,129 @@ func TestAddParse(t *testing.T) {
if tc.expErr != (actErr != nil) {
t.Errorf("exp nil, got %v", actErr)
}
if tc.expErr {
return
}
if diff := cmp.Diff(tc.expAS, actAS); diff != "" {
t.Errorf("(exp +, got -)\n%s", diff)
}
})
}
}
func TestAdd(t *testing.T) {
t.Parallel()
// func TestAdd(t *testing.T) {
// t.Parallel()
oneHour, err := time.ParseDuration("1h")
if err != nil {
t.Errorf("exp nil, got %v", err)
}
oneDay, err := time.ParseDuration("24h")
if err != nil {
t.Errorf("exp nil, got %v", err)
}
// oneHour, err := time.ParseDuration("1h")
// if err != nil {
// t.Errorf("exp nil, got %v", err)
// }
// oneDay, err := time.ParseDuration("24h")
// if err != nil {
// t.Errorf("exp nil, got %v", err)
// }
for _, tc := range []struct {
name string
args *command.ArgSet
expEvent item.Event
expErr bool
}{
{
name: "time, but no duration",
args: &command.ArgSet{
Main: "event",
Flags: map[string]string{
command.FlagOn: "2024-10-01",
command.FlagAt: "9:00",
},
},
expEvent: item.Event{
ID: "a",
EventBody: item.EventBody{
Title: "event",
Start: time.Date(2024, 10, 1, 9, 0, 0, 0, time.UTC),
},
},
},
{
name: "no time, no duration",
args: &command.ArgSet{
Main: "event",
Flags: map[string]string{
command.FlagOn: "2024-10-01",
command.FlagFor: "24h",
},
},
expEvent: item.Event{
ID: "a",
EventBody: item.EventBody{
Title: "event",
Start: time.Date(2024, 10, 1, 0, 0, 0, 0, time.UTC),
Duration: oneDay,
},
},
},
{
name: "full",
args: &command.ArgSet{
Main: "event",
Flags: map[string]string{
command.FlagOn: "2024-10-01",
command.FlagAt: "9:00",
command.FlagFor: "1h",
},
},
expEvent: item.Event{
ID: "a",
EventBody: item.EventBody{
Title: "event",
Start: time.Date(2024, 10, 1, 9, 0, 0, 0, time.UTC),
Duration: oneHour,
},
},
},
} {
t.Run(tc.name, func(t *testing.T) {
eventRepo := memory.NewEvent()
localRepo := memory.NewLocalID()
syncRepo := memory.NewSync()
cmd := command.NewAddCmd(localRepo, eventRepo, syncRepo)
actErr := cmd.Do(tc.args) != nil
if tc.expErr != actErr {
t.Errorf("exp %v, got %v", tc.expErr, actErr)
}
if tc.expErr {
return
}
actEvents, err := eventRepo.FindAll()
if err != nil {
t.Errorf("exp nil, got %v", err)
}
if len(actEvents) != 1 {
t.Errorf("exp 1, got %d", len(actEvents))
}
// for _, tc := range []struct {
// name string
// args *command.ArgSet
// expEvent item.Event
// expErr bool
// }{
// {
// name: "time, but no duration",
// args: &command.ArgSet{
// Main: "event",
// Flags: map[string]string{
// command.FlagOn: "2024-10-01",
// command.FlagAt: "9:00",
// },
// },
// expEvent: item.Event{
// ID: "a",
// EventBody: item.EventBody{
// Title: "event",
// Start: time.Date(2024, 10, 1, 9, 0, 0, 0, time.UTC),
// },
// },
// },
// {
// name: "no time, no duration",
// args: &command.ArgSet{
// Main: "event",
// Flags: map[string]string{
// command.FlagOn: "2024-10-01",
// command.FlagFor: "24h",
// },
// },
// expEvent: item.Event{
// ID: "a",
// EventBody: item.EventBody{
// Title: "event",
// Start: time.Date(2024, 10, 1, 0, 0, 0, 0, time.UTC),
// Duration: oneDay,
// },
// },
// },
// {
// name: "full",
// args: &command.ArgSet{
// Main: "event",
// Flags: map[string]string{
// command.FlagOn: "2024-10-01",
// command.FlagAt: "9:00",
// command.FlagFor: "1h",
// },
// },
// expEvent: item.Event{
// ID: "a",
// EventBody: item.EventBody{
// Title: "event",
// Start: time.Date(2024, 10, 1, 9, 0, 0, 0, time.UTC),
// Duration: oneHour,
// },
// },
// },
// } {
// t.Run(tc.name, func(t *testing.T) {
// eventRepo := memory.NewEvent()
// localRepo := memory.NewLocalID()
// syncRepo := memory.NewSync()
// cmd := command.NewAddCmd(localRepo, eventRepo, syncRepo)
// actErr := cmd.Do(tc.args) != nil
// if tc.expErr != actErr {
// t.Errorf("exp %v, got %v", tc.expErr, actErr)
// }
// if tc.expErr {
// return
// }
// actEvents, err := eventRepo.FindAll()
// if err != nil {
// t.Errorf("exp nil, got %v", err)
// }
// if len(actEvents) != 1 {
// t.Errorf("exp 1, got %d", len(actEvents))
// }
actLocalIDs, err := localRepo.FindAll()
if err != nil {
t.Errorf("exp nil, got %v", err)
}
if len(actLocalIDs) != 1 {
t.Errorf("exp 1, got %v", len(actLocalIDs))
}
if _, ok := actLocalIDs[actEvents[0].ID]; !ok {
t.Errorf("exp true, got %v", ok)
}
// actLocalIDs, err := localRepo.FindAll()
// if err != nil {
// t.Errorf("exp nil, got %v", err)
// }
// if len(actLocalIDs) != 1 {
// t.Errorf("exp 1, got %v", len(actLocalIDs))
// }
// if _, ok := actLocalIDs[actEvents[0].ID]; !ok {
// t.Errorf("exp true, got %v", ok)
// }
if actEvents[0].ID == "" {
t.Errorf("exp string not te be empty")
}
tc.expEvent.ID = actEvents[0].ID
if diff := cmp.Diff(tc.expEvent, actEvents[0]); diff != "" {
t.Errorf("(exp +, got -)\n%s", diff)
}
// if actEvents[0].ID == "" {
// t.Errorf("exp string not te be empty")
// }
// tc.expEvent.ID = actEvents[0].ID
// if diff := cmp.Diff(tc.expEvent, actEvents[0]); diff != "" {
// t.Errorf("(exp +, got -)\n%s", diff)
// }
updated, err := syncRepo.FindAll()
if err != nil {
t.Errorf("exp nil, got %v", err)
}
if len(updated) != 1 {
t.Errorf("exp 1, got %v", len(updated))
}
})
}
}
// updated, err := syncRepo.FindAll()
// if err != nil {
// t.Errorf("exp nil, got %v", err)
// }
// if len(updated) != 1 {
// t.Errorf("exp 1, got %v", len(updated))
// }
// })
// }
// }

209
plan/command/command_test.go
View File

@ -1,116 +1,109 @@
package command_test
import (
"testing"
// func TestArgSet(t *testing.T) {
// t.Parallel()
"github.com/google/go-cmp/cmp"
"go-mod.ewintr.nl/planner/plan/command"
)
// as := command.ArgSet{
// Main: "main",
// Flags: map[string]string{
// "name 1": "value 1",
// "name 2": "value 2",
// "name 3": "value 3",
// },
// }
func TestArgSet(t *testing.T) {
t.Parallel()
// t.Run("hasflag", func(t *testing.T) {
// t.Run("true", func(t *testing.T) {
// if has := as.HasFlag("name 1"); !has {
// t.Errorf("exp true, got %v", has)
// }
// })
// t.Run("false", func(t *testing.T) {
// if has := as.HasFlag("unknown"); has {
// t.Errorf("exp false, got %v", has)
// }
// })
// })
as := command.ArgSet{
Main: "main",
Flags: map[string]string{
"name 1": "value 1",
"name 2": "value 2",
"name 3": "value 3",
},
}
// t.Run("flag", func(t *testing.T) {
// t.Run("known", func(t *testing.T) {
// if val := as.Flag("name 1"); val != "value 1" {
// t.Errorf("exp value 1, got %v", val)
// }
// })
// t.Run("unknown", func(t *testing.T) {
// if val := as.Flag("unknown"); val != "" {
// t.Errorf(`exp "", got %v`, val)
// }
// })
// })
t.Run("hasflag", func(t *testing.T) {
t.Run("true", func(t *testing.T) {
if has := as.HasFlag("name 1"); !has {
t.Errorf("exp true, got %v", has)
}
})
t.Run("false", func(t *testing.T) {
if has := as.HasFlag("unknown"); has {
t.Errorf("exp false, got %v", has)
}
})
})
// t.Run("setflag", func(t *testing.T) {
// exp := "new value"
// as.SetFlag("new name", exp)
// if act := as.Flag("new name"); exp != act {
// t.Errorf("exp %v, got %v", exp, act)
// }
// })
// }
t.Run("flag", func(t *testing.T) {
t.Run("known", func(t *testing.T) {
if val := as.Flag("name 1"); val != "value 1" {
t.Errorf("exp value 1, got %v", val)
}
})
t.Run("unknown", func(t *testing.T) {
if val := as.Flag("unknown"); val != "" {
t.Errorf(`exp "", got %v`, val)
}
})
})
// func TestParseArgs(t *testing.T) {
// t.Parallel()
t.Run("setflag", func(t *testing.T) {
exp := "new value"
as.SetFlag("new name", exp)
if act := as.Flag("new name"); exp != act {
t.Errorf("exp %v, got %v", exp, act)
}
})
}
func TestParseArgs(t *testing.T) {
t.Parallel()
for _, tc := range []struct {
name string
args []string
expAS *command.ArgSet
expErr bool
}{
{
name: "empty",
expAS: &command.ArgSet{
Flags: map[string]string{},
},
},
{
name: "just main",
args: []string{"one", "two three", "four"},
expAS: &command.ArgSet{
Main: "one two three four",
Flags: map[string]string{},
},
},
{
name: "with flags",
args: []string{"-flag1", "value1", "one", "two", "-flag2", "value2", "-flag3", "value3"},
expAS: &command.ArgSet{
Main: "one two",
Flags: map[string]string{
"flag1": "value1",
"flag2": "value2",
"flag3": "value3",
},
},
},
{
name: "flag without value",
args: []string{"one", "two", "-flag1"},
expErr: true,
},
{
name: "split main",
args: []string{"one", "-flag1", "value1", "two"},
expErr: true,
},
} {
t.Run(tc.name, func(t *testing.T) {
actAS, actErr := command.ParseArgs(tc.args)
if tc.expErr != (actErr != nil) {
t.Errorf("exp %v, got %v", tc.expErr, actErr)
}
if tc.expErr {
return
}
if diff := cmp.Diff(tc.expAS, actAS); diff != "" {
t.Errorf("(exp +, got -)\n%s", diff)
}
})
}
}
// for _, tc := range []struct {
// name string
// args []string
// expAS *command.ArgSet
// expErr bool
// }{
// {
// name: "empty",
// expAS: &command.ArgSet{
// Flags: map[string]string{},
// },
// },
// {
// name: "just main",
// args: []string{"one", "two three", "four"},
// expAS: &command.ArgSet{
// Main: "one two three four",
// Flags: map[string]string{},
// },
// },
// {
// name: "with flags",
// args: []string{"-flag1", "value1", "one", "two", "-flag2", "value2", "-flag3", "value3"},
// expAS: &command.ArgSet{
// Main: "one two",
// Flags: map[string]string{
// "flag1": "value1",
// "flag2": "value2",
// "flag3": "value3",
// },
// },
// },
// {
// name: "flag without value",
// args: []string{"one", "two", "-flag1"},
// expErr: true,
// },
// {
// name: "split main",
// args: []string{"one", "-flag1", "value1", "two"},
// expErr: true,
// },
// } {
// t.Run(tc.name, func(t *testing.T) {
// actAS, actErr := command.ParseArgs(tc.args)
// if tc.expErr != (actErr != nil) {
// t.Errorf("exp %v, got %v", tc.expErr, actErr)
// }
// if tc.expErr {
// return
// }
// if diff := cmp.Diff(tc.expAS, actAS); diff != "" {
// t.Errorf("(exp +, got -)\n%s", diff)
// }
// })
// }
// }