improve json schema test data directory structure

GSA · Jul 27, 2020 · a0f6928 · a0f6928
1 parent 4db5f4d
commit a0f6928
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 2 deletions.
diff --git a/test/schema/catalog.json → test/schema/data/catalog.json b/test/schema/catalog.json → test/schema/data/catalog.json
diff --git a/test/schema/catalog.jsonld → test/schema/data/catalog.jsonld b/test/schema/catalog.jsonld → test/schema/data/catalog.jsonld
diff --git a/test/schema/dataset.json → test/schema/data/dataset.json b/test/schema/dataset.json → test/schema/data/dataset.json
diff --git a/test/schema/distribution.json → test/schema/data/distribution.json b/test/schema/distribution.json → test/schema/data/distribution.json
diff --git a/test/schema/organization.json → test/schema/data/organization.json b/test/schema/organization.json → test/schema/data/organization.json
diff --git a/test/schema/vcard.json → test/schema/data/vcard.json b/test/schema/vcard.json → test/schema/data/vcard.json
diff --git a/test/test_datajson.rb b/test/test_datajson.rb
@@ -3,7 +3,7 @@
 
 class TestDataJson < Test::Unit::TestCase
   def test_valid_data_json
-    schema_path = File.join(__dir__, "schema", "catalog.json")
+    schema_path = File.join(__dir__, "schema", "data", "catalog.json")
     datajson_path = File.join(__dir__, "..", "data.json")
     assert_nothing_raised(JSON::Schema::ValidationError) {
       JSON::Validator.validate!(schema_path, datajson_path, schema_reader: SchemaReader.new)
@@ -15,7 +15,7 @@ def test_valid_data_json
 class SchemaReader < JSON::Schema::Reader
   def read(location)
     filename = URI(location).path.split('/').last
-    body = read_file(File.join(__dir__, "schema", filename))
+    body = read_file(File.join(__dir__, "schema", "data", filename))
     JSON::Schema.new(JSON::Validator.parse(body), location)
   end
 end