From 84fc13627eb0db13d4585477c1c75c09f4ea5f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20H=C3=B6henleitner?= Date: Wed, 16 Oct 2024 20:34:11 +0200 Subject: [PATCH] code clean-up --- internal/id/cachedClean_test.go | 8 ++++---- internal/id/range_test.go | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/internal/id/cachedClean_test.go b/internal/id/cachedClean_test.go index 15f25dc0f..b4ea79c7f 100644 --- a/internal/id/cachedClean_test.go +++ b/internal/id/cachedClean_test.go @@ -42,12 +42,12 @@ func Test_0_1_0000X_clean_on_invalid_cCache_invalid_iCache_cleaned_file(t *testi assert.Nil(t, args.Handler(W, FSys, []string{"trice", "clean", "-cache", "-til", FnJSON, "-li", LIFnJSON, "-src", SFName})) assertFileContent(t, FSys, SFName, `trice("msg:value=%d\n", -1);`) // check file content - assertMTime(t, FSys, sT0, SFName) // check for untouched sFname - assertEqualMTimes(t, FSys, SFName, CCache) // check for correct updated cCache - assertFileNotExists(t, FSys, ICache) // check for not existing iCache + assertMTime(t, FSys, sT0, SFName) // check for untouched SFName + assertEqualMTimes(t, FSys, SFName, CCache) // check for correct updated CCache + assertFileNotExists(t, FSys, ICache) // check for not existing ICache } -func Test_2_3_0001X_clean_on_inalid_cCache_invalid_iCache_inserted_X_file(t *testing.T) { +func Test_2_3_0001X_clean_on_invalid_cCache_invalid_iCache_inserted_X_file(t *testing.T) { defer Setup(t)() // This executes Setup(t) and puts the returned function into the defer list. assertFileCreate(t, FSys, SFName, `trice(iD(999), "msg:value=%d\n", -1);`) // inserted diff --git a/internal/id/range_test.go b/internal/id/range_test.go index 1e5570d1b..9e6beda84 100644 --- a/internal/id/range_test.go +++ b/internal/id/range_test.go @@ -4,7 +4,6 @@ package id_test import ( - "fmt" "testing" "github.com/rokath/trice/internal/args" @@ -43,9 +42,7 @@ func TestRange1(t *testing.T) { assert.Nil(t, FSys.WriteFile(sFn, []byte(src), 0777)) // action - assert.Nil(t, args.Handler(W, FSys, []string{"trice", "insert", "-IDRange", "e:100,109", "-IDRange", "dbg:200,209", "-IDMax=1005", "-IDMethod", "upward", "-src", sFn, "-til", FnJSON, "-li", LIFnJSON})) - - fmt.Println(IDData.IDSpace) + assert.Nil(t, args.Handler(W, FSys, []string{"trice", "insert", "-IDRange", "e:100,102", "-IDRange", "dbg:200,203", "-IDMax=1005", "-IDMethod", "upward", "-src", sFn, "-til", FnJSON, "-li", LIFnJSON})) // check modified src file expSrc := `trice(iD(1000), "msg:Hi\n"); ... trice(iD(100), "err:Alarm!\n"); ... trice(iD(1001), "msg:Lo\n"); ... trice(iD(200), "d:foo\n");`