chore(test) Validation test cleanup

Signed-off-by: Jerome Simeon <[email protected]>
accordproject · Mar 28, 2021 · c7cddd3 · c7cddd3
1 parent 93b8615
commit c7cddd3
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 77 deletions.
diff --git a/...ncerto-core/test/1.0.0/data/test4err.json → ...-core/test/1.0.0/data/identifier1err.json b/...ncerto-core/test/1.0.0/data/test4err.json → ...-core/test/1.0.0/data/identifier1err.json
diff --git a/packages/concerto-core/test/1.0.0/data/test5.json b/packages/concerto-core/test/1.0.0/data/test5.json
diff --git a/packages/concerto-core/test/1.0.0/data/test5a.json b/packages/concerto-core/test/1.0.0/data/test5a.json
diff --git a/packages/concerto-core/test/1.0.0/data/test5b.json b/packages/concerto-core/test/1.0.0/data/test5b.json
diff --git a/packages/concerto-core/test/1.0.0/data/test5c.json b/packages/concerto-core/test/1.0.0/data/test5c.json
diff --git a/packages/concerto-core/test/1.0.0/data/test5d.json b/packages/concerto-core/test/1.0.0/data/test5d.json
diff --git a/packages/concerto-core/test/1.0.0/data/test6.json b/packages/concerto-core/test/1.0.0/data/test6.json
diff --git a/packages/concerto-core/test/1.0.0/data/test6a.json b/packages/concerto-core/test/1.0.0/data/test6a.json
diff --git a/packages/concerto-core/test/1.0.0/data/test7.json b/packages/concerto-core/test/1.0.0/data/test7.json
diff --git a/packages/concerto-core/test/1.0.0/data/test8.json b/packages/concerto-core/test/1.0.0/data/test8.json
diff --git a/packages/concerto-core/test/1.0.0/models/identifier2.cto b/packages/concerto-core/test/1.0.0/models/identifier2.cto
diff --git a/packages/concerto-core/test/1.0.0/models/identifier3.cto b/packages/concerto-core/test/1.0.0/models/identifier3.cto
diff --git a/packages/concerto-core/test/1.0.0/models/identifier4.cto b/packages/concerto-core/test/1.0.0/models/identifier4.cto
diff --git a/packages/concerto-core/test/1.0.0/models/identifier5.cto b/packages/concerto-core/test/1.0.0/models/identifier5.cto
diff --git a/packages/concerto-core/test/1.0.0/validate.js b/packages/concerto-core/test/1.0.0/validate.js
@@ -82,7 +82,7 @@ const positive = [{
     ctoFiles: ['./models/identifier1.cto'],
     expected: './data/identifier1a.expect'
 }, {
-    name: 'user defined identified',
+    name: 'user defined identifier',
     sample: './data/identifier1b.json',
     ctoFiles: ['./models/identifier1.cto'],
     expected: './data/identifier1b.expect'
@@ -99,6 +99,12 @@ const negative = [{
     ctoFiles: ['./models/hierarchy2.cto'],
     error: 'Unexpected properties for type org.test.C: c, t',
     errorFunctional: 'Instance undefined has a property named c which is not declared in org.test.C'
+}, {
+    name: 'user defined identifier',
+    sample: './data/identifier1err.json',
+    ctoFiles: ['./models/identifier1.cto'],
+    error: 'Invalid or missing identifier for Type A1 in namespace org.test',
+    errorFunctional: 'Instance org.test.A1#undefined has an empty identifier.',
 }];
 
 describe('Validation (1.0.0)', () => {
@@ -137,7 +143,7 @@ describe('Validation (1.0.0)', () => {
                     try {
                         await validateClassic(sample, ctoFiles);
                     } catch (errorActual) {
-                        errorActual.name.should.equal('ValidationException');
+                        //errorActual.name.should.equal('ValidationException');
                         errorActual.message.should.deep.equal(error);
                     }
                 });
@@ -146,7 +152,7 @@ describe('Validation (1.0.0)', () => {
                     try {
                         await validateFunctional(sample, ctoFiles);
                     } catch (errorActual) {
-                        errorActual.name.should.equal('ValidationException');
+                        // errorActual.name.should.equal('ValidationException');
                         errorActual.message.should.deep.equal(errorFunctional);
                     }
                 });