Skip to content

Commit ee3139f

Browse files
Ardjan-AalbertsArdjan-Aalberts
committed
[Syntax] Fixed some warnings and syntax notifications.
1 parent 81d1200 commit ee3139f

15 files changed

+42
-40
lines changed

‎app_installation_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func TestAppInstallationsService_Upsert_Create(t *testing.T) {
107107
assertions.Equal("world", parameters["hello"])
108108

109109
w.WriteHeader(201)
110-
_, _ = fmt.Fprintln(w, string(readTestData("app_installation_1.json")))
110+
_, _ = fmt.Fprintln(w, readTestData("app_installation_1.json"))
111111
})
112112

113113
// test server
@@ -145,7 +145,7 @@ func TestAppInstallationsService_Upsert_Update(t *testing.T) {
145145
assertions.Equal("ipsum", parameters["lorum"])
146146

147147
w.WriteHeader(200)
148-
_, _ = fmt.Fprintln(w, string(readTestData("app_installation_updated.json")))
148+
_, _ = fmt.Fprintln(w, readTestData("app_installation_updated.json"))
149149
})
150150

151151
// test server

‎content_type.go

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ type ContentType struct {
1919
DisplayField string `json:"displayField,omitempty"`
2020
}
2121

22+
//noinspection GoUnusedConst
2223
const (
2324
// FieldTypeText content type field type for text data
2425
FieldTypeText = "Text"

‎content_type_field_validations.go

+1
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ type FieldValidationSize struct {
224224
ErrorMessage string `json:"message,omitempty"`
225225
}
226226

227+
//noinspection GoUnusedConst
227228
const (
228229
// FieldValidationRegexPatternEmail email validation
229230
FieldValidationRegexPatternEmail = `^\w[\w.-]*@([\w-]+\.)+[\w-]+$`

‎content_type_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ func TestContentTypeSaveForCreate(t *testing.T) {
294294
assertions.Equal(field1["id"].(string), payload["displayField"])
295295

296296
w.WriteHeader(201)
297-
_, _ = fmt.Fprintln(w, string(readTestData("content_type.json")))
297+
_, _ = fmt.Fprintln(w, readTestData("content_type.json"))
298298
})
299299

300300
// test server
@@ -371,7 +371,7 @@ func TestContentTypeSaveForUpdate(t *testing.T) {
371371
assertions.Equal(field3["id"].(string), payload["displayField"])
372372

373373
w.WriteHeader(200)
374-
_, _ = fmt.Fprintln(w, string(readTestData("content_type-updated.json")))
374+
_, _ = fmt.Fprintln(w, readTestData("content_type-updated.json"))
375375
})
376376

377377
// test server
@@ -426,7 +426,7 @@ func TestContentTypeCreateWithoutID(t *testing.T) {
426426
checkHeaders(r, assertions)
427427

428428
w.WriteHeader(200)
429-
_, _ = fmt.Fprintln(w, string(readTestData("content_type-updated.json")))
429+
_, _ = fmt.Fprintln(w, readTestData("content_type-updated.json"))
430430
})
431431

432432
// test server
@@ -457,7 +457,7 @@ func TestContentTypeCreateWithID(t *testing.T) {
457457
checkHeaders(r, assertions)
458458

459459
w.WriteHeader(200)
460-
_, _ = fmt.Fprintln(w, string(readTestData("content_type-updated.json")))
460+
_, _ = fmt.Fprintln(w, readTestData("content_type-updated.json"))
461461
})
462462

463463
// test server
@@ -535,7 +535,7 @@ func TestContentTypeFieldRef(t *testing.T) {
535535
assertions.Equal("63Vgs0BFK0USe4i2mQUGK6", linkValidationValue[0].(string))
536536

537537
w.WriteHeader(201)
538-
_, _ = fmt.Fprintln(w, string(readTestData("content_type.json")))
538+
_, _ = fmt.Fprintln(w, readTestData("content_type.json"))
539539
})
540540

541541
// test server
@@ -599,7 +599,7 @@ func TestContentTypeFieldArray(t *testing.T) {
599599
assertions.Equal(true, validation1["unique"].(bool))
600600

601601
w.WriteHeader(201)
602-
_, _ = fmt.Fprintln(w, string(readTestData("content_type.json")))
602+
_, _ = fmt.Fprintln(w, readTestData("content_type.json"))
603603
})
604604

605605
// test server
@@ -678,7 +678,7 @@ func TestContentTypeFieldValidationRangeUniquePredefinedValues(t *testing.T) {
678678
assertions.Equal(float64(22), predefinedValues[2].(float64))
679679

680680
w.WriteHeader(201)
681-
_, _ = fmt.Fprintln(w, string(readTestData("content_type.json")))
681+
_, _ = fmt.Fprintln(w, readTestData("content_type.json"))
682682
})
683683

