Skip to content

Commit 983502b

Browse files
A few more MustXxx functions
1 parent 5825ab0 commit 983502b

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

dbstore_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ import (
2121
)
2222

2323
func (s *DbZuite) TestExample() {
24-
ws, err := s.store.defs.NewWorksheet("simple")
25-
require.NoError(s.T(), err)
26-
27-
err = ws.Set("name", NewText("Alice"))
28-
require.NoError(s.T(), err)
24+
ws := s.store.defs.MustNewWorksheet("simple")
25+
ws.MustSet("name", NewText("Alice"))
2926

3027
s.MustRunTransaction(func(tx *runner.Tx) error {
3128
session := s.store.Open(tx)

worksheets.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ func NewDefinitions(reader io.Reader) (*Definitions, error) {
6565
}, nil
6666
}
6767

68+
func (defs *Definitions) MustNewWorksheet(name string) *Worksheet {
69+
ws, err := defs.NewWorksheet(name)
70+
if err != nil {
71+
panic(err)
72+
}
73+
return ws
74+
}
75+
6876
func (defs *Definitions) NewWorksheet(name string) (*Worksheet, error) {
6977
ws, err := defs.newUninitializedWorksheet(name)
7078
if err != nil {
@@ -141,6 +149,12 @@ func (ws *Worksheet) Name() string {
141149
return ws.def.name
142150
}
143151

152+
func (ws *Worksheet) MustSet(name string, value Value) {
153+
if err := ws.Set(name, value); err != nil {
154+
panic(err)
155+
}
156+
}
157+
144158
func (ws *Worksheet) Set(name string, value Value) error {
145159
// TODO(pascal): create a 'change', and then commit that change, garantee
146160
// that commits are atomic, and either win or lose the race by using

worksheets_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ func (s *Zuite) TestExample() {
2222
defs, err := NewDefinitions(strings.NewReader(`worksheet simple {1:name text}`))
2323
require.NoError(s.T(), err)
2424

25-
ws, err := defs.NewWorksheet("simple")
26-
require.NoError(s.T(), err)
25+
ws := defs.MustNewWorksheet("simple")
2726

2827
isSet, err := ws.IsSet("name")
2928
require.NoError(s.T(), err)

0 commit comments

Comments
 (0)