adyxax/gofunge98
1
0
Fork 0
Code Issues Releases Activity

Refactoring

Browse source
This commit is contained in:
Julien Dessaux 2021-09-20 01:22:18 +02:00
parent fc132c3dea
commit ae7f4d5acf
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/field/field.go
View file

@ -28,7 +28,7 @@ type Line struct {
columns []int columns []int
} }
func LoadFile(fd io.Reader) (*Field, error) { func Load(fd io.Reader) (*Field, error) {
f := new(Field) f := new(Field)
l := new(Line) l := new(Line)
trailingSpaces := 0 trailingSpaces := 0

4
pkg/field/field_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
func TestLoadFile(t *testing.T) { func TestLoad(t *testing.T) {
// minimal b98 file // minimal b98 file
minimalField := Field{ minimalField := Field{
x: 0, x: 0,
@ -149,7 +149,7 @@ func TestLoadFile(t *testing.T) {
} else { } else {
fd = file fd = file
} }
valid, err := LoadFile(fd) valid, err := Load(fd)
if tc.expectedError != nil { if tc.expectedError != nil {
require.Error(t, err) require.Error(t, err)
requireErrorTypeMatch(t, err, tc.expectedError) requireErrorTypeMatch(t, err, tc.expectedError)

2
pkg/field/step_test.go
View file

@ -32,7 +32,7 @@ func TestStep(t *testing.T) {
file, err := os.Open(tc.input) file, err := os.Open(tc.input)
require.NoError(t, err, "Failed to open file") require.NoError(t, err, "Failed to open file")
defer file.Close() defer file.Close()
field, err := LoadFile(file) field, err := Load(file)
x, y := field.Step(tc.x, tc.y, tc.dx, tc.dy) x, y := field.Step(tc.x, tc.y, tc.dx, tc.dy)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, tc.ex, x, "Invalid x value") require.Equal(t, tc.ex, x, "Invalid x value")

12
pkg/field/utils_test.go
View file

@ -32,7 +32,7 @@ func TestGet(t *testing.T) {
file, err := os.Open(tc.input) file, err := os.Open(tc.input)
require.NoError(t, err, "Failed to open file") require.NoError(t, err, "Failed to open file")
defer file.Close() defer file.Close()
field, err := LoadFile(file) field, err := Load(file)
valid := field.Get(tc.inputX, tc.inputY) valid := field.Get(tc.inputX, tc.inputY)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, tc.expected, valid, "Invalid value") require.Equal(t, tc.expected, valid, "Invalid value")
@ -65,7 +65,7 @@ func TestIsIn(t *testing.T) {
file, err := os.Open(tc.input) file, err := os.Open(tc.input)
require.NoError(t, err, "Failed to open file") require.NoError(t, err, "Failed to open file")
defer file.Close() defer file.Close()
field, err := LoadFile(file) field, err := Load(file)
valid := field.isIn(tc.inputX, tc.inputY) valid := field.isIn(tc.inputX, tc.inputY)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, tc.expected, valid, "Invalid value") require.Equal(t, tc.expected, valid, "Invalid value")
@ -141,7 +141,7 @@ func TestSetMinimalAppendOne(t *testing.T) {
file, err := os.Open(tc.input) file, err := os.Open(tc.input)
require.NoError(t, err, "Failed to open file") require.NoError(t, err, "Failed to open file")
defer file.Close() defer file.Close()
field, err := LoadFile(file) field, err := Load(file)
field.Set(tc.inputX, tc.inputY, tc.inputV) field.Set(tc.inputX, tc.inputY, tc.inputV)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, tc.expected, field, "Invalid value") require.Equal(t, tc.expected, field, "Invalid value")
@ -217,7 +217,7 @@ func TestSetMinimalAppendTwo(t *testing.T) {
file, err := os.Open(tc.input) file, err := os.Open(tc.input)
require.NoError(t, err, "Failed to open file") require.NoError(t, err, "Failed to open file")
defer file.Close() defer file.Close()
field, err := LoadFile(file) field, err := Load(file)
field.Set(tc.inputX, tc.inputY, tc.inputV) field.Set(tc.inputX, tc.inputY, tc.inputV)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, tc.expected, field, "Invalid value") require.Equal(t, tc.expected, field, "Invalid value")
@ -287,7 +287,7 @@ func TestSetMinimalAppendThree(t *testing.T) {
file, err := os.Open(tc.input) file, err := os.Open(tc.input)
require.NoError(t, err, "Failed to open file") require.NoError(t, err, "Failed to open file")
defer file.Close() defer file.Close()
field, err := LoadFile(file) field, err := Load(file)
field.Set(tc.inputX, tc.inputY, tc.inputV) field.Set(tc.inputX, tc.inputY, tc.inputV)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, tc.expected, field, "Invalid value") require.Equal(t, tc.expected, field, "Invalid value")
@ -316,7 +316,7 @@ func TestGetAndSetOnEmptyLines(t *testing.T) {
file, err := os.Open("test_data/minimal.b98") file, err := os.Open("test_data/minimal.b98")
require.NoError(t, err, "Failed to open file") require.NoError(t, err, "Failed to open file")
defer file.Close() defer file.Close()
field, err := LoadFile(file) field, err := Load(file)
field.Set(0, 3, '#') field.Set(0, 3, '#')
v := field.Get(0, 3) v := field.Get(0, 3)
require.Equal(t, v, int('#')) require.Equal(t, v, int('#'))