684684
// test server
@@ -748,7 +748,7 @@ func TestContentTypeFieldTypeMedia(t *testing.T) {
748748
validationMimeType := validations[0].(map[string]interface{})
749749
linkMimetypeGroup := validationMimeType["linkMimetypeGroup"].([]interface{})
750750
assertions.Equal(12, len(linkMimetypeGroup))
751-
mimetypes := []string{}
751+
var mimetypes []string
752752
for _, mimetype := range linkMimetypeGroup {
753753
mimetypes = append(mimetypes, mimetype.(string))
754754
}
@@ -795,7 +795,7 @@ func TestContentTypeFieldTypeMedia(t *testing.T) {
795795
assertions.Equal(400, max)
796796

797797
w.WriteHeader(201)
798-
_, _ = fmt.Fprintln(w, string(readTestData("content_type.json")))
798+
_, _ = fmt.Fprintln(w, readTestData("content_type.json"))
799799
})
800800

801801
// test server
@@ -863,7 +863,7 @@ func TestContentTypeFieldValidationsUnmarshal(t *testing.T) {
863863

864864
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
865865
w.WriteHeader(201)
866-
_, _ = fmt.Fprintln(w, string(readTestData("content_type_with_validations.json")))
866+
_, _ = fmt.Fprintln(w, readTestData("content_type_with_validations.json"))
867867
})
868868

869869
server := httptest.NewServer(handler)
@@ -875,16 +875,16 @@ func TestContentTypeFieldValidationsUnmarshal(t *testing.T) {
875875
ct, err := cma.ContentTypes.Get(spaceID, "validationsTest")
876876
assertions.Nil(err)
877877

878-
uniqueValidations := []FieldValidation{}
879-
linkValidations := []FieldValidation{}
880-
sizeValidations := []FieldValidation{}
881-
regexValidations := []FieldValidation{}
882-
preDefinedValidations := []FieldValidation{}
883-
rangeValidations := []FieldValidation{}
884-
dateValidations := []FieldValidation{}
885-
mimeTypeValidations := []FieldValidation{}
886-
dimensionValidations := []FieldValidation{}
887-
fileSizeValidations := []FieldValidation{}
878+
var uniqueValidations []FieldValidation
879+
var linkValidations []FieldValidation
880+
var sizeValidations []FieldValidation
881+
var regexValidations []FieldValidation
882+
var preDefinedValidations []FieldValidation
883+
var rangeValidations []FieldValidation
884+
var dateValidations []FieldValidation
885+
var mimeTypeValidations []FieldValidation
886+
var dimensionValidations []FieldValidation
887+
var fileSizeValidations []FieldValidation
888888

889889
for _, field := range ct.Fields {
890890
if field.Name == "text-short" {

‎editor_interface_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestEditorInterfacesService_Update(t *testing.T) {
114114
assertions.Equal("someuiextension", sidebar[0].(map[string]interface{})["widgetId"].(string))
115115

116116
w.WriteHeader(200)
117-
_, _ = fmt.Fprintln(w, string(readTestData("editor_interface_updated.json")))
117+
_, _ = fmt.Fprintln(w, readTestData("editor_interface_updated.json"))
118118
})
119119

120120
// test server

‎entry_task_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func TestEntryTasksService_Upsert_Create(t *testing.T) {
134134
assertions.Equal("active", payload["status"])
135135

136136
w.WriteHeader(201)
137-
_, _ = fmt.Fprintln(w, string(readTestData("entry_task_new.json")))
137+
_, _ = fmt.Fprintln(w, readTestData("entry_task_new.json"))
138138
})
139139

140140
// test server
@@ -180,7 +180,7 @@ func TestEntryTasksService_Upsert_Update(t *testing.T) {
180180
assertions.Equal("active", payload["status"])
181181

182182
w.WriteHeader(200)
183-
_, _ = fmt.Fprintln(w, string(readTestData("entry_task_1.json")))
183+
_, _ = fmt.Fprintln(w, readTestData("entry_task_1.json"))
184184
})
185185

186186
// test server

‎environment_alias_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func TestEnvironmentAliasesService_Update(t *testing.T) {
109109
assertions.Equal("staging", payload.Alias.Sys.ID)
110110

111111
w.WriteHeader(200)
112-
_, _ = fmt.Fprintln(w, string(readTestData("environment-alias_1.json")))
112+
_, _ = fmt.Fprintln(w, readTestData("environment-alias_1.json"))
113113
})
114114

115115
// test server

