Skip to content

Commit 2c5f5af

Browse files
authored
Merge pull request #29 from arduino/per1234/email-maintainer-duplicate-schemas
Make library.properties email schema duplicate of the maintainer schema
2 parents b60803f + 42e4085 commit 2c5f5af

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

Diff for: etc/schemas/arduino-library-properties-definitions-schema.json

+3-15
Original file line numberDiff line numberDiff line change
@@ -247,23 +247,11 @@
247247
}
248248
},
249249
"email": {
250-
"base": {
251-
"object": {
252-
"allOf": [
253-
{
254-
"type": "string"
255-
},
256-
{
257-
"minLength": 1
258-
}
259-
]
260-
}
261-
},
262250
"permissive": {
263251
"object": {
264252
"allOf": [
265253
{
266-
"$ref": "#/definitions/propertiesObjects/email/base/object"
254+
"$ref": "#/definitions/propertiesObjects/maintainer/permissive/object"
267255
}
268256
]
269257
}
@@ -272,7 +260,7 @@
272260
"object": {
273261
"allOf": [
274262
{
275-
"$ref": "#/definitions/propertiesObjects/email/base/object"
263+
"$ref": "#/definitions/propertiesObjects/maintainer/specification/object"
276264
}
277265
]
278266
}
@@ -281,7 +269,7 @@
281269
"object": {
282270
"allOf": [
283271
{
284-
"$ref": "#/definitions/propertiesObjects/email/specification/object"
272+
"$ref": "#/definitions/propertiesObjects/maintainer/strict/object"
285273
}
286274
]
287275
}

Diff for: project/library/libraryproperties/librarypropertiesschemas_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,16 @@ func TestPropertiesMaintainerPattern(t *testing.T) {
335335
checkPropertyPatternMismatch("maintainer", testTables, t)
336336
}
337337

338+
func TestPropertiesEmailPattern(t *testing.T) {
339+
testTables := []propertyValueTestTable{
340+
{"Starts with arduino", "arduinofoo", compliancelevel.Permissive, assert.False},
341+
{"Starts with arduino", "arduinofoo", compliancelevel.Specification, assert.True},
342+
{"Starts with arduino", "arduinofoo", compliancelevel.Strict, assert.True},
343+
}
344+
345+
checkPropertyPatternMismatch("email", testTables, t)
346+
}
347+
338348
func TestPropertiesCategoryEnum(t *testing.T) {
339349
testTables := []propertyValueTestTable{
340350
{"Invalid category", "foo", compliancelevel.Permissive, assert.False},

0 commit comments

Comments
 (0)