fix: set minimum maxWorkSessions for a cycle
- set the minimum number of work sessions to 1. - test the creation of Pominal variables.
This commit is contained in:
parent
d82196575b
commit
425f23e70f
3 changed files with 150 additions and 23 deletions
97
cases_test.go
Normal file
97
cases_test.go
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
/*
|
||||||
|
Pominal
|
||||||
|
Copyright (C) 2019 Daniel Anglin
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
var pominalTestCases = []struct {
|
||||||
|
description string
|
||||||
|
workSession float64
|
||||||
|
shortBreakSession float64
|
||||||
|
longBreakSession float64
|
||||||
|
maxWorkSessions int
|
||||||
|
expectedPominal Pominal
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
description: "Test case 1 - Create Pominal with all valid parameters.",
|
||||||
|
workSession: 1200,
|
||||||
|
shortBreakSession: 300,
|
||||||
|
longBreakSession: 600,
|
||||||
|
maxWorkSessions: 5,
|
||||||
|
expectedPominal: Pominal{
|
||||||
|
workSession: 1,
|
||||||
|
maxWorkSessions: 5,
|
||||||
|
cycle: 1,
|
||||||
|
countdown: 0,
|
||||||
|
work: 1200,
|
||||||
|
shortBreak: 300,
|
||||||
|
longBreak: 600,
|
||||||
|
label: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: "Test case 2 - Create Pominal with work session set below the minimum.",
|
||||||
|
workSession: 59.9999999999999999999999999999999,
|
||||||
|
shortBreakSession: 1536,
|
||||||
|
longBreakSession: 1200,
|
||||||
|
maxWorkSessions: 4,
|
||||||
|
expectedPominal: Pominal{
|
||||||
|
workSession: 1,
|
||||||
|
maxWorkSessions: 4,
|
||||||
|
cycle: 1,
|
||||||
|
countdown: 0,
|
||||||
|
work: 60,
|
||||||
|
shortBreak: 1536,
|
||||||
|
longBreak: 1200,
|
||||||
|
label: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: "Test case 3 - Create Pominal with both short break and long break below the minimum.",
|
||||||
|
workSession: 1000,
|
||||||
|
shortBreakSession: 1.23,
|
||||||
|
longBreakSession: 45.6743,
|
||||||
|
maxWorkSessions: 1,
|
||||||
|
expectedPominal: Pominal{
|
||||||
|
workSession: 1,
|
||||||
|
maxWorkSessions: 1,
|
||||||
|
cycle: 1,
|
||||||
|
countdown: 0,
|
||||||
|
work: 1000,
|
||||||
|
shortBreak: 60,
|
||||||
|
longBreak: 60,
|
||||||
|
label: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: "Test case 4 - Create Pominal with maximum work sessions set below 1.",
|
||||||
|
workSession: 1500,
|
||||||
|
shortBreakSession: 300,
|
||||||
|
longBreakSession: 1200,
|
||||||
|
maxWorkSessions: -1,
|
||||||
|
expectedPominal: Pominal{
|
||||||
|
workSession: 1,
|
||||||
|
maxWorkSessions: 1,
|
||||||
|
cycle: 1,
|
||||||
|
countdown: 0,
|
||||||
|
work: 1500,
|
||||||
|
shortBreak: 300,
|
||||||
|
longBreak: 1200,
|
||||||
|
label: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
30
pominal.go
30
pominal.go
|
@ -59,11 +59,11 @@ func NewPominal(w, s, l float64, m int) Pominal {
|
||||||
|
|
||||||
return Pominal{
|
return Pominal{
|
||||||
workSession: 1,
|
workSession: 1,
|
||||||
maxWorkSessions: m,
|
maxWorkSessions: setMaxWorkSessions(m),
|
||||||
cycle: 1,
|
cycle: 1,
|
||||||
work: sessionTime(w),
|
work: setSessionTime(w),
|
||||||
shortBreak: sessionTime(s),
|
shortBreak: setSessionTime(s),
|
||||||
longBreak: sessionTime(l),
|
longBreak: setSessionTime(l),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -134,13 +134,25 @@ func (p *Pominal) UpdateSession() {
|
||||||
alert(p.label)
|
alert(p.label)
|
||||||
}
|
}
|
||||||
|
|
||||||
// sessionTime returns the minimum session time
|
// setSessionTime returns the minimum session time
|
||||||
// if the value is less than the minimum.
|
// if the value is less than the minimum.
|
||||||
// Otherwise it returns the value.
|
// Otherwise it returns the value.
|
||||||
func sessionTime(s float64) float64 {
|
func setSessionTime(s float64) float64 {
|
||||||
var minSessionTime float64 = 60
|
var min float64 = 60
|
||||||
if s < minSessionTime {
|
if s < min {
|
||||||
return minSessionTime
|
return min
|
||||||
}
|
}
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// setMaxWorkSessions returns the minimum amount
|
||||||
|
// of work session per Pominal cycle if the user supplies
|
||||||
|
// a value below it.
|
||||||
|
// Otherwise it returns the value set by the user.
|
||||||
|
func setMaxWorkSessions(w int) int {
|
||||||
|
var min = 1
|
||||||
|
if w < min {
|
||||||
|
return min
|
||||||
|
}
|
||||||
|
return w
|
||||||
|
}
|
||||||
|
|
|
@ -1,23 +1,41 @@
|
||||||
|
/*
|
||||||
|
Pominal
|
||||||
|
Copyright (C) 2019 Daniel Anglin
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestSessionTime(t *testing.T) {
|
func TestNewPominal(t *testing.T) {
|
||||||
sessionTests := []struct {
|
for _, p := range pominalTestCases {
|
||||||
input float64
|
t.Log(p.description)
|
||||||
expected float64
|
res := NewPominal(
|
||||||
}{
|
p.workSession,
|
||||||
{120, 120},
|
p.shortBreakSession,
|
||||||
{59.9999, 60},
|
p.longBreakSession,
|
||||||
{1, 60},
|
p.maxWorkSessions,
|
||||||
}
|
)
|
||||||
|
if !reflect.DeepEqual(res, p.expectedPominal) {
|
||||||
for _, s := range sessionTests {
|
t.Errorf("Unexpected Pominal created. Expected %v, received %v.", p.expectedPominal, res)
|
||||||
res := sessionTime(s.input)
|
} else {
|
||||||
if res != s.expected {
|
t.Log("Test passed.")
|
||||||
t.Errorf("Unexpected result. Got %v, expected %v", res, s.expected)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue