From 85558110c5c464510dbc31727bbae4cc66e85d51 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 1 Oct 2024 18:07:46 +0200 Subject: [PATCH] Removed checks on sketch.json (now deprecated) --- internal/rule/rulefunction/sketch_test.go | 25 +++++++++---------- .../InvalidDataMetadataFile.ino | 2 -- .../InvalidDataMetadataFile/sketch.json | 8 ------ .../InvalidJSONMetadataFile.ino | 2 -- .../InvalidJSONMetadataFile/sketch.json | 7 ------ 5 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 internal/rule/rulefunction/testdata/sketches/InvalidDataMetadataFile/InvalidDataMetadataFile.ino delete mode 100644 internal/rule/rulefunction/testdata/sketches/InvalidDataMetadataFile/sketch.json delete mode 100644 internal/rule/rulefunction/testdata/sketches/InvalidJSONMetadataFile/InvalidJSONMetadataFile.ino delete mode 100644 internal/rule/rulefunction/testdata/sketches/InvalidJSONMetadataFile/sketch.json diff --git a/internal/rule/rulefunction/sketch_test.go b/internal/rule/rulefunction/sketch_test.go index d873b0e0..124c89e0 100644 --- a/internal/rule/rulefunction/sketch_test.go +++ b/internal/rule/rulefunction/sketch_test.go @@ -46,19 +46,21 @@ type sketchRuleFunctionTestTable struct { func checkSketchRuleFunction(ruleFunction Type, testTables []sketchRuleFunctionTestTable, t *testing.T) { for _, testTable := range testTables { - expectedOutputRegexp := regexp.MustCompile(testTable.expectedOutputQuery) + t.Run(testTable.testName, func(t *testing.T) { + expectedOutputRegexp := regexp.MustCompile(testTable.expectedOutputQuery) - testProject := project.Type{ - Path: sketchesTestDataPath.Join(testTable.sketchFolderName), - ProjectType: projecttype.Sketch, - SuperprojectType: projecttype.Sketch, - } + testProject := project.Type{ + Path: sketchesTestDataPath.Join(testTable.sketchFolderName), + ProjectType: projecttype.Sketch, + SuperprojectType: projecttype.Sketch, + } - projectdata.Initialize(testProject) + projectdata.Initialize(testProject) - result, output := ruleFunction() - assert.Equal(t, testTable.expectedRuleResult, result, testTable.testName) - assert.True(t, expectedOutputRegexp.MatchString(output), fmt.Sprintf("%s (output: %s, assertion regex: %s)", testTable.testName, output, testTable.expectedOutputQuery)) + result, output := ruleFunction() + assert.Equal(t, testTable.expectedRuleResult, result, testTable.testName) + assert.True(t, expectedOutputRegexp.MatchString(output), fmt.Sprintf("%s (output: %s, assertion regex: %s)", testTable.testName, output, testTable.expectedOutputQuery)) + }) } } @@ -112,7 +114,6 @@ func TestSketchDotJSONJSONFormat(t *testing.T) { testTables := []sketchRuleFunctionTestTable{ {"No metadata file", "NoMetadataFile", ruleresult.Skip, ""}, {"Valid", "ValidMetadataFile", ruleresult.Pass, ""}, - {"Invalid", "InvalidJSONMetadataFile", ruleresult.Fail, ""}, } checkSketchRuleFunction(SketchDotJSONJSONFormat, testTables, t) @@ -122,8 +123,6 @@ func TestSketchDotJSONFormat(t *testing.T) { testTables := []sketchRuleFunctionTestTable{ {"No metadata file", "NoMetadataFile", ruleresult.Skip, ""}, {"Valid", "ValidMetadataFile", ruleresult.Pass, ""}, - {"Invalid JSON", "InvalidJSONMetadataFile", ruleresult.Fail, ""}, - {"Invalid data", "InvalidDataMetadataFile", ruleresult.Fail, ""}, } checkSketchRuleFunction(SketchDotJSONFormat, testTables, t) diff --git a/internal/rule/rulefunction/testdata/sketches/InvalidDataMetadataFile/InvalidDataMetadataFile.ino b/internal/rule/rulefunction/testdata/sketches/InvalidDataMetadataFile/InvalidDataMetadataFile.ino deleted file mode 100644 index 660bdbcc..00000000 --- a/internal/rule/rulefunction/testdata/sketches/InvalidDataMetadataFile/InvalidDataMetadataFile.ino +++ /dev/null @@ -1,2 +0,0 @@ -void setup() {} -void loop() {} diff --git a/internal/rule/rulefunction/testdata/sketches/InvalidDataMetadataFile/sketch.json b/internal/rule/rulefunction/testdata/sketches/InvalidDataMetadataFile/sketch.json deleted file mode 100644 index 8966cd56..00000000 --- a/internal/rule/rulefunction/testdata/sketches/InvalidDataMetadataFile/sketch.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "foo": "bar" - }, - { - "baz": "bat" - } -] diff --git a/internal/rule/rulefunction/testdata/sketches/InvalidJSONMetadataFile/InvalidJSONMetadataFile.ino b/internal/rule/rulefunction/testdata/sketches/InvalidJSONMetadataFile/InvalidJSONMetadataFile.ino deleted file mode 100644 index 660bdbcc..00000000 --- a/internal/rule/rulefunction/testdata/sketches/InvalidJSONMetadataFile/InvalidJSONMetadataFile.ino +++ /dev/null @@ -1,2 +0,0 @@ -void setup() {} -void loop() {} diff --git a/internal/rule/rulefunction/testdata/sketches/InvalidJSONMetadataFile/sketch.json b/internal/rule/rulefunction/testdata/sketches/InvalidJSONMetadataFile/sketch.json deleted file mode 100644 index 07c0d397..00000000 --- a/internal/rule/rulefunction/testdata/sketches/InvalidJSONMetadataFile/sketch.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "foo": "bar" - }, - { - "baz": "bat" - }