Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 068d4ce

Browse files
committed
Removed tests and rules about sketch.json (now deprecated)
1 parent 0afb39d commit 068d4ce

File tree

5 files changed

+1
-94
lines changed

5 files changed

+1
-94
lines changed

‎internal/project/projectdata/sketch.go‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,13 @@
1717
package projectdata
1818

1919
import (
20-
"strings"
21-
2220
"github.com/arduino/arduino-cli/arduino/sketch"
2321
"github.com/arduino/arduino-lint/internal/project"
2422
)
2523

2624
// InitializeForSketch gathers the check data for the specified sketch project.
2725
func InitializeForSketch(project project.Type) {
2826
loadedSketch, sketchLoadError = sketch.New(ProjectPath())
29-
// TODO: Better error detection
30-
if sketchLoadError != nil && strings.Contains(sketchLoadError.Error(), "importing sketch metadata") {
31-
metadataLoadError = sketchLoadError
32-
}
3327
}
3428

3529
var sketchLoadError error
@@ -45,10 +39,3 @@ var loadedSketch *sketch.Sketch
4539
func Sketch() *sketch.Sketch {
4640
return loadedSketch
4741
}
48-
49-
var metadataLoadError error
50-
51-
// MetadataLoadError returns the error produced during load of the sketch metadata.
52-
func MetadataLoadError() error {
53-
return metadataLoadError
54-
}

‎internal/rule/ruleconfiguration/ruleconfiguration.go‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,40 +1504,6 @@ var configurations = []Type{
15041504
ErrorModes: []rulemode.Type{rulemode.Strict},
15051505
RuleFunction: rulefunction.MissingLicenseFile,
15061506
},
1507-
{
1508-
ProjectType: projecttype.Sketch,
1509-
SuperprojectType: projecttype.All,
1510-
Category: "sketch.json",
1511-
Subcategory: "general",
1512-
ID: "SM001",
1513-
Brief: "sketch.json JSON format",
1514-
Description: "The sketch's `sketch.json` metadata file is not a valid JSON document.",
1515-
MessageTemplate: "sketch.json is not a valid JSON document.",
1516-
Reference: "",
1517-
DisableModes: nil,
1518-
EnableModes: []rulemode.Type{rulemode.Default},
1519-
InfoModes: nil,
1520-
WarningModes: []rulemode.Type{rulemode.Permissive},
1521-
ErrorModes: []rulemode.Type{rulemode.Default},
1522-
RuleFunction: rulefunction.SketchDotJSONJSONFormat,
1523-
},
1524-
{
1525-
ProjectType: projecttype.Sketch,
1526-
SuperprojectType: projecttype.All,
1527-
Category: "sketch.json",
1528-
Subcategory: "general",
1529-
ID: "SM002",
1530-
Brief: "sketch.json data format",
1531-
Description: "The sketch's `sketch.json` metadata file does not have a valid data format.",
1532-
MessageTemplate: "sketch.json has an invalid data format: {{.}}",
1533-
Reference: "https://arduino.github.io/arduino-cli/latest/sketch-specification/#metadata",
1534-
DisableModes: nil,
1535-
EnableModes: []rulemode.Type{rulemode.Default},
1536-
InfoModes: nil,
1537-
WarningModes: []rulemode.Type{rulemode.Permissive},
1538-
ErrorModes: []rulemode.Type{rulemode.Default},
1539-
RuleFunction: rulefunction.SketchDotJSONFormat,
1540-
},
15411507
{
15421508
ProjectType: projecttype.Platform,
15431509
SuperprojectType: projecttype.Platform,

‎internal/rule/ruleconfiguration/ruleconfiguration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestConfigurationResolution(t *testing.T) {
3333
for _, ruleConfiguration := range ruleconfiguration.Configurations() {
3434
for ruleMode := range rulemode.Types {
3535
enabled, err := rule.IsEnabled(ruleConfiguration, map[rulemode.Type]bool{ruleMode: true})
36-
assert.Nil(t, err, fmt.Sprintf("Enable configuration of rule %s doesn't resolve for rule mode %s", ruleConfiguration.ID, ruleMode))
36+
assert.NoError(t, err, fmt.Sprintf("Enable configuration of rule %s doesn't resolve for rule mode %s", ruleConfiguration.ID, ruleMode))
3737
if err == nil && enabled {
3838
_, err := rulelevel.FailRuleLevel(ruleConfiguration, map[rulemode.Type]bool{ruleMode: true})
3939
assert.Nil(t, err, fmt.Sprintf("Level configuration of rule %s doesn't resolve for rule mode %s", ruleConfiguration.ID, ruleMode))

‎internal/rule/rulefunction/sketch.go‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -124,31 +124,3 @@ func IncorrectSketchSrcFolderNameCase() (result ruleresult.Type, output string)
124124

125125
return ruleresult.Pass, ""
126126
}
127-
128-
// SketchDotJSONJSONFormat checks whether the sketch.json metadata file is a valid JSON document.
129-
func SketchDotJSONJSONFormat() (result ruleresult.Type, output string) {
130-
metadataPath := sketch.MetadataPath(projectdata.ProjectPath())
131-
if metadataPath == nil {
132-
return ruleresult.Skip, "No metadata file"
133-
}
134-
135-
if isValidJSON(metadataPath) {
136-
return ruleresult.Pass, ""
137-
}
138-
139-
return ruleresult.Fail, ""
140-
}
141-
142-
// SketchDotJSONFormat checks whether the sketch.json metadata file has the required data format.
143-
func SketchDotJSONFormat() (result ruleresult.Type, output string) {
144-
metadataPath := sketch.MetadataPath(projectdata.ProjectPath())
145-
if metadataPath == nil {
146-
return ruleresult.Skip, "No metadata file"
147-
}
148-
149-
if projectdata.MetadataLoadError() == nil {
150-
return ruleresult.Pass, ""
151-
}
152-
153-
return ruleresult.Fail, projectdata.MetadataLoadError().Error()
154-
}

‎internal/rule/rulefunction/sketch_test.go‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,3 @@ func TestIncorrectSketchSrcFolderNameCase(t *testing.T) {
109109

110110
checkSketchRuleFunction(IncorrectSketchSrcFolderNameCase, testTables, t)
111111
}
112-
113-
func TestSketchDotJSONJSONFormat(t *testing.T) {
114-
testTables := []sketchRuleFunctionTestTable{
115-
{"No metadata file", "NoMetadataFile", ruleresult.Skip, ""},
116-
{"Valid", "ValidMetadataFile", ruleresult.Pass, ""},
117-
}
118-
119-
checkSketchRuleFunction(SketchDotJSONJSONFormat, testTables, t)
120-
}
121-
122-
func TestSketchDotJSONFormat(t *testing.T) {
123-
testTables := []sketchRuleFunctionTestTable{
124-
{"No metadata file", "NoMetadataFile", ruleresult.Skip, ""},
125-
{"Valid", "ValidMetadataFile", ruleresult.Pass, ""},
126-
}
127-
128-
checkSketchRuleFunction(SketchDotJSONFormat, testTables, t)
129-
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /