Improve test data naming

jvalue · May 29, 2024 · e55bf4a · e55bf4a
1 parent 711b352
commit e55bf4a
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/libs/language-server/src/lib/validation/checks/jayvee-model.spec.ts b/libs/language-server/src/lib/validation/checks/jayvee-model.spec.ts
@@ -64,13 +64,13 @@ describe('Validation of JayveeModel', () => {
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       1,
       'error',
-      `The name "Pipeline" needs to be unique.`,
+      `The name "DuplicatePipelineName" needs to be unique.`,
       expect.any(Object),
     );
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       2,
       'error',
-      `The name "Pipeline" needs to be unique.`,
+      `The name "DuplicatePipelineName" needs to be unique.`,
       expect.any(Object),
     );
   });
@@ -85,13 +85,13 @@ describe('Validation of JayveeModel', () => {
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       1,
       'error',
-      `The name "Transform" needs to be unique.`,
+      `The name "DuplicateTransformName" needs to be unique.`,
       expect.any(Object),
     );
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       2,
       'error',
-      `The name "Transform" needs to be unique.`,
+      `The name "DuplicateTransformName" needs to be unique.`,
       expect.any(Object),
     );
   });
@@ -106,13 +106,13 @@ describe('Validation of JayveeModel', () => {
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       1,
       'error',
-      `The name "ValueType" needs to be unique.`,
+      `The name "DuplicateValueTypeName" needs to be unique.`,
       expect.any(Object),
     );
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       2,
       'error',
-      `The name "ValueType" needs to be unique.`,
+      `The name "DuplicateValueTypeName" needs to be unique.`,
       expect.any(Object),
     );
   });
@@ -127,13 +127,13 @@ describe('Validation of JayveeModel', () => {
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       1,
       'error',
-      `The name "DuplicateValuetype" needs to be unique.`,
+      `The name "DuplicateValueTypeName" needs to be unique.`,
       expect.any(Object),
     );
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       2,
       'error',
-      `The name "DuplicateValuetype" needs to be unique.`,
+      `The name "DuplicateValueTypeName" needs to be unique.`,
       expect.any(Object),
     );
   });
@@ -148,13 +148,13 @@ describe('Validation of JayveeModel', () => {
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       1,
       'error',
-      `The name "Constraint" needs to be unique.`,
+      `The name "DuplicateConstraintName" needs to be unique.`,
       expect.any(Object),
     );
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       2,
       'error',
-      `The name "Constraint" needs to be unique.`,
+      `The name "DuplicateConstraintName" needs to be unique.`,
       expect.any(Object),
     );
   });
@@ -169,13 +169,13 @@ describe('Validation of JayveeModel', () => {
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       1,
       'error',
-      `The name "TestBlock" needs to be unique.`,
+      `The name "DuplicateBlockTypeName" needs to be unique.`,
       expect.any(Object),
     );
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       2,
       'error',
-      `The name "TestBlock" needs to be unique.`,
+      `The name "DuplicateBlockTypeName" needs to be unique.`,
       expect.any(Object),
     );
   });
@@ -271,13 +271,13 @@ describe('Validation of JayveeModel', () => {
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       1,
       'error',
-      `The name "X" needs to be unique.`,
+      `The name "DuplicateNameAliased" needs to be unique.`,
       expect.any(Object),
     );
     expect(validationAcceptorMock).toHaveBeenNthCalledWith(
       2,
       'error',
-      `The name "X" needs to be unique.`,
+      `The name "DuplicateNameAliased" needs to be unique.`,
       expect.any(Object),
     );
   });

diff --git a/...age-server/src/test/assets/jayvee-model/invalid-duplicate-name-with-builtin-value-type.jv b/...age-server/src/test/assets/jayvee-model/invalid-duplicate-name-with-builtin-value-type.jv
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-valuetype DuplicateValuetype oftype text {
+valuetype DuplicateValueTypeName oftype text {
 	constraints: [
 		Constraint,
 	];
 }
 
-builtin valuetype DuplicateValuetype;
+builtin valuetype DuplicateValueTypeName;
diff --git a/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-block-types.jv b/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-block-types.jv
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-builtin blocktype TestBlock {
+builtin blocktype DuplicateBlockTypeName {
 	input default oftype text;
 }
 
-builtin blocktype TestBlock {
+builtin blocktype DuplicateBlockTypeName {
 	input default oftype text;
 }
diff --git a/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-constraints.jv b/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-constraints.jv
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-constraint Constraint on text:
+constraint DuplicateConstraintName on text:
 	value.length == 10;
 
-constraint Constraint on text:
+constraint DuplicateConstraintName on text:
 	value.length == 10;
diff --git a/...language-server/src/test/assets/jayvee-model/invalid-non-unique-name-with-import-alias.jv b/...language-server/src/test/assets/jayvee-model/invalid-non-unique-name-with-import-alias.jv
@@ -2,6 +2,6 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-use { DuplicateName as X } from './publishing.jv';
+use { DuplicateName as DuplicateNameAliased } from './publishing.jv';
 
-pipeline X {} 
+pipeline DuplicateNameAliased {} 
diff --git a/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-pipelines.jv b/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-pipelines.jv
@@ -2,12 +2,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-pipeline Pipeline {
+pipeline DuplicatePipelineName {
   block TestExtractor oftype TestFileExtractor {
   }
 }
 
-pipeline Pipeline {
+pipeline DuplicatePipelineName {
   block TestExtractor oftype TestFileExtractor {
   }
 }
diff --git a/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-transforms.jv b/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-transforms.jv
@@ -2,14 +2,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-transform Transform {
+transform DuplicateTransformName {
   from inputParam oftype decimal;
   to result oftype integer;
 
   result: floor(inputParam);
 }
 
-transform Transform {
+transform DuplicateTransformName {
   from inputParam oftype decimal;
   to inputParam oftype integer;
 

diff --git a/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-value-types.jv b/libs/language-server/src/test/assets/jayvee-model/invalid-non-unique-value-types.jv
@@ -2,13 +2,13 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-valuetype ValueType oftype text {
+valuetype DuplicateValueTypeName oftype text {
 	constraints: [
 		Constraint,
 	];
 }
 
-valuetype ValueType oftype text {
+valuetype DuplicateValueTypeName oftype text {
 	constraints: [
 		Constraint,
 	];