‎environment_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func TestEnvironmentsService_Upsert_Update(t *testing.T) {
144144
assertions.Equal("modified-name", payload["name"])
145145

146146
w.WriteHeader(200)
147-
_, _ = fmt.Fprintln(w, string(readTestData("environment_1.json")))
147+
_, _ = fmt.Fprintln(w, readTestData("environment_1.json"))
148148
})
149149

150150
// test server

‎extension_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestExtensionsService_Upsert_Create(t *testing.T) {
110110
assertions.Equal("My awesome extension", extension["name"])
111111

112112
w.WriteHeader(201)
113-
_, _ = fmt.Fprintln(w, string(readTestData("extension_1.json")))
113+
_, _ = fmt.Fprintln(w, readTestData("extension_1.json"))
114114
})
115115

116116
// test server
@@ -160,7 +160,7 @@ func TestExtensionsService_Upsert_Update(t *testing.T) {
160160
assertions.Equal("The updated extension", extension["name"])
161161

162162
w.WriteHeader(200)
163-
_, _ = fmt.Fprintln(w, string(readTestData("extension_updated.json")))
163+
_, _ = fmt.Fprintln(w, readTestData("extension_updated.json"))
164164
})
165165

166166
// test server

‎locale_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func TestLocalesService_Upsert_Update(t *testing.T) {
146146
assertions.Equal("modified-code", payload["code"])
147147

148148
w.WriteHeader(200)
149-
_, _ = fmt.Fprintln(w, string(readTestData("locale_1.json")))
149+
_, _ = fmt.Fprintln(w, readTestData("locale_1.json"))
150150
})
151151

152152
// test server

‎query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type Query struct {
3535
locale string
3636
}
3737

38-
//NewQuery initilazies a new query
38+
//NewQuery initializes a new query
3939
func NewQuery() *Query {
4040
return &Query{
4141
include: 0,

‎query_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestQueryInclude(t *testing.T) {
1717

1818
assert.Panics(t, func() {
1919
q := NewQuery().Include(11)
20-
q.String()
20+
_ = q.String()
2121
}, "out of range `include` should panic")
2222
}
2323

@@ -46,18 +46,18 @@ func TestQuerySelect(t *testing.T) {
4646
}, "select needs content_type")
4747

4848
assert.Panics(t, func() {
49-
fields := []string{}
49+
var fields []string
5050
for i := 0; i < 110; i++ {
5151
fields = append(fields, "field"+strconv.Itoa(i))
5252
}
5353

5454
q := NewQuery().Select(fields)
55-
q.String()
55+
_ = q.String()
5656
}, "select accepts 100 fields max")
5757

5858
assert.Panics(t, func() {
5959
q := NewQuery().Select([]string{"field1", "field2.d1", "field3.d2.d3"})
60-
q.String()
60+
_ = q.String()
6161
}, "select accepts depths 3 max")
6262
}
6363

@@ -252,7 +252,7 @@ func TestQueryLimit(t *testing.T) {
252252

253253
assert.Panics(t, func() {
254254
q := NewQuery().Limit(3000)
255-
q.String()
255+
_ = q.String()
256256
}, "out of range limit should panic")
257257
}
258258

‎space_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func TestSpaceSaveForCreate(t *testing.T) {
233233
assertions.Equal("en", payload["defaultLocale"])
234234

235235
w.WriteHeader(201)
236-
_, _ = fmt.Fprintln(w, string(readTestData("spaces-newspace.json")))
236+
_, _ = fmt.Fprintln(w, readTestData("spaces-newspace.json"))
237237
})
238238

239239
// test server
@@ -272,7 +272,7 @@ func TestSpaceSaveForUpdate(t *testing.T) {
272272
assertions.Equal("de", payload["defaultLocale"])
273273

274274
w.WriteHeader(200)
275-
_, _ = fmt.Fprintln(w, string(readTestData("spaces-newspace-updated.json")))
275+
_, _ = fmt.Fprintln(w, readTestData("spaces-newspace-updated.json"))
276276
})
277277

278278
// test server

‎tools/lint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
go get -u golang.org/x/lint/golint
55

66
for d in $(go list ./... | grep -v /vendor/); do
7-
res=$(golint -min_confidence 0.8 $d)
7+
res=$(golint -min_confidence 0.8 "$d")
88

99
if [[ $res != '' ]]; then
1010
echo "$res"

‎tools/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ rm coverage.txt || true
55
touch coverage.txt
66

77
for d in $(go list ./... | grep -v /vendor/); do
8-
go test -v -coverprofile=profile.out -covermode=count $d
8+
go test -v -coverprofile=profile.out -covermode=count "$d"
99

1010
if [ -f profile.out ]; then
1111
cat profile.out >> coverage.txt

0 commit comments

Comments
 (0)