Skip to content

Commit

Permalink
Applied new TestExtension loading
Browse files Browse the repository at this point in the history
  • Loading branch information
@f3l1x98
f3l1x98 committed Nov 13, 2023
1 parent 9290f97 commit 078c4a9
Show file tree
Hide file tree
Showing 10 changed files with 88 additions and 63 deletions.
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/cell-range-selector-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ import * as path from 'path';

import * as R from '@jvalue/jayvee-execution';
import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -67,12 +65,12 @@ describe('Validation of CellRangeSelectorExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/cell-writer-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ import * as path from 'path';

import * as R from '@jvalue/jayvee-execution';
import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -67,12 +65,12 @@ describe('Validation of CellWriterExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/column-deleter-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ import * as path from 'path';

import * as R from '@jvalue/jayvee-execution';
import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -67,12 +65,12 @@ describe('Validation of ColumnDeleterExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/csv-interpreter-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@ import {
createTextFileFromLocalFile,
getTestExecutionContext,
} from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -68,12 +66,12 @@ describe('Validation of CSVInterpreterExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/row-deleter-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ import * as path from 'path';

import * as R from '@jvalue/jayvee-execution';
import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -67,12 +65,12 @@ describe('Validation of RowDeleterExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/sheet-picker-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ import * as path from 'path';

import * as R from '@jvalue/jayvee-execution';
import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -67,12 +65,12 @@ describe('Validation of SheetPickerExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/table-interpreter-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ import * as path from 'path';

import * as R from '@jvalue/jayvee-execution';
import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -67,12 +65,12 @@ describe('Validation of TableInterpreterExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/table-transformer-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,16 @@ import * as path from 'path';

import * as R from '@jvalue/jayvee-execution';
import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
PrimitiveValuetypes,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -96,12 +94,12 @@ describe('Validation of TableTransformerExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
12 changes: 5 additions & 7 deletions libs/extensions/tabular/exec/src/lib/xlsx-interpreter-executor.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@ import {
createBinaryFileFromLocalFile,
getTestExecutionContext,
} from '@jvalue/jayvee-execution/test';
import { TabularLangExtension } from '@jvalue/jayvee-extensions/tabular/lang';
import {
BlockDefinition,
IOType,
createJayveeServices,
useExtension,
} from '@jvalue/jayvee-language-server';
import {
ParseHelperOptions,
TestLangExtension,
expectNoParserAndLexerErrors,
loadTestExtensions,
parseHelper,
readJvTestAssetHelper,
} from '@jvalue/jayvee-language-server/test';
Expand Down Expand Up @@ -77,12 +75,12 @@ describe('Validation of XLSXInterpreterExecutor', () => {
);
}

beforeAll(() => {
// Register extensions
useExtension(new TabularLangExtension());
useExtension(new TestLangExtension());
beforeAll(async () => {
// Create language services
const services = createJayveeServices(NodeFileSystem).Jayvee;
await loadTestExtensions(services, [
path.resolve(__dirname, '../../test/test-extension/TestBlockTypes.jv'),
]);
locator = services.workspace.AstNodeLocator;
// Parse function for Jayvee (without validation)
parse = parseHelper(services);
Expand Down
43 changes: 43 additions & 0 deletions libs/extensions/tabular/exec/test/test-extension/TestBlockTypes.jv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// SPDX-FileCopyrightText: 2023 Friedrich-Alexander-Universitat Erlangen-Nurnberg
//
// SPDX-License-Identifier: AGPL-3.0-only

builtin blocktype TestSheetExtractor {
input inPort oftype None;
output outPort oftype Sheet;
}

builtin blocktype TestSheetLoader {
input inPort oftype Sheet;
output outPort oftype None;
}

builtin blocktype TestTextFileExtractor {
input inPort oftype None;
output outPort oftype TextFile;
}

builtin blocktype TestFileExtractor {
input inPort oftype None;
output outPort oftype File;
}

builtin blocktype TestWorkbookExtractor {
input inPort oftype None;
output outPort oftype Workbook;
}

builtin blocktype TestWorkbookLoader {
input inPort oftype Workbook;
output outPort oftype None;
}

builtin blocktype TestTableExtractor {
input inPort oftype None;
output outPort oftype Table;
}

builtin blocktype TestTableLoader {
input inPort oftype Table;
output outPort oftype None;
}

0 comments on commit 078c4a9

Please sign in to comment.