From 2ed11becafaec5d2525c501b237529b8e7dfb1e4 Mon Sep 17 00:00:00 2001 From: Oliver Cullimore Date: Tue, 31 Oct 2023 20:56:50 +0000 Subject: [PATCH] feat: Replace individual council schema's with a single common one --- CONTRIBUTING.md | 70 +------------------ .../AylesburyValeCouncil.schema | 49 ------------- .../tests/council_schemas/BCPCouncil.schema | 39 ----------- .../council_schemas/BasingstokeCouncil.schema | 50 ------------- .../BathAndNorthEastSomersetCouncil.schema | 39 ----------- .../council_schemas/BexleyCouncil.schema | 50 ------------- .../council_schemas/BoltonCouncil.schema | 39 ----------- .../council_schemas/BristolCityCouncil.schema | 39 ----------- .../BromleyBoroughCouncil.schema | 39 ----------- .../BroxtoweBoroughCouncil.schema | 39 ----------- .../BuckinghamshireCouncil.schema | 39 ----------- .../tests/council_schemas/BuryCouncil.schema | 39 ----------- .../council_schemas/CalderdaleCouncil.schema | 39 ----------- .../CannockChaseDistrictCouncil.schema | 39 ----------- .../council_schemas/CardiffCouncil.schema | 39 ----------- .../CastlepointDistrictCouncil.schema | 39 ----------- .../CharnwoodBoroughCouncil.schema | 39 ----------- .../ChelmsfordCityCouncil.schema | 39 ----------- .../CheshireEastCouncil.schema | 48 ------------- .../council_schemas/ConwyCountyBorough.schema | 48 ------------- .../CrawleyBoroughCouncil.schema | 39 ----------- .../council_schemas/CroydonCouncil.schema | 39 ----------- .../DerbyshireDalesDistrictCouncil.schema | 39 ----------- .../council_schemas/DoncasterCouncil.schema | 39 ----------- .../council_schemas/DurhamCouncil.schema | 39 ----------- .../EastCambridgeshireCouncil.schema | 48 ------------- .../tests/council_schemas/EastDevonDC.schema | 48 ------------- .../EastLindseyDistrictCouncil.schema | 39 ----------- .../EastNorthamptonshireCouncil.schema | 47 ------------- .../council_schemas/EastRidingCouncil.schema | 39 ----------- .../council_schemas/EastSuffolkCouncil.schema | 39 ----------- .../EastleighBoroughCouncil.schema | 50 ------------- .../ErewashBoroughCouncil.schema | 39 ----------- .../FenlandDistrictCouncil.schema | 39 ----------- .../council_schemas/GatesheadCouncil.schema | 47 ------------- .../council_schemas/GlasgowCityCouncil.schema | 51 -------------- .../council_schemas/GuildfordCouncil.schema | 53 -------------- .../HarrogateBoroughCouncil.schema | 39 ----------- .../council_schemas/HighPeakCouncil.schema | 47 ------------- .../HuntingdonDistrictCouncil.schema | 39 ----------- .../KingstonUponThamesCouncil.schema | 39 ----------- .../LancasterCityCouncil.schema | 48 ------------- .../council_schemas/LeedsCityCouncil.schema | 48 ------------- .../LisburnCastlereaghCityCouncil.schema | 48 ------------- .../LondonBoroughHounslow.schema | 39 ----------- .../MaldonDistrictCouncil.schema | 39 ----------- .../council_schemas/MalvernHillsDC.schema | 39 ----------- .../ManchesterCityCouncil.schema | 39 ----------- .../council_schemas/MertonCouncil.schema | 39 ----------- .../MidSussexDistrictCouncil.schema | 39 ----------- .../MiltonKeynesCityCouncil.schema | 39 ----------- .../NeathPortTalbotCouncil.schema | 47 ------------- .../NewarkAndSherwoodDC.schema | 48 ------------- .../NewcastleCityCouncil.schema | 39 ----------- .../council_schemas/NorthEastLincs.schema | 49 ------------- .../NorthKestevenDistrictCouncil.schema | 39 ----------- .../NorthLanarkshireCouncil.schema | 39 ----------- .../NorthLincolnshireCouncil.schema | 50 ------------- .../NorthNorfolkDistrictCouncil.schema | 39 ----------- .../NorthSomersetCouncil.schema | 39 ----------- .../NorthTynesideCouncil.schema | 48 ------------- .../NorthumberlandCouncil.schema | 49 ------------- .../council_schemas/PrestonCityCouncil.schema | 50 ------------- .../ReigateAndBansteadBoroughCouncil.schema | 39 ----------- .../RhonddaCynonTaffCouncil.schema | 39 ----------- .../council_schemas/RochdaleCouncil.schema | 39 ----------- .../RushcliffeBoroughCouncil.schema | 39 ----------- .../council_schemas/RushmoorCouncil.schema | 47 ------------- .../council_schemas/SalfordCityCouncil.schema | 49 ------------- .../SheffieldCityCouncil.schema | 39 ----------- .../council_schemas/SomersetCouncil.schema | 39 ----------- .../SouthAyrshireCouncil.schema | 39 ----------- .../SouthCambridgeshireCouncil.schema | 48 ------------- .../SouthLanarkshireCouncil.schema | 39 ----------- .../SouthNorfolkCouncil.schema | 39 ----------- .../SouthOxfordshireCouncil.schema | 39 ----------- .../SouthTynesideCouncil.schema | 48 ------------- .../tests/council_schemas/StHelensBC.schema | 39 ----------- ...affordshireMoorlandsDistrictCouncil.schema | 48 ------------- .../StockportBoroughCouncil.schema | 39 ----------- .../StratfordUponAvonCouncil.schema | 49 ------------- .../SwaleBoroughCouncil.schema | 39 ----------- .../council_schemas/TamesideMBCouncil.schema | 39 ----------- .../TonbridgeAndMallingBC.schema | 39 ----------- .../council_schemas/TorbayCouncil.schema | 39 ----------- .../TorridgeDistrictCouncil.schema | 39 ----------- .../ValeofGlamorganCouncil.schema | 47 ------------- .../WakefieldCityCouncil.schema | 48 ------------- .../WarwickDistrictCouncil.schema | 39 ----------- .../WaverleyBoroughCouncil.schema | 48 ------------- .../WealdenDistrictCouncil.schema | 39 ----------- .../council_schemas/WelhatCouncil.schema | 39 ----------- .../council_schemas/WestLothianCouncil.schema | 39 ----------- .../WiganBoroughCouncil.schema | 24 ------- .../council_schemas/WiltshireCouncil.schema | 48 ------------- .../WindsorAndMaidenheadCouncil.schema | 39 ----------- .../WokingBoroughCouncil.schema | 39 ----------- .../tests/council_schemas/YorkCouncil.schema | 39 ----------- .../BlackburnCouncil.schema => output.schema} | 12 ++-- .../step_defs/step_helpers/file_handler.py | 7 +- .../tests/step_defs/test_validate_council.py | 7 +- 101 files changed, 13 insertions(+), 4165 deletions(-) delete mode 100644 uk_bin_collection/tests/council_schemas/AylesburyValeCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BCPCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BasingstokeCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BathAndNorthEastSomersetCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BexleyCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BoltonCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BristolCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BromleyBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BroxtoweBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BuckinghamshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/BuryCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/CalderdaleCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/CannockChaseDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/CardiffCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/CastlepointDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/CharnwoodBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/ChelmsfordCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/CheshireEastCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/ConwyCountyBorough.schema delete mode 100644 uk_bin_collection/tests/council_schemas/CrawleyBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/CroydonCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/DerbyshireDalesDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/DoncasterCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/DurhamCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/EastCambridgeshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/EastDevonDC.schema delete mode 100644 uk_bin_collection/tests/council_schemas/EastLindseyDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/EastNorthamptonshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/EastRidingCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/EastSuffolkCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/EastleighBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/ErewashBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/FenlandDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/GatesheadCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/GlasgowCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/GuildfordCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/HarrogateBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/HighPeakCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/HuntingdonDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/KingstonUponThamesCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/LancasterCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/LeedsCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/LisburnCastlereaghCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/LondonBoroughHounslow.schema delete mode 100644 uk_bin_collection/tests/council_schemas/MaldonDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/MalvernHillsDC.schema delete mode 100644 uk_bin_collection/tests/council_schemas/ManchesterCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/MertonCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/MidSussexDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/MiltonKeynesCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NeathPortTalbotCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NewarkAndSherwoodDC.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NewcastleCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NorthEastLincs.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NorthKestevenDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NorthLanarkshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NorthLincolnshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NorthNorfolkDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NorthSomersetCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NorthTynesideCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/NorthumberlandCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/PrestonCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/ReigateAndBansteadBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/RhonddaCynonTaffCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/RochdaleCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/RushcliffeBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/RushmoorCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SalfordCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SheffieldCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SomersetCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SouthAyrshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SouthCambridgeshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SouthLanarkshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SouthNorfolkCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SouthOxfordshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SouthTynesideCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/StHelensBC.schema delete mode 100644 uk_bin_collection/tests/council_schemas/StaffordshireMoorlandsDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/StockportBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/StratfordUponAvonCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/SwaleBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/TamesideMBCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/TonbridgeAndMallingBC.schema delete mode 100644 uk_bin_collection/tests/council_schemas/TorbayCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/TorridgeDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/ValeofGlamorganCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WakefieldCityCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WarwickDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WaverleyBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WealdenDistrictCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WelhatCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WestLothianCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WiganBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WiltshireCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WindsorAndMaidenheadCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/WokingBoroughCouncil.schema delete mode 100644 uk_bin_collection/tests/council_schemas/YorkCouncil.schema rename uk_bin_collection/tests/{council_schemas/BlackburnCouncil.schema => output.schema} (78%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 676e737584..bbc77708e5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,6 @@ * [Additional files](#additional-files) + [Input JSON file](#input-json-file) + [Output JSON file](#output-json-file) - + [Council schema](#council-schema) + [Feature file](#feature-file) * [Testing](#testing) + [Behave (Integration Testing)](#behave--integration-testing-) @@ -146,7 +145,6 @@ In order for your scraper to work with the project's testing suite, some additio modified: - [ ] [Input JSON file](#input-json-file) - [ ] [Output JSON file](#output-json-file) -- [ ] [Council Schema](#council-schema) - [ ] [Feature file](#feature-file) **Note:** from here on, anything containing`` should be replaced with the scraper's name. @@ -221,72 +219,6 @@ Adding the `-d` or `--dev_mode` parameter to your CLI command enables developmen ``` -### Council schema -| Type | File location | -|------|-------------------------------------------------------------------------------------| -| Add | `UKBinCollectionData/uk_bin_collection/tests/council_schemas/.schema` | - -Using the above [output](#output-json-file), you will need to generate a JSON schema that the integration test can run -against. Luckily, this is pretty easy and can be done using an [online tool](https://jsonformatter.org/json-to-jsonschema). - -**Note:** due to seasonal collections (entirely dependent on council, of course), the schema may not include all bin types. -If this is the case, you may need to add them to the bin_type `enum` manually (usually around the end of the file). - -
- Example - -```json -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Empty Standard Mixed Recycling", - "Empty Standard Garden Waste", - "Empty Standard General Waste" - ], - "title": "Type" - } - } -} -``` -
- ### Feature file | Type | File location | |--------|-----------------------------------------------------------------------------------------| @@ -304,7 +236,7 @@ of "what works and what needs work" - we have created a set of Integration tests file. Based on the [input.json](https://github.com/robbrad/UKBinCollectionData/blob/master/uk_bin_collection/tests/input.json), -this does an actual live run against the council's site and validates if the returned data is JSON and conforms to a [JSON Schema](https://github.com/robbrad/UKBinCollectionData/tree/master/uk_bin_collection/tests/council_schemas) for that council. +this does an actual live run against the council's site and validates if the returned data is JSON and conforms to the common format [JSON Schema](https://github.com/robbrad/UKBinCollectionData/tree/master/uk_bin_collection/tests/output.schema). #### Running the Behave tests diff --git a/uk_bin_collection/tests/council_schemas/AylesburyValeCouncil.schema b/uk_bin_collection/tests/council_schemas/AylesburyValeCouncil.schema deleted file mode 100644 index b350eb6768..0000000000 --- a/uk_bin_collection/tests/council_schemas/AylesburyValeCouncil.schema +++ /dev/null @@ -1,49 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Refuse", - "Food", - "Garden", - "Recycling" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BCPCouncil.schema b/uk_bin_collection/tests/council_schemas/BCPCouncil.schema deleted file mode 100644 index f77b5ec089..0000000000 --- a/uk_bin_collection/tests/council_schemas/BCPCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BasingstokeCouncil.schema b/uk_bin_collection/tests/council_schemas/BasingstokeCouncil.schema deleted file mode 100644 index 468f0d7171..0000000000 --- a/uk_bin_collection/tests/council_schemas/BasingstokeCouncil.schema +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/BinData", - "definitions": { - "BinData": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "BinData" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string", - "pattern": "\\d{2}/\\d{2}/\\d{4}" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "waste", - "recycling", - "glass", - "garden" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BathAndNorthEastSomersetCouncil.schema b/uk_bin_collection/tests/council_schemas/BathAndNorthEastSomersetCouncil.schema deleted file mode 100644 index c31ee009ff..0000000000 --- a/uk_bin_collection/tests/council_schemas/BathAndNorthEastSomersetCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BexleyCouncil.schema b/uk_bin_collection/tests/council_schemas/BexleyCouncil.schema deleted file mode 100644 index 152fe55e33..0000000000 --- a/uk_bin_collection/tests/council_schemas/BexleyCouncil.schema +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Food recycling box", - "Paper and Cardboard wheeled bin", - "Waste wheeled bin", - "Chargeable garden waste bin", - "Plastics and Glass wheeled bin" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BoltonCouncil.schema b/uk_bin_collection/tests/council_schemas/BoltonCouncil.schema deleted file mode 100644 index c31ee009ff..0000000000 --- a/uk_bin_collection/tests/council_schemas/BoltonCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BristolCityCouncil.schema b/uk_bin_collection/tests/council_schemas/BristolCityCouncil.schema deleted file mode 100644 index c5d3d3da0c..0000000000 --- a/uk_bin_collection/tests/council_schemas/BristolCityCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BromleyBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/BromleyBoroughCouncil.schema deleted file mode 100644 index 6331ceb8b9..0000000000 --- a/uk_bin_collection/tests/council_schemas/BromleyBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BroxtoweBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/BroxtoweBoroughCouncil.schema deleted file mode 100644 index 6f92551be5..0000000000 --- a/uk_bin_collection/tests/council_schemas/BroxtoweBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BuckinghamshireCouncil.schema b/uk_bin_collection/tests/council_schemas/BuckinghamshireCouncil.schema deleted file mode 100644 index 81087265e6..0000000000 --- a/uk_bin_collection/tests/council_schemas/BuckinghamshireCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/BuryCouncil.schema b/uk_bin_collection/tests/council_schemas/BuryCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/BuryCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/CalderdaleCouncil.schema b/uk_bin_collection/tests/council_schemas/CalderdaleCouncil.schema deleted file mode 100644 index f77b5ec089..0000000000 --- a/uk_bin_collection/tests/council_schemas/CalderdaleCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/CannockChaseDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/CannockChaseDistrictCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/CannockChaseDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/CardiffCouncil.schema b/uk_bin_collection/tests/council_schemas/CardiffCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/CardiffCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/CastlepointDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/CastlepointDistrictCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/CastlepointDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/CharnwoodBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/CharnwoodBoroughCouncil.schema deleted file mode 100644 index 37956a910b..0000000000 --- a/uk_bin_collection/tests/council_schemas/CharnwoodBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome6", - "definitions": { - "Welcome6": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome6" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/ChelmsfordCityCouncil.schema b/uk_bin_collection/tests/council_schemas/ChelmsfordCityCouncil.schema deleted file mode 100644 index 6df5db59ee..0000000000 --- a/uk_bin_collection/tests/council_schemas/ChelmsfordCityCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/CheshireEastCouncil.schema b/uk_bin_collection/tests/council_schemas/CheshireEastCouncil.schema deleted file mode 100644 index b2103185a8..0000000000 --- a/uk_bin_collection/tests/council_schemas/CheshireEastCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Empty Standard Mixed Recycling", - "Empty Standard Garden Waste", - "Empty Standard General Waste" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/ConwyCountyBorough.schema b/uk_bin_collection/tests/council_schemas/ConwyCountyBorough.schema deleted file mode 100644 index 04e0f1e479..0000000000 --- a/uk_bin_collection/tests/council_schemas/ConwyCountyBorough.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Empty Standard Mixed Recycling", - "Empty Standard Garden Waste", - "Empty Standard General Waste" - ], - "title": "Type" - } - } -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/CrawleyBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/CrawleyBoroughCouncil.schema deleted file mode 100644 index 37956a910b..0000000000 --- a/uk_bin_collection/tests/council_schemas/CrawleyBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome6", - "definitions": { - "Welcome6": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome6" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/CroydonCouncil.schema b/uk_bin_collection/tests/council_schemas/CroydonCouncil.schema deleted file mode 100644 index 6df5db59ee..0000000000 --- a/uk_bin_collection/tests/council_schemas/CroydonCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/DerbyshireDalesDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/DerbyshireDalesDistrictCouncil.schema deleted file mode 100644 index 6f92551be5..0000000000 --- a/uk_bin_collection/tests/council_schemas/DerbyshireDalesDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/DoncasterCouncil.schema b/uk_bin_collection/tests/council_schemas/DoncasterCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/DoncasterCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/DurhamCouncil.schema b/uk_bin_collection/tests/council_schemas/DurhamCouncil.schema deleted file mode 100644 index 6331ceb8b9..0000000000 --- a/uk_bin_collection/tests/council_schemas/DurhamCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/EastCambridgeshireCouncil.schema b/uk_bin_collection/tests/council_schemas/EastCambridgeshireCouncil.schema deleted file mode 100644 index ea2c26f385..0000000000 --- a/uk_bin_collection/tests/council_schemas/EastCambridgeshireCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Black Bag", - "Green or Brown Bin", - "Blue Bin" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/EastDevonDC.schema b/uk_bin_collection/tests/council_schemas/EastDevonDC.schema deleted file mode 100644 index 0cb97ad170..0000000000 --- a/uk_bin_collection/tests/council_schemas/EastDevonDC.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Recycling and food waste", - "Rubbish", - "Recycling and food waste (bank holiday replacement)" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/EastLindseyDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/EastLindseyDistrictCouncil.schema deleted file mode 100644 index 202bcb4793..0000000000 --- a/uk_bin_collection/tests/council_schemas/EastLindseyDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome3", - "definitions": { - "Welcome3": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome3" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/EastNorthamptonshireCouncil.schema b/uk_bin_collection/tests/council_schemas/EastNorthamptonshireCouncil.schema deleted file mode 100644 index 912df44b17..0000000000 --- a/uk_bin_collection/tests/council_schemas/EastNorthamptonshireCouncil.schema +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Recycling", - "General" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/EastRidingCouncil.schema b/uk_bin_collection/tests/council_schemas/EastRidingCouncil.schema deleted file mode 100644 index 3bc7cdce87..0000000000 --- a/uk_bin_collection/tests/council_schemas/EastRidingCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/EastSuffolkCouncil.schema b/uk_bin_collection/tests/council_schemas/EastSuffolkCouncil.schema deleted file mode 100644 index f77b5ec089..0000000000 --- a/uk_bin_collection/tests/council_schemas/EastSuffolkCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/EastleighBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/EastleighBoroughCouncil.schema deleted file mode 100644 index c5fea9a375..0000000000 --- a/uk_bin_collection/tests/council_schemas/EastleighBoroughCouncil.schema +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Household Waste Bin", - "Recycling Bin", - "Food Waste Bin", - "Glass Box and Batteries", - "Garden Waste Bin" - ], - "title": "Type" - } - } -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/ErewashBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/ErewashBoroughCouncil.schema deleted file mode 100644 index 3bc7cdce87..0000000000 --- a/uk_bin_collection/tests/council_schemas/ErewashBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/FenlandDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/FenlandDistrictCouncil.schema deleted file mode 100644 index 37956a910b..0000000000 --- a/uk_bin_collection/tests/council_schemas/FenlandDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome6", - "definitions": { - "Welcome6": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome6" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/GatesheadCouncil.schema b/uk_bin_collection/tests/council_schemas/GatesheadCouncil.schema deleted file mode 100644 index f6a48c63d5..0000000000 --- a/uk_bin_collection/tests/council_schemas/GatesheadCouncil.schema +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Recycling", - "Household Waste" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/GlasgowCityCouncil.schema b/uk_bin_collection/tests/council_schemas/GlasgowCityCouncil.schema deleted file mode 100644 index 6a6279251f..0000000000 --- a/uk_bin_collection/tests/council_schemas/GlasgowCityCouncil.schema +++ /dev/null @@ -1,51 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Organic waste", - "General waste", - "Mixed recycling", - "Food waste", - "Ash bin", - "Glass" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/GuildfordCouncil.schema b/uk_bin_collection/tests/council_schemas/GuildfordCouncil.schema deleted file mode 100644 index 3507c2ab9e..0000000000 --- a/uk_bin_collection/tests/council_schemas/GuildfordCouncil.schema +++ /dev/null @@ -1,53 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - }, - "previousCollectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "previousCollectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Recycling", - "Garden Waste", - "Food", - "Refuse" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/HarrogateBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/HarrogateBoroughCouncil.schema deleted file mode 100644 index 9b1fb1fcc4..0000000000 --- a/uk_bin_collection/tests/council_schemas/HarrogateBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/HighPeakCouncil.schema b/uk_bin_collection/tests/council_schemas/HighPeakCouncil.schema deleted file mode 100644 index a79d3ab0a6..0000000000 --- a/uk_bin_collection/tests/council_schemas/HighPeakCouncil.schema +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Recycling with food and garden", - "Rubbish" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/HuntingdonDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/HuntingdonDistrictCouncil.schema deleted file mode 100644 index 202bcb4793..0000000000 --- a/uk_bin_collection/tests/council_schemas/HuntingdonDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome3", - "definitions": { - "Welcome3": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome3" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/KingstonUponThamesCouncil.schema b/uk_bin_collection/tests/council_schemas/KingstonUponThamesCouncil.schema deleted file mode 100644 index 01d1d6c47b..0000000000 --- a/uk_bin_collection/tests/council_schemas/KingstonUponThamesCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/LancasterCityCouncil.schema b/uk_bin_collection/tests/council_schemas/LancasterCityCouncil.schema deleted file mode 100644 index fbe69d15a0..0000000000 --- a/uk_bin_collection/tests/council_schemas/LancasterCityCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Domestic Waste", - "Garden Waste", - "Recycling" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/LeedsCityCouncil.schema b/uk_bin_collection/tests/council_schemas/LeedsCityCouncil.schema deleted file mode 100644 index 1ed66fe230..0000000000 --- a/uk_bin_collection/tests/council_schemas/LeedsCityCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "GREEN", - "BROWN", - "BLACK" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/LisburnCastlereaghCityCouncil.schema b/uk_bin_collection/tests/council_schemas/LisburnCastlereaghCityCouncil.schema deleted file mode 100644 index 266d088d4d..0000000000 --- a/uk_bin_collection/tests/council_schemas/LisburnCastlereaghCityCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "RecycleBin", - "BrownBin", - "ResidualBin" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/LondonBoroughHounslow.schema b/uk_bin_collection/tests/council_schemas/LondonBoroughHounslow.schema deleted file mode 100644 index c31ee009ff..0000000000 --- a/uk_bin_collection/tests/council_schemas/LondonBoroughHounslow.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/MaldonDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/MaldonDistrictCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/MaldonDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/MalvernHillsDC.schema b/uk_bin_collection/tests/council_schemas/MalvernHillsDC.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/MalvernHillsDC.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/ManchesterCityCouncil.schema b/uk_bin_collection/tests/council_schemas/ManchesterCityCouncil.schema deleted file mode 100644 index c31ee009ff..0000000000 --- a/uk_bin_collection/tests/council_schemas/ManchesterCityCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/MertonCouncil.schema b/uk_bin_collection/tests/council_schemas/MertonCouncil.schema deleted file mode 100644 index e1cb3190a1..0000000000 --- a/uk_bin_collection/tests/council_schemas/MertonCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "bin_type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "bin_type", - "collectionDate" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/MidSussexDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/MidSussexDistrictCouncil.schema deleted file mode 100644 index 6df5db59ee..0000000000 --- a/uk_bin_collection/tests/council_schemas/MidSussexDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/MiltonKeynesCityCouncil.schema b/uk_bin_collection/tests/council_schemas/MiltonKeynesCityCouncil.schema deleted file mode 100644 index f77b5ec089..0000000000 --- a/uk_bin_collection/tests/council_schemas/MiltonKeynesCityCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NeathPortTalbotCouncil.schema b/uk_bin_collection/tests/council_schemas/NeathPortTalbotCouncil.schema deleted file mode 100644 index 19b178c7d4..0000000000 --- a/uk_bin_collection/tests/council_schemas/NeathPortTalbotCouncil.schema +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome3", - "definitions": { - "Welcome3": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome3" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "$ref": "#/definitions/CollectionDate" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "CollectionDate": { - "type": "string", - "enum": [ - "23/10/2023", - "30/10/2023" - ], - "title": "CollectionDate" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NewarkAndSherwoodDC.schema b/uk_bin_collection/tests/council_schemas/NewarkAndSherwoodDC.schema deleted file mode 100644 index 9bc07033f4..0000000000 --- a/uk_bin_collection/tests/council_schemas/NewarkAndSherwoodDC.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Green refuse", - "Brown garden recycling", - "Silver recycling" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NewcastleCityCouncil.schema b/uk_bin_collection/tests/council_schemas/NewcastleCityCouncil.schema deleted file mode 100644 index c31ee009ff..0000000000 --- a/uk_bin_collection/tests/council_schemas/NewcastleCityCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NorthEastLincs.schema b/uk_bin_collection/tests/council_schemas/NorthEastLincs.schema deleted file mode 100644 index 3b1952b51d..0000000000 --- a/uk_bin_collection/tests/council_schemas/NorthEastLincs.schema +++ /dev/null @@ -1,49 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Paper", - "Household Waste", - "Garden Waste", - "Cans, Plastics and Glass" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NorthKestevenDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/NorthKestevenDistrictCouncil.schema deleted file mode 100644 index 6331ceb8b9..0000000000 --- a/uk_bin_collection/tests/council_schemas/NorthKestevenDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NorthLanarkshireCouncil.schema b/uk_bin_collection/tests/council_schemas/NorthLanarkshireCouncil.schema deleted file mode 100644 index 6331ceb8b9..0000000000 --- a/uk_bin_collection/tests/council_schemas/NorthLanarkshireCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NorthLincolnshireCouncil.schema b/uk_bin_collection/tests/council_schemas/NorthLincolnshireCouncil.schema deleted file mode 100644 index 7e646f0e72..0000000000 --- a/uk_bin_collection/tests/council_schemas/NorthLincolnshireCouncil.schema +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Blue kerbside box - paper", - "Green kerbside box - cans, glass and aluminium foil", - "General waste wheeled bin", - "Brown garden waste wheeled bin", - "Plastic and cardboard wheeled bin" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NorthNorfolkDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/NorthNorfolkDistrictCouncil.schema deleted file mode 100644 index 6f92551be5..0000000000 --- a/uk_bin_collection/tests/council_schemas/NorthNorfolkDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NorthSomersetCouncil.schema b/uk_bin_collection/tests/council_schemas/NorthSomersetCouncil.schema deleted file mode 100644 index 6f92551be5..0000000000 --- a/uk_bin_collection/tests/council_schemas/NorthSomersetCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NorthTynesideCouncil.schema b/uk_bin_collection/tests/council_schemas/NorthTynesideCouncil.schema deleted file mode 100644 index 3392491c2a..0000000000 --- a/uk_bin_collection/tests/council_schemas/NorthTynesideCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Special collection (bookable)", - "Regular bin (green)", - "Recycling bin (grey)" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/NorthumberlandCouncil.schema b/uk_bin_collection/tests/council_schemas/NorthumberlandCouncil.schema deleted file mode 100644 index 99c12af074..0000000000 --- a/uk_bin_collection/tests/council_schemas/NorthumberlandCouncil.schema +++ /dev/null @@ -1,49 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Rubbish bin", - "Recycling bin", - "Glass bin", - "Garden waste bin" - ], - "title": "Type" - } - } -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/PrestonCityCouncil.schema b/uk_bin_collection/tests/council_schemas/PrestonCityCouncil.schema deleted file mode 100644 index 1fede49014..0000000000 --- a/uk_bin_collection/tests/council_schemas/PrestonCityCouncil.schema +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "General waste", - "General waste, Garden waste", - "Paper/card", - "Glass/cans/plastics", - "Paper/card, Glass/cans/plastics" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/ReigateAndBansteadBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/ReigateAndBansteadBoroughCouncil.schema deleted file mode 100644 index f77b5ec089..0000000000 --- a/uk_bin_collection/tests/council_schemas/ReigateAndBansteadBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/RhonddaCynonTaffCouncil.schema b/uk_bin_collection/tests/council_schemas/RhonddaCynonTaffCouncil.schema deleted file mode 100644 index c5d3d3da0c..0000000000 --- a/uk_bin_collection/tests/council_schemas/RhonddaCynonTaffCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/RochdaleCouncil.schema b/uk_bin_collection/tests/council_schemas/RochdaleCouncil.schema deleted file mode 100644 index 37956a910b..0000000000 --- a/uk_bin_collection/tests/council_schemas/RochdaleCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome6", - "definitions": { - "Welcome6": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome6" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/RushcliffeBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/RushcliffeBoroughCouncil.schema deleted file mode 100644 index 202bcb4793..0000000000 --- a/uk_bin_collection/tests/council_schemas/RushcliffeBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome3", - "definitions": { - "Welcome3": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome3" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/RushmoorCouncil.schema b/uk_bin_collection/tests/council_schemas/RushmoorCouncil.schema deleted file mode 100644 index be66e04de0..0000000000 --- a/uk_bin_collection/tests/council_schemas/RushmoorCouncil.schema +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome6", - "definitions": { - "Welcome6": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome6" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Recycling/Glass", - "General waste/Garden" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SalfordCityCouncil.schema b/uk_bin_collection/tests/council_schemas/SalfordCityCouncil.schema deleted file mode 100644 index 918475d5a0..0000000000 --- a/uk_bin_collection/tests/council_schemas/SalfordCityCouncil.schema +++ /dev/null @@ -1,49 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome6", - "definitions": { - "Welcome6": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome6" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionTime": { - "type": "string" - } - }, - "required": [ - "collectionTime", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Food and garden waste", - "Brown recycling (bottles and cans)", - "Blue recycling (paper and card)", - "Domestic waste" - ], - "title": "Type" - } - } -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/SheffieldCityCouncil.schema b/uk_bin_collection/tests/council_schemas/SheffieldCityCouncil.schema deleted file mode 100644 index 3bc7cdce87..0000000000 --- a/uk_bin_collection/tests/council_schemas/SheffieldCityCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SomersetCouncil.schema b/uk_bin_collection/tests/council_schemas/SomersetCouncil.schema deleted file mode 100644 index 6df5db59ee..0000000000 --- a/uk_bin_collection/tests/council_schemas/SomersetCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SouthAyrshireCouncil.schema b/uk_bin_collection/tests/council_schemas/SouthAyrshireCouncil.schema deleted file mode 100644 index 3bc7cdce87..0000000000 --- a/uk_bin_collection/tests/council_schemas/SouthAyrshireCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SouthCambridgeshireCouncil.schema b/uk_bin_collection/tests/council_schemas/SouthCambridgeshireCouncil.schema deleted file mode 100644 index ff98b11854..0000000000 --- a/uk_bin_collection/tests/council_schemas/SouthCambridgeshireCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Organic", - "Recycle", - "Domestic" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SouthLanarkshireCouncil.schema b/uk_bin_collection/tests/council_schemas/SouthLanarkshireCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/SouthLanarkshireCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SouthNorfolkCouncil.schema b/uk_bin_collection/tests/council_schemas/SouthNorfolkCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/SouthNorfolkCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SouthOxfordshireCouncil.schema b/uk_bin_collection/tests/council_schemas/SouthOxfordshireCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/SouthOxfordshireCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SouthTynesideCouncil.schema b/uk_bin_collection/tests/council_schemas/SouthTynesideCouncil.schema deleted file mode 100644 index 06fa3887ac..0000000000 --- a/uk_bin_collection/tests/council_schemas/SouthTynesideCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Recycling (blue)", - "Recycling (green)", - "Household" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/StHelensBC.schema b/uk_bin_collection/tests/council_schemas/StHelensBC.schema deleted file mode 100644 index 3bc7cdce87..0000000000 --- a/uk_bin_collection/tests/council_schemas/StHelensBC.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome9", - "definitions": { - "Welcome9": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome9" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/StaffordshireMoorlandsDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/StaffordshireMoorlandsDistrictCouncil.schema deleted file mode 100644 index 784e1df0ad..0000000000 --- a/uk_bin_collection/tests/council_schemas/StaffordshireMoorlandsDistrictCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Recycling with food and garden", - "Rubbish", - "Recycling" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/StockportBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/StockportBoroughCouncil.schema deleted file mode 100644 index c5d3d3da0c..0000000000 --- a/uk_bin_collection/tests/council_schemas/StockportBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/StratfordUponAvonCouncil.schema b/uk_bin_collection/tests/council_schemas/StratfordUponAvonCouncil.schema deleted file mode 100644 index 731024c11f..0000000000 --- a/uk_bin_collection/tests/council_schemas/StratfordUponAvonCouncil.schema +++ /dev/null @@ -1,49 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Food waste", - "Recycling", - "Refuse", - "Garden waste" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/SwaleBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/SwaleBoroughCouncil.schema deleted file mode 100644 index 6331ceb8b9..0000000000 --- a/uk_bin_collection/tests/council_schemas/SwaleBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/TamesideMBCouncil.schema b/uk_bin_collection/tests/council_schemas/TamesideMBCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/TamesideMBCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/TonbridgeAndMallingBC.schema b/uk_bin_collection/tests/council_schemas/TonbridgeAndMallingBC.schema deleted file mode 100644 index 6f92551be5..0000000000 --- a/uk_bin_collection/tests/council_schemas/TonbridgeAndMallingBC.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/TorbayCouncil.schema b/uk_bin_collection/tests/council_schemas/TorbayCouncil.schema deleted file mode 100644 index 6f92551be5..0000000000 --- a/uk_bin_collection/tests/council_schemas/TorbayCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome10", - "definitions": { - "Welcome10": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome10" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/TorridgeDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/TorridgeDistrictCouncil.schema deleted file mode 100644 index 6331ceb8b9..0000000000 --- a/uk_bin_collection/tests/council_schemas/TorridgeDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/ValeofGlamorganCouncil.schema b/uk_bin_collection/tests/council_schemas/ValeofGlamorganCouncil.schema deleted file mode 100644 index 18372cfd5e..0000000000 --- a/uk_bin_collection/tests/council_schemas/ValeofGlamorganCouncil.schema +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome3", - "definitions": { - "Welcome3": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome3" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Separated recycling", - "Black bag" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/WakefieldCityCouncil.schema b/uk_bin_collection/tests/council_schemas/WakefieldCityCouncil.schema deleted file mode 100644 index df2fc7bcbb..0000000000 --- a/uk_bin_collection/tests/council_schemas/WakefieldCityCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", - "definitions": { - "Welcome5": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome5" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Mixed recycling", - "Household waste", - "Garden waste recycling" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/WarwickDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/WarwickDistrictCouncil.schema deleted file mode 100644 index c31ee009ff..0000000000 --- a/uk_bin_collection/tests/council_schemas/WarwickDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/WaverleyBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/WaverleyBoroughCouncil.schema deleted file mode 100644 index cbe58f7cd6..0000000000 --- a/uk_bin_collection/tests/council_schemas/WaverleyBoroughCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Food Waste Collection Service", - "Recycling Collection Service", - "Domestic Waste Collection Service" - ], - "title": "Type" - } - } -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/WealdenDistrictCouncil.schema b/uk_bin_collection/tests/council_schemas/WealdenDistrictCouncil.schema deleted file mode 100644 index c31ee009ff..0000000000 --- a/uk_bin_collection/tests/council_schemas/WealdenDistrictCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/WelhatCouncil.schema b/uk_bin_collection/tests/council_schemas/WelhatCouncil.schema deleted file mode 100644 index c5d3d3da0c..0000000000 --- a/uk_bin_collection/tests/council_schemas/WelhatCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome1", - "definitions": { - "Welcome1": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome1" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/WestLothianCouncil.schema b/uk_bin_collection/tests/council_schemas/WestLothianCouncil.schema deleted file mode 100644 index 6331ceb8b9..0000000000 --- a/uk_bin_collection/tests/council_schemas/WestLothianCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome7", - "definitions": { - "Welcome7": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome7" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/WiganBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/WiganBoroughCouncil.schema deleted file mode 100644 index 6efa323673..0000000000 --- a/uk_bin_collection/tests/council_schemas/WiganBoroughCouncil.schema +++ /dev/null @@ -1,24 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "type": "object", - "properties": { - "Black Bin": { - "type": "string" - }, - "Brown Bin": { - "type": "string" - }, - "Green Bin": { - "type": "string" - }, - "Blue Bin": { - "type": "string" - } - }, - "required": [ - "Black Bin", - "Brown Bin", - "Green Bin", - "Blue Bin" - ] -} \ No newline at end of file diff --git a/uk_bin_collection/tests/council_schemas/WiltshireCouncil.schema b/uk_bin_collection/tests/council_schemas/WiltshireCouncil.schema deleted file mode 100644 index 6e4a384784..0000000000 --- a/uk_bin_collection/tests/council_schemas/WiltshireCouncil.schema +++ /dev/null @@ -1,48 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome4", - "definitions": { - "Welcome4": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome4" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "$ref": "#/definitions/Type" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - }, - "Type": { - "type": "string", - "enum": [ - "Mixed dry recycling (blue lidded bin)", - "Glass (black box or basket)", - "Household waste" - ], - "title": "Type" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/WindsorAndMaidenheadCouncil.schema b/uk_bin_collection/tests/council_schemas/WindsorAndMaidenheadCouncil.schema deleted file mode 100644 index 6df5db59ee..0000000000 --- a/uk_bin_collection/tests/council_schemas/WindsorAndMaidenheadCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/WokingBoroughCouncil.schema b/uk_bin_collection/tests/council_schemas/WokingBoroughCouncil.schema deleted file mode 100644 index 6df5db59ee..0000000000 --- a/uk_bin_collection/tests/council_schemas/WokingBoroughCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome2", - "definitions": { - "Welcome2": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome2" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/YorkCouncil.schema b/uk_bin_collection/tests/council_schemas/YorkCouncil.schema deleted file mode 100644 index 31805dad36..0000000000 --- a/uk_bin_collection/tests/council_schemas/YorkCouncil.schema +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome8", - "definitions": { - "Welcome8": { - "type": "object", - "additionalProperties": false, - "properties": { - "bins": { - "type": "array", - "items": { - "$ref": "#/definitions/Bin" - } - } - }, - "required": [ - "bins" - ], - "title": "Welcome8" - }, - "Bin": { - "type": "object", - "additionalProperties": false, - "properties": { - "type": { - "type": "string" - }, - "collectionDate": { - "type": "string" - } - }, - "required": [ - "collectionDate", - "type" - ], - "title": "Bin" - } - } -} diff --git a/uk_bin_collection/tests/council_schemas/BlackburnCouncil.schema b/uk_bin_collection/tests/output.schema similarity index 78% rename from uk_bin_collection/tests/council_schemas/BlackburnCouncil.schema rename to uk_bin_collection/tests/output.schema index f77b5ec089..e3fd01a0f2 100644 --- a/uk_bin_collection/tests/council_schemas/BlackburnCouncil.schema +++ b/uk_bin_collection/tests/output.schema @@ -1,8 +1,8 @@ { "$schema": "http://json-schema.org/draft-06/schema#", - "$ref": "#/definitions/Welcome5", + "$ref": "#/definitions/BinData", "definitions": { - "Welcome5": { + "BinData": { "type": "object", "additionalProperties": false, "properties": { @@ -10,13 +10,14 @@ "type": "array", "items": { "$ref": "#/definitions/Bin" - } + }, + "minItems": 1 } }, "required": [ "bins" ], - "title": "Welcome5" + "title": "BinData" }, "Bin": { "type": "object", @@ -26,7 +27,8 @@ "type": "string" }, "collectionDate": { - "type": "string" + "type": "string", + "pattern": "\\d{2}/\\d{2}/\\d{4}" } }, "required": [ diff --git a/uk_bin_collection/tests/step_defs/step_helpers/file_handler.py b/uk_bin_collection/tests/step_defs/step_helpers/file_handler.py index 551ca74a85..5220f42091 100644 --- a/uk_bin_collection/tests/step_defs/step_helpers/file_handler.py +++ b/uk_bin_collection/tests/step_defs/step_helpers/file_handler.py @@ -1,9 +1,8 @@ import json +import logging import os from jsonschema import validate, ValidationError -import logging - def load_inputs_file(file_name): cwd = os.getcwd() @@ -15,9 +14,7 @@ def load_inputs_file(file_name): def load_schema_file(file_name): cwd = os.getcwd() - with open( - os.path.join(cwd, "uk_bin_collection", "tests", "council_schemas", file_name) - ) as f: + with open(os.path.join(cwd, "uk_bin_collection", "tests", file_name)) as f: data = json.load(f) logging.info(f"{file_name} Schema file loaded") return data diff --git a/uk_bin_collection/tests/step_defs/test_validate_council.py b/uk_bin_collection/tests/step_defs/test_validate_council.py index b3a6ac4229..749f7b1034 100644 --- a/uk_bin_collection/tests/step_defs/test_validate_council.py +++ b/uk_bin_collection/tests/step_defs/test_validate_council.py @@ -1,10 +1,9 @@ +import logging import pytest +import traceback from pytest_bdd import scenario, given, when, then, parsers from step_helpers import file_handler -import logging -import traceback - from uk_bin_collection.uk_bin_collection import collect_data @@ -76,7 +75,7 @@ def validate_json_step(context): @then("the output should validate against the schema") def validate_output_step(context): try: - council_schema = file_handler.load_schema_file(f"{context.council}.schema") + council_schema = file_handler.load_schema_file(f"output.schema") schema_result = file_handler.validate_json_schema( context.parse_result, council_schema )