From 99e4a23ac62672e707610ea1bc71b58ea56ada9f Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 21 Dec 2021 22:55:50 -0500 Subject: [PATCH] typofix in regtest --- Makefile | 2 +- internal/pkg/mlrval/mlrval_new_test.go | 2 -- test/cases/io-infer-flags/dash-A/expout | 46 ++++++++++++------------ test/cases/io-infer-flags/dash-O/expout | 46 ++++++++++++------------ test/cases/io-infer-flags/default/expout | 46 ++++++++++++------------ 5 files changed, 70 insertions(+), 72 deletions(-) diff --git a/Makefile b/Makefile index 0e8e8cf27..dd8f9d228 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ build: @echo "You can use 'make check' to run tests". # For interactive use, 'mlr regtest' offers more options and transparency. -check: unit_test regression_test +check: unit-test regression-test @echo "Tests complete. You can use 'make install' if you like, optionally preceded" @echo "by './configure --prefix=/your/install/path' if you wish to install to" @echo "somewhere other than /usr/local/bin -- the default prefix is /usr/local." diff --git a/internal/pkg/mlrval/mlrval_new_test.go b/internal/pkg/mlrval/mlrval_new_test.go index 26dfeadc3..3415c080d 100644 --- a/internal/pkg/mlrval/mlrval_new_test.go +++ b/internal/pkg/mlrval/mlrval_new_test.go @@ -130,13 +130,11 @@ func TestFromFunction(t *testing.T) { func TestFromArray(t *testing.T) { mv := FromArray([]Mlrval{*FromInt(10)}) assert.Equal(t, MVType(MT_ARRAY), MVType(mv.mvtype)) - assert.True(t, mv.printrepValid) assert.Equal(t, 1, len(mv.arrayval)) } func TestFromMap(t *testing.T) { mv := FromMap(NewMlrmap()) assert.Equal(t, MVType(MT_MAP), MVType(mv.mvtype)) - assert.True(t, mv.printrepValid) assert.True(t, mv.mapval.IsEmpty()) } diff --git a/test/cases/io-infer-flags/dash-A/expout b/test/cases/io-infer-flags/dash-A/expout index 2583ff522..0d4aeab7c 100644 --- a/test/cases/io-infer-flags/dash-A/expout +++ b/test/cases/io-infer-flags/dash-A/expout @@ -1,23 +1,23 @@ -x t y z -123 float 124 123.5 -123.45 float 124.45 123.95 -0123 float 84 83.5 -07 float 8 7.5 -08 float 9 8.5 -0 float 1 0.5 -0. float 1 0.5 -0.0 float 1 0.5 -0.01 float 1.01 0.51 -0b0100 float 5 4.5 -0x1000 float 4097 4096.5 --123 float -122 -122.5 --123.45 float -122.45 -122.95 --0123 float -82 -82.5 --0b0100 float -3 -3.5 --0x1000 float -4095 -4095.5 --07 float -6 -6.5 --08 float -7 -7.5 --0 float 1 0.5 --0. float 1 0.5 --0.0 float 1 0.5 --0.01 float 0.99 0.49 +x t y z +123 float 124 123.5 +123.45 float 124.45 123.95 +0123 string (error) (error) +07 string (error) (error) +08 string (error) (error) +0 float 1 0.5 +0. float 1 0.5 +0.0 float 1 0.5 +0.01 float 1.01 0.51 +0b0100 float 5 4.5 +0x1000 float 4097 4096.5 +-123 float -122 -122.5 +-123.45 float -122.45 -122.95 +-0123 string (error) (error) +-0b0100 float -3 -3.5 +-0x1000 float -4095 -4095.5 +-07 string (error) (error) +-08 string (error) (error) +-0 float 1 0.5 +-0. float 1 0.5 +-0.0 float 1 0.5 +-0.01 float 0.99 0.49 diff --git a/test/cases/io-infer-flags/dash-O/expout b/test/cases/io-infer-flags/dash-O/expout index 4d6ca25d6..2ecaa2dab 100644 --- a/test/cases/io-infer-flags/dash-O/expout +++ b/test/cases/io-infer-flags/dash-O/expout @@ -1,23 +1,23 @@ -x t y z -123 int 124 123.5 -123.45 float 124.45 123.95 -0123 string (error) (error) -07 string (error) (error) -08 string (error) (error) -0 int 1 0.5 -0. float 1 0.5 -0.0 float 1 0.5 -0.01 float 1.01 0.51 -0b0100 int 5 4.5 -0x1000 int 4097 4096.5 --123 int -122 -122.5 --123.45 float -122.45 -122.95 --0123 string (error) (error) --0b0100 int -3 -3.5 --0x1000 int -4095 -4095.5 --07 string (error) (error) --08 string (error) (error) --0 int 1 0.5 --0. float 1 0.5 --0.0 float 1 0.5 --0.01 float 0.99 0.49 +x t y z +123 int 124 123.5 +123.45 float 124.45 123.95 +0123 int 84 83.5 +07 int 8 7.5 +08 float 9 8.5 +0 int 1 0.5 +0. float 1 0.5 +0.0 float 1 0.5 +0.01 float 1.01 0.51 +0b0100 int 5 4.5 +0x1000 int 4097 4096.5 +-123 int -122 -122.5 +-123.45 float -122.45 -122.95 +-0123 int -82 -82.5 +-0b0100 int -3 -3.5 +-0x1000 int -4095 -4095.5 +-07 int -6 -6.5 +-08 float -7 -7.5 +-0 int 1 0.5 +-0. float 1 0.5 +-0.0 float 1 0.5 +-0.01 float 0.99 0.49 diff --git a/test/cases/io-infer-flags/default/expout b/test/cases/io-infer-flags/default/expout index 2ecaa2dab..4d6ca25d6 100644 --- a/test/cases/io-infer-flags/default/expout +++ b/test/cases/io-infer-flags/default/expout @@ -1,23 +1,23 @@ -x t y z -123 int 124 123.5 -123.45 float 124.45 123.95 -0123 int 84 83.5 -07 int 8 7.5 -08 float 9 8.5 -0 int 1 0.5 -0. float 1 0.5 -0.0 float 1 0.5 -0.01 float 1.01 0.51 -0b0100 int 5 4.5 -0x1000 int 4097 4096.5 --123 int -122 -122.5 --123.45 float -122.45 -122.95 --0123 int -82 -82.5 --0b0100 int -3 -3.5 --0x1000 int -4095 -4095.5 --07 int -6 -6.5 --08 float -7 -7.5 --0 int 1 0.5 --0. float 1 0.5 --0.0 float 1 0.5 --0.01 float 0.99 0.49 +x t y z +123 int 124 123.5 +123.45 float 124.45 123.95 +0123 string (error) (error) +07 string (error) (error) +08 string (error) (error) +0 int 1 0.5 +0. float 1 0.5 +0.0 float 1 0.5 +0.01 float 1.01 0.51 +0b0100 int 5 4.5 +0x1000 int 4097 4096.5 +-123 int -122 -122.5 +-123.45 float -122.45 -122.95 +-0123 string (error) (error) +-0b0100 int -3 -3.5 +-0x1000 int -4095 -4095.5 +-07 string (error) (error) +-08 string (error) (error) +-0 int 1 0.5 +-0. float 1 0.5 +-0.0 float 1 0.5 +-0.01 float 0.99 0.49