Move reference test fixtures and fix linebreak normalization tests

joneubank · joneubank · commit 66867fc015d8 · 2023-07-04T15:32:13.000-04:00
diff --git a/test/fixtures/dictionaries/linebreak/input1.ts b/test/fixtures/dictionaries/linebreak/input1.ts
@@ -20,7 +20,7 @@
 import { Dictionary } from '../../../../src/types/dictionaryTypes';
 
 const output: Dictionary = {
-	name: 'ARGO Dictionary',
+	name: 'Test Dictionary',
 	version: '1.2',
 	schemas: [
 		{
diff --git a/test/fixtures/dictionaries/linebreak/input2.ts b/test/fixtures/dictionaries/linebreak/input2.ts
@@ -20,7 +20,7 @@
 import { Dictionary } from '../../../../src/types/dictionaryTypes';
 
 const output: Dictionary = {
-	name: 'ARGO Dictionary',
+	name: 'Test Dictionary',
 	version: '1.2',
 	schemas: [
 		{
diff --git a/test/fixtures/dictionaries/linebreak/output.ts b/test/fixtures/dictionaries/linebreak/output.ts
@@ -20,7 +20,7 @@
 import { Dictionary } from '../../../../src/types/dictionaryTypes';
 
 const output: Dictionary = {
-	name: 'ARGO Dictionary',
+	name: 'Test Dictionary',
 	version: '1.2',
 	schemas: [
 		{
diff --git a/test/fixtures/dictionaries/references/codeList_references/input.json b/test/fixtures/dictionaries/references/codeList_references/input.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
@@ -15,7 +15,7 @@
 						"key": true
 					},
 					"restrictions": {
-						"regexp": "#/ID_REG_EXP"
+						"regex": "#/ID_REG_EXP"
 					}
 				},
 				{
diff --git a/test/fixtures/dictionaries/references/codeList_references/output.json b/test/fixtures/dictionaries/references/codeList_references/output.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
@@ -15,7 +15,7 @@
 						"key": true
 					},
 					"restrictions": {
-						"regexp": "^[\\w\\s\\W]{5,}$"
+						"regex": "^[\\w\\s\\W]{5,}$"
 					}
 				},
 				{
diff --git a/test/fixtures/dictionaries/references/cyclic_references/input.json b/test/fixtures/dictionaries/references/cyclic_references/input.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
@@ -15,7 +15,7 @@
 						"key": true
 					},
 					"restrictions": {
-						"regexp": "#/ID_REG_EXP"
+						"regex": "#/ID_REG_EXP"
 					}
 				},
 				{
diff --git a/test/fixtures/dictionaries/references/cyclic_references/output.json b/test/fixtures/dictionaries/references/cyclic_references/output.json
@@ -0,0 +1,41 @@
+{
+	"name": "Test Dictionary",
+	"version": "1.2",
+	"schemas": [
+		{
+			"name": "donor",
+			"description": "Donor Entity",
+			"fields": [
+				{
+					"name": "donor_submitter_id",
+					"displayName": "Submitter Donor ID",
+					"valueType": "string",
+					"description": "Unique identifier for donor; assigned by data provider",
+					"meta": {
+						"key": true
+					},
+					"restrictions": {
+						"regex": "^[\\w\\s\\W]{5,}$"
+					}
+				},
+				{
+					"name": "gender",
+					"valueType": "string",
+					"description": "Donor Biological Sex",
+					"restrictions": {
+						"codeList": ["Male", "Female", "Other"]
+					}
+				},
+				{
+					"name": "ethnicity",
+					"valueType": "string",
+					"description": "Self described",
+					"meta": {
+						"default": "Unknown"
+					},
+					"restrictions": {}
+				}
+			]
+		}
+	]
+}
diff --git a/test/fixtures/dictionaries/references/empty_references_section/input.json b/test/fixtures/dictionaries/references/empty_references_section/input.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
diff --git a/test/fixtures/dictionaries/references/empty_references_section/output.json b/test/fixtures/dictionaries/references/empty_references_section/output.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
diff --git a/test/fixtures/dictionaries/references/no_references_section/input.json b/test/fixtures/dictionaries/references/no_references_section/input.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
diff --git a/test/fixtures/dictionaries/references/no_references_section/output.json b/test/fixtures/dictionaries/references/no_references_section/output.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
diff --git a/test/fixtures/dictionaries/references/non_existing_references/input.json b/test/fixtures/dictionaries/references/non_existing_references/input.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
@@ -15,7 +15,7 @@
 						"key": true
 					},
 					"restrictions": {
-						"regexp": "#/ID_REG_EXP"
+						"regex": "#/ID_REG_EXP"
 					}
 				},
 				{
diff --git a/test/fixtures/dictionaries/references/non_existing_references/output.json b/test/fixtures/dictionaries/references/non_existing_references/output.json
@@ -0,0 +1,41 @@
+{
+	"name": "Test Dictionary",
+	"version": "1.2",
+	"schemas": [
+		{
+			"name": "donor",
+			"description": "Donor Entity",
+			"fields": [
+				{
+					"name": "donor_submitter_id",
+					"displayName": "Submitter Donor ID",
+					"valueType": "string",
+					"description": "Unique identifier for donor; assigned by data provider",
+					"meta": {
+						"key": true
+					},
+					"restrictions": {
+						"regex": "^[\\w\\s\\W]{5,}$"
+					}
+				},
+				{
+					"name": "gender",
+					"valueType": "string",
+					"description": "Donor Biological Sex",
+					"restrictions": {
+						"codeList": ["Male", "Female", "Other"]
+					}
+				},
+				{
+					"name": "ethnicity",
+					"valueType": "string",
+					"description": "Self described",
+					"meta": {
+						"default": "Unknown"
+					},
+					"restrictions": {}
+				}
+			]
+		}
+	]
+}
diff --git a/test/fixtures/dictionaries/references/references_within_references/input.json b/test/fixtures/dictionaries/references/references_within_references/input.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
@@ -15,7 +15,7 @@
 						"key": true
 					},
 					"restrictions": {
-						"regexp": "#/ID_REG_EXP"
+						"regex": "#/ID_REG_EXP"
 					}
 				},
 				{
diff --git a/test/fixtures/dictionaries/references/references_within_references/output.json b/test/fixtures/dictionaries/references/references_within_references/output.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
@@ -15,7 +15,7 @@
 						"key": true
 					},
 					"restrictions": {
-						"regexp": "^[\\w\\s\\W]{5,}$"
+						"regex": "^[\\w\\s\\W]{5,}$"
 					}
 				},
 				{
diff --git a/test/fixtures/dictionaries/references/self_references/input.json b/test/fixtures/dictionaries/references/self_references/input.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
@@ -15,7 +15,7 @@
 						"key": true
 					},
 					"restrictions": {
-						"regexp": "#/ID_REG_EXP"
+						"regex": "#/ID_REG_EXP"
 					}
 				},
 				{
diff --git a/test/fixtures/dictionaries/references/simple_references/input.json b/test/fixtures/dictionaries/references/simple_references/input.json
@@ -1,5 +1,5 @@
 {
-	"name": "ARGO Dictionary",
+	"name": "Test Dictionary",
 	"version": "1.2",
 	"schemas": [
 		{
@@ -15,7 +15,7 @@
 						"key": true
 					},
 					"restrictions": {
-						"regexp": "#/ID_REG_EXP"
+						"regex": "#/ID_REG_EXP"
 					}
 				},
 				{
diff --git a/test/fixtures/dictionaries/references/simple_references/output.json b/test/fixtures/dictionaries/references/simple_references/output.json
@@ -0,0 +1,41 @@
+{
+	"name": "Test Dictionary",
+	"version": "1.2",
+	"schemas": [
+		{
+			"name": "donor",
+			"description": "Donor Entity",
+			"fields": [
+				{
+					"name": "donor_submitter_id",
+					"displayName": "Submitter Donor ID",
+					"valueType": "string",
+					"description": "Unique identifier for donor; assigned by data provider",
+					"meta": {
+						"key": true
+					},
+					"restrictions": {
+						"regex": "^[\\w\\s\\W]{5,}$"
+					}
+				},
+				{
+					"name": "gender",
+					"valueType": "string",
+					"description": "Donor Biological Sex",
+					"restrictions": {
+						"codeList": ["Male", "Female", "Other"]
+					}
+				},
+				{
+					"name": "ethnicity",
+					"valueType": "string",
+					"description": "Self described",
+					"meta": {
+						"default": "Unknown"
+					},
+					"restrictions": {}
+				}
+			]
+		}
+	]
+}
diff --git a/test/functional/fixtures/references/codeList_references/output.json b/test/functional/fixtures/references/codeList_references/output.json
diff --git a/test/functional/fixtures/references/non_existing_references/output.json b/test/functional/fixtures/references/non_existing_references/output.json
diff --git a/test/functional/fixtures/references/simple_references/output.json b/test/functional/fixtures/references/simple_references/output.json
diff --git a/test/functional/referencesTest.ts b/test/functional/referencesTest.ts
diff --git a/test/functional/schemaTest.ts b/test/functional/schemaTest.ts
diff --git a/test/integration/crudIntegrationTests.ts b/test/integration/crudIntegrationTests.ts
diff --git a/test/integration/fixtures/createDictionary.json b/test/integration/fixtures/createDictionary.json

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`import { Dictionary } from '../../../../src/types/dictionaryTypes';`
`21`	`21`
`22`	`22`	`const output: Dictionary = {`
`23`		`- name: 'ARGO Dictionary',`
	`23`	`+ name: 'Test Dictionary',`
`24`	`24`	`version: '1.2',`
`25`	`25`	`schemas: [`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "ARGO Dictionary",`
	`2`	`+ "name": "Test Dictionary",`
`3`	`3`	`"version": "1.2",`
`4`	`4`	`"schemas": [`
`5`	`5`	`{`
`@@ -15,7 +15,7 @@`
`15`	`15`	`"key": true`
`16`	`16`	`},`
`17`	`17`	`"restrictions": {`
`18`		`- "regexp": "#/ID_REG_EXP"`
	`18`	`+ "regex": "#/ID_REG_EXP"`
`19`	`19`	`}`
`20`	`20`	`},`
`21`	`21`	`{`