Complement refactoring with adaption of tests

libs/language-server/src/lib/validation/checks/block-definition.spec.ts

@@ -76,22 +76,6 @@ describe('Validation of BlockDefinition', () => {
     );
   });
 
-  it('should diagnose error on block as input for multiple pipes', async () => {
-    const text = readJvTestAsset(
-      'block-definition/invalid-block-as-multiple-pipe-inputs.jv',
-    );
-
-    await parseAndValidateBlock(text);
-
-    expect(validationAcceptorMock).toHaveBeenCalledTimes(2);
-    expect(validationAcceptorMock).toHaveBeenNthCalledWith(
-      2,
-      'error',
-      'At most one pipe can be connected to the input of a TestTableLoader',
-      expect.any(Object),
-    );
-  });
-
   it('should have no error on valid block definition', async () => {
     const text = readJvTestAsset('block-definition/valid-block-definition.jv');
 

libs/language-server/src/lib/validation/checks/composite-blocktype-definition.spec.ts

@@ -115,4 +115,27 @@ describe('Validation of CompositeBlocktypeDefinition', () => {
 
     expect(validationAcceptorMock).toHaveBeenCalledTimes(0);
   });
+
+  it('should diagnose error on block as input for multiple pipes', async () => {
+    const text = readJvTestAsset(
+      'composite-blocktype-definition/invalid-block-as-multiple-pipe-inputs.jv',
+    );
+
+    await parseAndValidateBlocktype(text);
+
+    // first 2 errors for multiple pipelines in test file
+    expect(validationAcceptorMock).toHaveBeenCalledTimes(4);
+    expect(validationAcceptorMock).toHaveBeenNthCalledWith(
+      3,
+      'error',
+      'At most one pipe can be connected to the input of a block. Currently, the following 2 blocks are connected via pipes: "BlockFrom1", "BlockFrom2"',
+      expect.any(Object),
+    );
+    expect(validationAcceptorMock).toHaveBeenNthCalledWith(
+      4,
+      'error',
+      'At most one pipe can be connected to the input of a block. Currently, the following 2 blocks are connected via pipes: "BlockFrom1", "BlockFrom2"',
+      expect.any(Object),
+    );
+  });
 });

libs/language-server/src/lib/validation/checks/pipeline-definition.spec.ts

@@ -100,4 +100,20 @@ describe('Validation of PipelineDefinition', () => {
 
     expect(validationAcceptorMock).toHaveBeenCalledTimes(0);
   });
+
+  it('should diagnose error on block as input for multiple pipes', async () => {
+    const text = readJvTestAsset(
+      'pipeline-definition/invalid-block-as-multiple-pipe-inputs.jv',
+    );
+
+    await parseAndValidatePipeline(text);
+
+    expect(validationAcceptorMock).toHaveBeenCalledTimes(2);
+    expect(validationAcceptorMock).toHaveBeenNthCalledWith(
+      2,
+      'error',
+      'At most one pipe can be connected to the input of a block. Currently, the following 2 blocks are connected via pipes: "BlockFrom1", "BlockFrom2"',
+      expect.any(Object),
+    );
+  });
 });

libs/language-server/src/test/assets/composite-blocktype-definition/invalid-block-as-multiple-pipe-inputs.jv

@@ -0,0 +1,27 @@
+// SPDX-FileCopyrightText: 2023 Friedrich-Alexander-Universitat Erlangen-Nurnberg
+//
+// SPDX-License-Identifier: AGPL-3.0-only
+
+composite blocktype TestBlockType {
+  input inPort oftype None;
+  output outPort oftype None;
+
+  block BlockTo oftype TestTableLoader { }
+
+  block BlockFrom1 oftype TestFileExtractor { }
+
+  block BlockFrom2 oftype TestFileExtractor { }
+
+  inPort -> BlockFrom1 -> BlockTo -> outPort;
+  inPort -> BlockFrom2 -> BlockTo -> outPort;
+}
+
+builtin blocktype TestFileExtractor {
+  input inPort oftype None;
+  output outPort oftype Table;
+}
+
+builtin blocktype TestTableLoader {
+  input inPort oftype Table;
+  output outPort oftype None;
+}

libs/language-server/src/test/assets/composite-blocktype-definition/invalid-composite-blocktype-multiple-pipelines.jv

@@ -5,23 +5,19 @@
 composite blocktype TestBlock {
 
     input inputName oftype None;
-    output outputName oftype Sheet;
+    output outputName oftype TextFile;
 
     block FileExtractor oftype HttpExtractor { url: 'url'; }
-    block FileTextInterpreter oftype TextFileInterpreter {}
-
-    block FileCSVInterpreter oftype CSVInterpreter {
-    }
+    block FileTextInterpreter1 oftype TextFileInterpreter {}
+    block FileTextInterpreter2 oftype TextFileInterpreter {}
 
     inputName
         ->FileExtractor
-        ->FileTextInterpreter
-        ->FileCSVInterpreter
+        ->FileTextInterpreter1
         ->outputName;
 
     inputName
         ->FileExtractor
-        ->FileTextInterpreter
-        ->FileCSVInterpreter
+        ->FileTextInterpreter2
         ->outputName;
 }

libs/language-server/src/test/assets/block-definition/invalid-block-as-multiple-pipe-inputs.jv → libs/language-server/src/test/assets/pipeline-definition/invalid-block-as-multiple-pipe-inputs.jv

@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 pipeline Pipeline {
-  block BlockTo oftype TestTableLoader {
-  }
+  block BlockTo oftype TestTableLoader { }
 
-  block BlockFrom oftype TestFileExtractor {
-  }
+  block BlockFrom1 oftype TestFileExtractor { }
 
-  BlockFrom -> BlockTo;
+  block BlockFrom2 oftype TestFileExtractor { }
 
-  BlockFrom -> BlockTo;
+  BlockFrom1 -> BlockTo;
+
+  BlockFrom2 -> BlockTo;
 }
 
 builtin blocktype TestFileExtractor {