From 48f3744c967afd598ca2a49e8ea5487e1a35a898 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Sat, 2 Nov 2024 04:15:02 +0100 Subject: [PATCH 01/12] JNG-5995 Initial feature commit [ci skip] From f616cff5fe3207cc25514cd80b8a920a9dbe58d6 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Sat, 2 Nov 2024 11:38:09 +0100 Subject: [PATCH 02/12] Versions updated --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bbe48f92..8ae5cb8b 100644 --- a/pom.xml +++ b/pom.xml @@ -53,9 +53,9 @@ ${maven.multiModuleProjectDirectory}/logback-test.xml - 2.0.7 + 2.0.16 5.5.1 - 3.0.0-M7 + 3.5.1 1.5.1.20240414_020123_4ed0f7e3_develop 3.2 @@ -85,7 +85,7 @@ jacoco java ${java.version} - 0.8.8 + 0.8.12 From a6d3d9e2674dec524d6cde5abbd10ab2fba3062a Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Mon, 4 Nov 2024 01:09:01 +0100 Subject: [PATCH 03/12] Fixing dependencies [ci skip] --- .../epsilon/operations/jsl/data/entityDeclaration.eol | 4 ++-- pom.xml | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/jsl/data/entityDeclaration.eol b/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/jsl/data/entityDeclaration.eol index 9ebd138f..03a12aaf 100644 --- a/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/jsl/data/entityDeclaration.eol +++ b/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/jsl/data/entityDeclaration.eol @@ -15,8 +15,8 @@ operation JSL!EntityDeclaration getModelRoot(): JUDOPSM!Package { @cached -operation JSL!EntityDeclaration getInheritedMembers(): Sequence { - var members = new Sequence(); +operation JSL!EntityDeclaration getInheritedMembers(): Sequence { + var members = new Sequence(); for (member in self.members) { members.add(member); diff --git a/pom.xml b/pom.xml index 8ae5cb8b..05ad0de5 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,8 @@ ${maven.multiModuleProjectDirectory}/logback-test.xml + 1.5.12 + 1.18.34 2.0.16 5.5.1 @@ -116,7 +118,7 @@ org.projectlombok lombok - 1.18.24 + ${lombok-version} @@ -128,7 +130,7 @@ ch.qos.logback logback-classic - 1.4.11 + ${logback-version} provided @@ -736,7 +738,7 @@ org.projectlombok lombok - 1.18.24 + ${lombok-version} From c8a3691c16bb3e4cf0a65049d4af393a3e1a01f6 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Fri, 8 Nov 2024 02:37:04 +0100 Subject: [PATCH 04/12] Fix cache / parallel [skip ci] --- .../src/main/epsilon/transformations/ui/jslToUi.etl | 12 +++++++++--- .../ui/modules/application/actorGroupDeclaration.etl | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl index 4d619cbc..88d539c8 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl @@ -46,11 +46,11 @@ pre { for (container : JSL!UIViewPanelDeclaration in JSL!UIViewPanelDeclaration.all()) { if (container.isTypeOf(JSL!UIViewGroupDeclaration)) { for (member in container.members) { - member.~pos = container.members.indexOf(member) + 1; + __pos.put(member, container.members.indexOf(member) + 1); } } else if (container.isTypeOf(JSL!UIViewTabsDeclaration)) { for (panel in container.panels) { - panel.~pos = container.panels.indexOf(panel) + 1; + __pos.put(panel, container.panels.indexOf(panel) + 1); } } } @@ -63,7 +63,7 @@ pre { for (visible : JSL!UIViewDeclaration in JSL!UIViewDeclaration.all()) { for (member in visible.members) { - member.~pos = visible.members.indexOf(member) + 1; + __pos.put(member, visible.members.indexOf(member) + 1); } } } @@ -72,6 +72,9 @@ post { var application = rootMenu.equivalent("Application"); for (navigationController : UI!ui::NavigationController in UI!ui::NavigationController.all()) { + for (item in navigationController.items) { + item.~pos = __pos.get(item); + } navigationController.items = navigationController.items.sortBy(e | e.~pos); } @@ -81,6 +84,9 @@ post { for (container : UI!ui::Container in UI!ui::Container.all().select(a | a.getRootApplication() == application)) { var missingPos = false; + for (item in container.children) { + item.~pos = __pos.get(item); + } for (child in container.children) { if (child.~pos.isUndefined()) { missingPos = true; diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorGroupDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorGroupDeclaration.etl index ef813468..dcb38dd6 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorGroupDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorGroupDeclaration.etl @@ -24,10 +24,10 @@ rule MenuItemGroup if (s.eContainer.isKindOf(JSL!UIMenuGroupDeclaration)) { s.eContainer.equivalent("MenuItemGroup").items.add(t); - t.~pos = s.eContainer.members.indexOf(s); + __pos.put(t, s.eContainer.members.indexOf(s)); } else { var navigationController = rootMenu.equivalent("Application").navigationController; navigationController.items.add(t); - t.~pos = s.eContainer.members.indexOf(s); + __pos.put(t, s.eContainer.members.indexOf(s)); } } From 2b53cf2f90128c83246353d599d8d88807a50db3 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Fri, 8 Nov 2024 03:47:33 +0100 Subject: [PATCH 05/12] Fix cache / parallel [skip ci] --- .../epsilon/operations/jsl/ui/visibleDeclaration.eol | 2 +- .../src/main/epsilon/transformations/ui/jslToUi.etl | 7 +++++-- .../ui/modules/view/menuLinkDeclaration.etl | 4 ++-- .../ui/modules/view/menuTableDeclaration.etl | 4 ++-- .../view/menuTableDeclarationAddSelectorPage.etl | 12 ++++++------ .../ui/modules/view/rowDeclaration.etl | 6 +++--- .../ui/modules/view/viewDeclaration.etl | 6 +++--- .../ui/modules/view/viewDeclarationForm.etl | 6 +++--- .../ui/modules/view/viewGroupDeclaration.etl | 2 +- .../ui/modules/view/viewLinkDeclaration.etl | 10 ++++++---- .../view/viewLinkDeclarationSetSelectorPage.etl | 12 +++++++----- .../ui/modules/view/viewTableDeclaration.etl | 7 ++++--- .../view/viewTableDeclarationAddSelectorPage.etl | 11 ++++++----- .../ui/modules/view/viewTabsDeclaration.etl | 2 +- .../ui/modules/view/viewWidgetDeclaration.etl | 2 +- 15 files changed, 51 insertions(+), 42 deletions(-) diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/ui/visibleDeclaration.eol b/judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/ui/visibleDeclaration.eol index 940fa133..64ad798d 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/ui/visibleDeclaration.eol +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/ui/visibleDeclaration.eol @@ -18,5 +18,5 @@ operation Any getPos(): Integer { } else if (self.eContainer.isKindOf(JSL!UIViewTabsDeclaration)) { return self.eContainer.panels.indexOf(self); } - return self.~pos.isDefined() ? self.~pos : 0; + return __pos.get(self).isDefined() ? __pos.get(self) : 0; } diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl index 88d539c8..600e420c 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl @@ -42,7 +42,7 @@ pre { var __cacheMap = new ConcurrentMap(); var __originalMap = new ConcurrentMap(); var System = Native("java.lang.System"); - + var __pos = new ConcurrentMap(); for (container : JSL!UIViewPanelDeclaration in JSL!UIViewPanelDeclaration.all()) { if (container.isTypeOf(JSL!UIViewGroupDeclaration)) { for (member in container.members) { @@ -57,7 +57,7 @@ pre { for (visible : JSL!UIRowDeclaration in JSL!UIRowDeclaration.all()) { for (member in visible.members) { - member.~pos = visible.members.indexOf(member) + 1; + __pos.put(member, visible.members.indexOf(member) + 1); } } @@ -79,6 +79,9 @@ post { } for (group : UI!ui::NavigationItem in UI!ui::NavigationItem.all()) { + for (item in group.items) { + item.~pos = __pos.get(item); + } group.items = group.items.sortBy(e | e.~pos); } diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuLinkDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuLinkDeclaration.etl index 4e23e979..3171d920 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuLinkDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuLinkDeclaration.etl @@ -20,11 +20,11 @@ rule MenuLinkNavigationItem if (s.eContainer.isKindOf(JSL!UIMenuGroupDeclaration)) { s.eContainer.equivalent("MenuItemGroup").items.add(t); - t.~pos = s.eContainer.members.indexOf(s); + __pos.put(t, s.eContainer.members.indexOf(s)); } else { var navigationController = rootMenu.equivalent("Application").navigationController; navigationController.items.add(t); - t.~pos = s.eContainer.members.indexOf(s); + __pos.put(t, s.eContainer.members.indexOf(s)); } log.debug("MenuLinkNavigationItem: " + s.name); diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuTableDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuTableDeclaration.etl index 9d3d2569..7bd0b116 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuTableDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuTableDeclaration.etl @@ -16,11 +16,11 @@ rule MenuTableNavigationItem if (s.eContainer.isKindOf(JSL!UIMenuGroupDeclaration)) { s.eContainer.equivalent("MenuItemGroup").items.add(t); - t.~pos = s.eContainer.members.indexOf(s); + __pos.put(t, s.eContainer.members.indexOf(s)); } else { var navigationController = rootMenu.equivalent("Application").navigationController; navigationController.items.add(t); - t.~pos = s.eContainer.members.indexOf(s); + __pos.put(t, s.eContainer.members.indexOf(s)); } log.debug("MenuTableNavigationItem: " + s.name); diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuTableDeclarationAddSelectorPage.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuTableDeclarationAddSelectorPage.etl index 54a3578a..01eac9b0 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuTableDeclarationAddSelectorPage.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/menuTableDeclarationAddSelectorPage.etl @@ -125,7 +125,7 @@ rule TableAddSelectorAddActionDefinition rule TableAddSelectorVisualElement transform s: JSL!UIRowDeclaration to t: UI!ui::Flex { - t.~pos = 0; + __pos.put(t, 0); t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/TableAddSelectorVisualElement"); t.name = s.name; t.direction = UI!Axis#VERTICAL; @@ -160,7 +160,11 @@ rule TableAddSelectorTableTable t.relationName = ""; t.dataElement = s.referenceType.map.transfer.equivalent("ClassType"); t.tableActionButtonGroup = s.equivalent("TableAddSelectorTableTableButtonGroup"); - t.~pos = s.~pos; + if (__pos.get(s).isDefined()) { + __pos.put(t, pos.get(s)); + } else { + __pos.put(t, 0); + } t.showTotalCount = false; t.selectorRowsPerPage = 10; @@ -169,10 +173,6 @@ rule TableAddSelectorTableTable } else { t.rowsPerPage = 10; } - if (t.~pos.isUndefined()) { - t.~pos = 0; - } - // TODO eventually selector should work? var rowDeclaration = s.referenceType; diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/rowDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/rowDeclaration.etl index 798c1e50..97e362a1 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/rowDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/rowDeclaration.etl @@ -74,7 +74,7 @@ rule TablePageContainerBackButton rule TablePageContainerVisualElement transform s: JSL!UIRowDeclaration to t: UI!ui::Flex { - t.~pos = 0; + __pos.put(t, 0); t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/TablePageContainerVisualElement"); t.name = s.name; t.direction = UI!Axis#VERTICAL; @@ -105,8 +105,8 @@ rule TableTable t.name = s.name + "::Table"; t.dataElement = s.map.transfer.equivalent("ClassType"); t.relationName = ""; - if (t.~pos.isUndefined()) { - t.~pos = 0; + if (__pos.get(t).isUndefined()) { + __pos.put(t, 0); } var primitiveFields = s.members.select(m | m.transferField.isDefined() and m.transferField.target.referenceType.`primitive`.isDefined()); diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewDeclaration.etl index a4787d59..1fd37031 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewDeclaration.etl @@ -4,8 +4,8 @@ rule ViewPageContainer guard: rootMenu.containsVisualElement(s) and (s.form.isUndefined() or not s.form) t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/ViewPageContainer"); - if (t.~pos.isUndefined()) { - t.~pos = 0; + if (__pos.get(t).isUndefined()) { + __pos.put(t, 0); } t.name = s.getFqName() + "::View::PageContainer"; t.children.add(s.equivalent("ViewPageContainerVisualElement")); @@ -25,7 +25,7 @@ rule ViewPageContainerVisualElement to t: UI!ui::Flex { guard: rootMenu.containsVisualElement(s) and (s.form.isUndefined() or not s.form) - t.~pos = 0; + __pos.put(t, 0); t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/ViewPageContainerVisualElement"); t.name = s.name; t.direction = UI!Axis#VERTICAL; diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewDeclarationForm.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewDeclarationForm.etl index 345a824a..c0576cfe 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewDeclarationForm.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewDeclarationForm.etl @@ -4,8 +4,8 @@ rule FormPageContainer guard: rootMenu.containsVisualElement(s) and s.form.isDefined() and s.form t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/FormPageContainer"); - if (t.~pos.isUndefined()) { - t.~pos = 0; + if (__pos.get(t).isUndefined()) { + __pos.put(t, 0); } t.label = s.getLabelWithNameFallback(); t.name = s.getFqName() + "::Create::PageContainer"; @@ -27,7 +27,7 @@ rule FormPageContainerVisualElement to t: UI!ui::Flex { guard: rootMenu.containsVisualElement(s) and s.form.isDefined() and s.form - t.~pos = 0; + __pos.put(t, 0); t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/FormPageContainerVisualElement"); t.name = s.name; t.direction = UI!Axis#VERTICAL; diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewGroupDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewGroupDeclaration.etl index f0c3137d..b4353b8a 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewGroupDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewGroupDeclaration.etl @@ -17,7 +17,7 @@ rule AbstractViewGroupDeclaration } t.col = s.getWidth().isDefined() ? s.getWidth().value.asReal() : 12d; - t.~pos = s.getPos(); + __pos.put(t, s.getPos()); if (s.getOrientationModifier().isDefined()) { t.direction = s.getOrientationModifier().isVertical() ? UI!Axis#VERTICAL : UI!Axis#HORIZONTAL; diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclaration.etl index 1710e9a6..96aabe0b 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclaration.etl @@ -12,12 +12,14 @@ rule AbstractViewLinkDeclaration } t.row = 1d; t.col = s.width.isDefined() ? s.width.asReal() : 12d; - t.~pos = s.~pos; - t.isEager = s.transferRelation.target.isEager(); - if (t.~pos.isUndefined()) { - t.~pos = 0; + if (__pos.get(s).isDefined()) { + __pos.put(t, __pos.get(s)); + } else { + __pos.put(t, 0); } + t.isEager = s.transferRelation.target.isEager(); + if (t.isEager) { // TODO finish additional mask attributes /* diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclarationSetSelectorPage.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclarationSetSelectorPage.etl index 519d1593..47938eb4 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclarationSetSelectorPage.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclarationSetSelectorPage.etl @@ -45,7 +45,7 @@ rule ViewLinkDeclarationSetSelectorPageContainer rule ViewLinkDeclarationSetSelectorVisualElement transform s: JSL!UIViewLinkDeclaration to t: UI!ui::Flex { - t.~pos = 0; + __pos.put(t, 0); t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationSetSelectorVisualElement"); t.name = s.name; t.direction = UI!Axis#VERTICAL; @@ -80,7 +80,12 @@ rule ViewLinkDeclarationSetSelectorTable t.relationName = s.transferRelation.target.name; t.dataElement = s.transferRelation.target.referenceType.equivalent("ClassType"); t.tableActionButtonGroup = s.equivalent("ViewLinkDeclarationSetSelectorTableButtonGroup"); - t.~pos = s.~pos; + if (__pos.get(s).isDefined()) { + __pos.put(t, __pos.get(s)); + } else { + __pos.put(t, 0); + } + t.showTotalCount = false; t.selectorRowsPerPage = 10; @@ -89,9 +94,6 @@ rule ViewLinkDeclarationSetSelectorTable } else { t.rowsPerPage = 10; } - if (t.~pos.isUndefined()) { - t.~pos = 0; - } // TODO eventually selector should work? var targetDeclaration = s.referenceType; diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclaration.etl index afc46939..286b163f 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclaration.etl @@ -12,9 +12,10 @@ rule AbstractViewTableDeclaration } t.row = 1d; t.col = s.width.isDefined() ? s.width.asReal() : 12d; - t.~pos = s.~pos; - if (t.~pos.isUndefined()) { - t.~pos = 0; + if (__pos.get(s).isDefined()) { + __pos.put(t, __pos.get(s)); + } else { + __pos.put(t, 0); } } diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclarationAddSelectorPage.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclarationAddSelectorPage.etl index 00f1b7f5..0ed58512 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclarationAddSelectorPage.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclarationAddSelectorPage.etl @@ -123,7 +123,7 @@ rule ViewTableDeclarationAddSelectorTableAddSelectorAddActionDefinition rule ViewTableDeclarationAddSelectorTableAddSelectorVisualElement transform s: JSL!UIViewTableDeclaration to t: UI!ui::Flex { - t.~pos = 0; + __pos.put(t, 0); t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationAddSelectorTableAddSelectorVisualElement"); t.name = s.name; t.direction = UI!Axis#VERTICAL; @@ -158,7 +158,11 @@ rule ViewTableDeclarationAddSelectorTableTable t.relationName = s.transferRelation.target.name; t.dataElement = s.referenceType.map.transfer.equivalent("ClassType"); t.tableActionButtonGroup = s.equivalent("ViewTableDeclarationAddSelectorTableTableButtonGroup"); - t.~pos = s.~pos; + if (__pos.get(s).isDefined()) { + __pos.put(t, __pos.get(s)); + } else { + __pos.put(t, 0); + } t.showTotalCount = false; t.selectorRowsPerPage = 10; @@ -167,9 +171,6 @@ rule ViewTableDeclarationAddSelectorTableTable } else { t.rowsPerPage = 10; } - if (t.~pos.isUndefined()) { - t.~pos = 0; - } // TODO eventually selector should work? var rowDeclaration = s.getSelectorTableModifier().row; diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTabsDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTabsDeclaration.etl index 3f96aeb3..c5ffa1de 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTabsDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTabsDeclaration.etl @@ -5,7 +5,7 @@ rule TabBarVisualElement t.setId(rootMenu.name + "/(jsl/" + s.getId() + ")/TabBarVisualElement"); t.name = s.name; - t.~pos = s.getPos(); + __pos.put(t, s.getPos()); t.col = s.getWidth().isDefined() ? s.getWidth().value.asReal() : 12d; t.label = s.getLabelWithNameFallback(); if (s.getIconModifier().isDefined()) { diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewWidgetDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewWidgetDeclaration.etl index 2952258c..baf6281d 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewWidgetDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewWidgetDeclaration.etl @@ -22,7 +22,7 @@ rule AbstractViewWidgetDeclaration t.~pos = s.~pos.isDefined() ? s.~pos : 0; } */ - t.~pos = s.getPos(); + __pos.put(t, s.getPos()); } @lazy From 37ae8aa570836b1e3486b76a54b3cb8bf8857b56 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Fri, 8 Nov 2024 04:12:54 +0100 Subject: [PATCH 06/12] Fix cache / parallel [skip ci] --- .../java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java | 7 +++++++ .../hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java | 1 + 2 files changed, 8 insertions(+) diff --git a/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java b/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java index 5ba726e1..ae7305d8 100644 --- a/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java +++ b/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java @@ -162,6 +162,10 @@ public static class Jsl2PsmParameter { @NonNull Boolean generateBehaviours = false; + @Builder.Default + @NonNull + Boolean useCahe = false; + } @@ -190,12 +194,15 @@ public static Jsl2PsmTransformationTrace executeJsl2PsmTransformation(Jsl2PsmPar .log(log) .name("JSL") .resource(parameter.jslModel.getResource()) + .useCache(parameter.useCahe) .build() ) .add(wrappedEmfModelContextBuilder() .log(log) .name("JUDOPSM") .resource(parameter.psmModel.getResource()) + .validateModel(false) + .useCache(false) .build() ) .build() diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java index bcc7c616..c0758bf2 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java @@ -158,6 +158,7 @@ protected void transform() throws Exception { .log(slf4jlog) .jslModel(jslModel) .psmModel(psmModel) + .parallel(true) .generateBehaviours(generateBehaviours()) .createTrace(true))); From d933101df51aa2f20f55b649485c4606686ab406 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Mon, 11 Nov 2024 02:04:14 +0100 Subject: [PATCH 07/12] Fixes --- .../tatami/jsl/workflow/AbstractTatamiPipelineWorkflow.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/judo-tatami-jsl-workflow/src/main/java/hu/blackbelt/judo/tatami/jsl/workflow/AbstractTatamiPipelineWorkflow.java b/judo-tatami-jsl-workflow/src/main/java/hu/blackbelt/judo/tatami/jsl/workflow/AbstractTatamiPipelineWorkflow.java index c4232f2e..a3003f00 100644 --- a/judo-tatami-jsl-workflow/src/main/java/hu/blackbelt/judo/tatami/jsl/workflow/AbstractTatamiPipelineWorkflow.java +++ b/judo-tatami-jsl-workflow/src/main/java/hu/blackbelt/judo/tatami/jsl/workflow/AbstractTatamiPipelineWorkflow.java @@ -97,6 +97,8 @@ public WorkReport startDefaultWorkflow() { .createSimpleName(parameters.getRdbmsCreateSimpleName()) .nameSize(parameters.getRdbmsNameSize()) .shortNameSize(parameters.getRdbmsShortNameSize()) + .tableNameMaxSize(parameters.getRdbmsTableNameMaxSize()) + .columnMaxNameSize(parameters.getRdbmsColumnMaxNameSize()) .tablePrefix(parameters.getRdbmsTablePrefix()) .columnPrefix(parameters.getRdbmsColumnPrefix()) .foreignKeyPrefix(parameters.getRdbmsForeignKeyPrefix()) From 10b6a38b6cf2e162539a162b92fd44d78ebffae6 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Mon, 25 Nov 2024 04:28:09 +0100 Subject: [PATCH 08/12] Fixing tests --- .../operations/equivalentDiscriminated.eol | 2 +- .../epsilon/transformations/psm/jslToPsm.etl | 8 ++--- .../judo/tatami/jsl/jsl2psm/Jsl2Psm.java | 18 ++++++------ .../judo/tatami/jsl/jsl2psm/AbstractTest.java | 3 +- .../jsl2psm/TransformationParametersTest.java | 29 ------------------- .../jsl2psm/actor/JslModel2PsmActorTest.java | 1 - .../actor/JslModel2PsmAnonymousActorTest.java | 1 - ...ivedDeclaration2PrimitiveAccessorTest.java | 2 -- ...EntityDerivedRelation2PsmRelationTest.java | 2 -- .../JslEntityDerivedWithParametersTest.java | 2 -- .../JslExpressionToJqlExpressionTest.java | 2 -- ...slEntityDeclaration2PsmEntityTypeTest.java | 4 --- ...DefaultValue2PsmPrimitiveAccessorTest.java | 3 -- ...tyRelationDeclaration2PsmRelationTest.java | 5 ---- ...ion2PsmUnmappedTransferObjectTypeTest.java | 2 -- .../JslInstanceFunctionTranslationTest.java | 2 -- .../JslMultipleJslModelImportTest.java | 4 +-- .../JslNamespace2PsmNamespaceTest.java | 2 -- .../operation/JslAction2PsmOperationTest.java | 1 - .../JslModel2PsmCrudBehaviourTest.java | 1 - ...tion2PsmDefaultTransferObjectTypeTest.java | 3 -- ...anferObject2PsmTransferObjectTypeTest.java | 4 --- ...jectChoices2PsmTransferObjectTypeTest.java | 1 - ...Constructor2PsmTransferObjectTypeTest.java | 3 -- ...anferObject2PsmTransferObjectTypeTest.java | 3 -- ...naryTypeDeclaration2PsmBinaryTypeTest.java | 8 ----- ...eanTypeDeclaration2PsmBooleanTypeTest.java | 10 ------- .../JslDateDeclaration2PsmDateTypeTest.java | 10 ------- ...numDeclaration2PsmEnumerationTypeTest.java | 10 ------- ...ricTypeDeclaration2PsmNumericTypeTest.java | 10 ------- ...ringTypeDeclaration2PsmStringTypeTest.java | 10 ------- ...slTimeTypeDeclaration2PsmTimeTypeTest.java | 10 ------- ...pTypeDeclaration2PsmTimestampTypeTest.java | 10 ------- 33 files changed, 18 insertions(+), 168 deletions(-) diff --git a/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/equivalentDiscriminated.eol b/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/equivalentDiscriminated.eol index fd3f1fdd..a974a7f6 100644 --- a/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/equivalentDiscriminated.eol +++ b/judo-tatami-jsl-jsl2psm/src/main/epsilon/operations/equivalentDiscriminated.eol @@ -3,7 +3,7 @@ operation Any equivalentDiscriminated(transformation : String, id : String, disc throw "Transformation called in empty object: " + id + " / " + discriminator + " Transformation: " + transformation; } var targetId = id + "/(discriminator/" + discriminator + ")"; - var r = JSL.target.resource; + var r = JSL.resource; // Find the discriminated id in cahe first var f = __cacheMap.get(targetId); diff --git a/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/jslToPsm.etl b/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/jslToPsm.etl index 45a4849a..9b60b6bc 100644 --- a/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/jslToPsm.etl +++ b/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/jslToPsm.etl @@ -52,13 +52,13 @@ pre { var __cacheMap = new ConcurrentMap(); var __originalMap = new ConcurrentMap(); - JUDOPSM.target.resource.contents.add(defaultModelName.equivalent("CreateRootModel")); + JUDOPSM.resource.contents.add(defaultModelName.equivalent("CreateRootModel")); } post { - for (c in JUDOPSM!Cardinality.all()) { - c.setId(c.eContainer.getId()+"/cardinality"); - } + //for (c in JUDOPSM!Cardinality.all()) { + // c.setId(c.eContainer.getId()+"/cardinality"); + //} // Collect primitive types which are not directly referenced as field types for (c in JSL!NavigationBaseDeclarationReference.all().select(n | n.reference.isKindOf(JSL!PrimitiveDeclaration))) { diff --git a/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java b/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java index ae7305d8..1317b165 100644 --- a/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java +++ b/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java @@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableMap; import hu.blackbelt.epsilon.runtime.execution.ExecutionContext; import hu.blackbelt.epsilon.runtime.execution.ExecutionContext.ExecutionContextBuilder; +import hu.blackbelt.epsilon.runtime.execution.model.emf.WrappedEmfModelContext; import org.slf4j.Logger; import hu.blackbelt.epsilon.runtime.execution.api.ModelContext; import hu.blackbelt.epsilon.runtime.execution.contexts.EtlExecutionContext; @@ -45,9 +46,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import static hu.blackbelt.epsilon.runtime.execution.ExecutionContext.executionContextBuilder; -import static hu.blackbelt.epsilon.runtime.execution.contexts.EtlExecutionContext.etlExecutionContextBuilder; -import static hu.blackbelt.epsilon.runtime.execution.model.emf.WrappedEmfModelContext.wrappedEmfModelContextBuilder; import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext; import static hu.blackbelt.judo.tatami.jsl.jsl2psm.Jsl2PsmTransformationTrace.JSL_2_PSM_URI_POSTFIX; import static hu.blackbelt.judo.tatami.jsl.jsl2psm.Jsl2PsmTransformationTrace.resolveJsl2PsmTrace; @@ -164,7 +162,7 @@ public static class Jsl2PsmParameter { @Builder.Default @NonNull - Boolean useCahe = false; + Boolean useCache = true; } @@ -185,19 +183,20 @@ public static Jsl2PsmTransformationTrace executeJsl2PsmTransformation(Jsl2PsmPar EtlExecutionContext etlExecutionContext; try { // Execution context - ExecutionContextBuilder executionContextBuilder = executionContextBuilder(); + ExecutionContextBuilder executionContextBuilder = ExecutionContext.executionContextBuilder(); ExecutionContext executionContext = executionContextBuilder .log(log) + .parallel(true) .modelContexts(ImmutableList.builder() - .add(wrappedEmfModelContextBuilder() + .add(WrappedEmfModelContext.wrappedEmfModelContextBuilder() .log(log) .name("JSL") .resource(parameter.jslModel.getResource()) - .useCache(parameter.useCahe) + .useCache(parameter.useCache) .build() ) - .add(wrappedEmfModelContextBuilder() + .add(WrappedEmfModelContext.wrappedEmfModelContextBuilder() .log(log) .name("JUDOPSM") .resource(parameter.psmModel.getResource()) @@ -234,12 +233,13 @@ public static Jsl2PsmTransformationTrace executeJsl2PsmTransformation(Jsl2PsmPar .put("ecoreUtil", new EcoreUtil()) .put("jslUtils", new JslDslModelExtension()) .put("psmUtils", new PsmUtils(parameter.psmModel.getResourceSet())).build()) + .useCache(parameter.useCache) .build(); // run the model / metadata loading executionContext.load(); - etlExecutionContext = etlExecutionContextBuilder() + etlExecutionContext = EtlExecutionContext.etlExecutionContextBuilder() .source(UriUtil.resolve("jslToPsm.etl", parameter.scriptUri)) .parallel(parameter.parallel) .build(); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java index c0758bf2..aabf33a2 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java @@ -158,7 +158,8 @@ protected void transform() throws Exception { .log(slf4jlog) .jslModel(jslModel) .psmModel(psmModel) - .parallel(true) +// .parallel(true) +// .useCache(true) .generateBehaviours(generateBehaviours()) .createTrace(true))); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/TransformationParametersTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/TransformationParametersTest.java index ea6f4575..0532ede2 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/TransformationParametersTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/TransformationParametersTest.java @@ -97,10 +97,7 @@ public Jsl2PsmParameterBuilder addTransformationParameters(String testName, Jsl2 @Test void testNoDefaultTransferObject() throws Exception { - testName = "TestNoDefaultTransferObject"; - jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "entity T {\n" + @@ -116,10 +113,8 @@ void testNoDefaultTransferObject() throws Exception { @Test void testEntityPrefix() throws Exception { - testName = "TestEntityPrefix"; jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "entity T {\n" + @@ -136,10 +131,8 @@ void testEntityPrefix() throws Exception { @Test void testEntityPostfix() throws Exception { - testName = "TestEntityPostfix"; jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "entity T {\n" + @@ -157,10 +150,8 @@ void testEntityPostfix() throws Exception { @Test void testTransferObjectPrefix() throws Exception { - testName = "TestTransferObjectPrefix"; jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "entity T {\n" + @@ -177,10 +168,8 @@ void testTransferObjectPrefix() throws Exception { @Test void testTransferObjectPostfix() throws Exception { - testName = "TestTransferObjectPostfix"; jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "entity T {\n" + @@ -197,10 +186,7 @@ void testTransferObjectPostfix() throws Exception { @Test void testDefaultDefaultNamePrefix() throws Exception { - testName = "TestDefaultDefaultNamePrefix"; - jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "type string String min-size:0 max-size:32;\n" + @@ -221,10 +207,7 @@ void testDefaultDefaultNamePrefix() throws Exception { @Test void testDefaultDefaultNameMidfix() throws Exception { - testName = "TestDefaultDefaultNameMidfix"; - jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "type string String min-size:0 max-size:32;\n" + @@ -245,10 +228,7 @@ void testDefaultDefaultNameMidfix() throws Exception { @Test void testDefaultDefaultNamePostfix() throws Exception { - testName = "TestDefaultDefaultNamePostfix"; - jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "type string String min-size:0 max-size:32;\n" + @@ -269,10 +249,7 @@ void testDefaultDefaultNamePostfix() throws Exception { @Test void testDefaultReadsNamePrefix() throws Exception { - testName = "TestDefaultReadsNamePrefix"; - jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "type string String min-size:0 max-size:32;\n" + @@ -296,10 +273,7 @@ void testDefaultReadsNamePrefix() throws Exception { @Test void testDefaultReadsNameMidfix() throws Exception { - testName = "TestDefaultReadsNameMidfix"; - jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "type string String min-size:0 max-size:32;\n" + @@ -322,10 +296,7 @@ void testDefaultReadsNameMidfix() throws Exception { @Test void testDefaultReadsNamePostfix() throws Exception { - testName = "TestDefaultReadsNamePostfix"; - jslModel = JslParser.getModelFromStrings( - "Test", List.of("model Test;\n" + "\n" + "type string String min-size:0 max-size:32;\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/actor/JslModel2PsmActorTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/actor/JslModel2PsmActorTest.java index 254d1426..1cfb190f 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/actor/JslModel2PsmActorTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/actor/JslModel2PsmActorTest.java @@ -82,7 +82,6 @@ static void prepareTestFolders() throws IOException { void testActors() throws Exception { jslModel = JslParser.getModelFromFiles( - "ActorTestModel", List.of(new File("src/test/resources/actor/ActorTestModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/actor/JslModel2PsmAnonymousActorTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/actor/JslModel2PsmAnonymousActorTest.java index 987dd474..d432be13 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/actor/JslModel2PsmAnonymousActorTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/actor/JslModel2PsmAnonymousActorTest.java @@ -80,7 +80,6 @@ static void prepareTestFolders() throws IOException { void testActors() throws Exception { jslModel = JslParser.getModelFromFiles( - "AnonymousActorTestModel", List.of(new File("src/test/resources/actor/AnonymousActorTestModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedDeclaration2PrimitiveAccessorTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedDeclaration2PrimitiveAccessorTest.java index f14f88cf..2fb369b8 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedDeclaration2PrimitiveAccessorTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedDeclaration2PrimitiveAccessorTest.java @@ -65,10 +65,8 @@ static void prepareTestFolders() throws IOException { @Test void testPrimitiveDerivedDeclarationModel() throws Exception { - testName = "TestPrimitiveDerivedDeclarationModel"; jslModel = JslParser.getModelFromStrings( - "PrimitiveDerivedDeclarationModel", List.of("model PrimitiveDerivedDeclarationModel;\n" + "\n" + "type numeric Integer precision:9 scale:0;\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedRelation2PsmRelationTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedRelation2PsmRelationTest.java index 502d8ec5..ae63421e 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedRelation2PsmRelationTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedRelation2PsmRelationTest.java @@ -66,10 +66,8 @@ static void prepareTestFolders() throws IOException { @Test void testDerivedRelationDeclarationModel() throws Exception { - testName = "TestDerivedRelationModel"; jslModel = JslParser.getModelFromFiles( - "DerivedRelationModel", List.of(new File("src/test/resources/derived/TestDerivedRelationModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedWithParametersTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedWithParametersTest.java index 769ffcc0..e448a6ae 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedWithParametersTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslEntityDerivedWithParametersTest.java @@ -68,10 +68,8 @@ static void prepareTestFolders() throws IOException { @Test void testEntityDerivedWithParametersTest() throws Exception { - testName = "TestEntityDerivedWithParametersTest"; jslModel = JslParser.getModelFromFiles( - "TestDerivedWithParameters", List.of(new File("src/test/resources/derived/TestDerivedWithParametersModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslExpressionToJqlExpressionTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslExpressionToJqlExpressionTest.java index a8b9d89c..0d07b7dc 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslExpressionToJqlExpressionTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslExpressionToJqlExpressionTest.java @@ -66,10 +66,8 @@ static void prepareTestFolders() throws IOException { @Test void testDerivedExpressionModel() throws Exception { - testName = "TestDerivedExpressionModel"; jslModel = JslParser.getModelFromFiles( - "TestDerivedExpressionModel", List.of(new File("src/test/resources/derived/TestDerivedExpressionModel.jsl"), new File("src/test/resources/derived/TestDerivedExpressionModelInherited.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityDeclaration2PsmEntityTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityDeclaration2PsmEntityTypeTest.java index 64569021..9c2ebc21 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityDeclaration2PsmEntityTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityDeclaration2PsmEntityTypeTest.java @@ -70,10 +70,8 @@ static void prepareTestFolders() throws IOException { @Test void testCreateEntityType() throws Exception { - testName = "TestCreateEntityType"; jslModel = JslParser.getModelFromStrings( - "EntityTypeCreateModel", List.of("model EntityTypeCreateModel;\n" + "\n" + "entity Test {\n" + @@ -104,10 +102,8 @@ void testCreateEntityType() throws Exception { @Test void testEntityLocalName() throws Exception { - testName = "TestEntityLocaleName"; jslModel = JslParser.getModelFromStrings( - "First::Second::EntityLocaleNameModel", List.of("model First::Second::EntityLocaleNameModel;\n" + "\n" + "entity Test {\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityDefaultValue2PsmPrimitiveAccessorTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityDefaultValue2PsmPrimitiveAccessorTest.java index f592357e..57371870 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityDefaultValue2PsmPrimitiveAccessorTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityDefaultValue2PsmPrimitiveAccessorTest.java @@ -69,10 +69,7 @@ static void prepareTestFolders() throws IOException { @Test void testDefaultValues() throws Exception { - testName = "TestDefaultValues"; - jslModel = JslParser.getModelFromFiles( - "TestDefaultExpressionModel", List.of(new File("src/test/resources/entity/TestDefaultExpressionModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityRelationDeclaration2PsmRelationTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityRelationDeclaration2PsmRelationTest.java index fe079e53..ce881689 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityRelationDeclaration2PsmRelationTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/entity/JslEntityRelationDeclaration2PsmRelationTest.java @@ -72,10 +72,8 @@ static void prepareTestFolders() throws IOException { @Test void testEntityUnidirectionalCompositionRelationType() throws Exception { - testName = "TestEntityUnidirectionalCompositionRelationType"; jslModel = JslParser.getModelFromStrings( - "EntityUnidirectionalCompositionRelationTypeModel", List.of("model EntityUnidirectionalCompositionRelationTypeModel;\n" + "\n" + "entity SalesPerson {\n" + @@ -127,10 +125,8 @@ void testEntityUnidirectionalCompositionRelationType() throws Exception { @Test void testEntityUnidirectionalCompositionInheritedRelationType() throws Exception { - testName = "TestEntityUnidirectionalCompositionInheritedRelationType"; jslModel = JslParser.getModelFromStrings( - "EntityUnidirectionalCompositionInheritedRelationTypeModel", List.of("model EntityUnidirectionalCompositionInheritedRelationTypeModel;\n" + "\n" + "entity SalesPerson {\n" + @@ -184,7 +180,6 @@ void testEntityUnidirectionalCompositionInheritedRelationType() throws Exception @Test void testEntityAsssociationRelation() throws Exception { - testName = "AssociationRelationTest"; jslModel = JslParser.getModelFromFiles( "AssociationRelationTestModel", diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/error/JslErrorDeclaration2PsmUnmappedTransferObjectTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/error/JslErrorDeclaration2PsmUnmappedTransferObjectTypeTest.java index 8aac0543..827b8319 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/error/JslErrorDeclaration2PsmUnmappedTransferObjectTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/error/JslErrorDeclaration2PsmUnmappedTransferObjectTypeTest.java @@ -67,10 +67,8 @@ static void prepareTestFolders() throws IOException { @Test void testCreateErrorType() throws Exception { - testName = "ErrorTypeCreateModel"; jslModel = JslParser.getModelFromFiles( - "ErrorTypeCreateModel", List.of(new File("src/test/resources/error/ErrorTestModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/functions/JslInstanceFunctionTranslationTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/functions/JslInstanceFunctionTranslationTest.java index f8373d95..7828c42f 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/functions/JslInstanceFunctionTranslationTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/functions/JslInstanceFunctionTranslationTest.java @@ -69,10 +69,8 @@ static void prepareTestFolders() throws IOException { @Test void testInstanceFunctionTest() throws Exception { - testName = "TestInstanceFunctionModel"; jslModel = JslParser.getModelFromFiles( - "TestInstanceFunctionModel", List.of(new File("src/test/resources/function/TestInstanceFunctionModel.jsl"), new File("src/test/resources/function/ImportedTestInstanceFunctionModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/importmodel/JslMultipleJslModelImportTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/importmodel/JslMultipleJslModelImportTest.java index 7713c792..c504f53f 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/importmodel/JslMultipleJslModelImportTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/importmodel/JslMultipleJslModelImportTest.java @@ -73,9 +73,9 @@ static void prepareTestFolders() throws IOException { @Test void testImportModel() throws Exception { - testName = "TestImportModelTest"; - jslModel = JslParser.getModelFromStrings("ns2::c", ImmutableList.of( + jslModel = JslParser.getModelFromStrings("ns2::c", + ImmutableList.of( "model ns1::a;\n" + "\n" + "type string String min-size:0 max-size:32;", diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/namespace/JslNamespace2PsmNamespaceTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/namespace/JslNamespace2PsmNamespaceTest.java index 385e6dad..7e02e0aa 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/namespace/JslNamespace2PsmNamespaceTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/namespace/JslNamespace2PsmNamespaceTest.java @@ -67,10 +67,8 @@ static void prepareTestFolders() throws IOException { @Test void testCreateModel() throws Exception { - testName = "CreateModel"; jslModel = JslParser.getModelFromStrings( - "TestModel", List.of("model TestModel;")); transform(); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslAction2PsmOperationTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslAction2PsmOperationTest.java index 426154fe..171f5189 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslAction2PsmOperationTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslAction2PsmOperationTest.java @@ -81,7 +81,6 @@ static void prepareTestFolders() throws IOException { void testActions() throws Exception { jslModel = JslParser.getModelFromFiles( - "ActionsTestModel", List.of(new File("src/test/resources/operation/ActionsTestModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslModel2PsmCrudBehaviourTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslModel2PsmCrudBehaviourTest.java index de0c74f8..888f98b3 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslModel2PsmCrudBehaviourTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/operation/JslModel2PsmCrudBehaviourTest.java @@ -82,7 +82,6 @@ static void prepareTestFolders() throws IOException { void testBehaviours() throws Exception { jslModel = JslParser.getModelFromFiles( - "CrudBehaviourTestModel", List.of(new File("src/test/resources/operation/CrudBehaviourTestModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslEntityDeclaration2PsmDefaultTransferObjectTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslEntityDeclaration2PsmDefaultTransferObjectTypeTest.java index d5034f7e..aa541e19 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslEntityDeclaration2PsmDefaultTransferObjectTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslEntityDeclaration2PsmDefaultTransferObjectTypeTest.java @@ -65,11 +65,8 @@ static void prepareTestFolders() throws IOException { @Test void testCreateDefaultTransferObjectType() throws Exception { - testName = "TestCreateDefaultTransferObjectType"; - jslModel = JslParser.getModelFromFiles( - "DefaultTransferObjectTypeModel", List.of(new File("src/test/resources/transferobject/TestCreateDefaultTransferObjectTypeModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslMappedTranferObject2PsmTransferObjectTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslMappedTranferObject2PsmTransferObjectTypeTest.java index e59f84f0..779e0775 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslMappedTranferObject2PsmTransferObjectTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslMappedTranferObject2PsmTransferObjectTypeTest.java @@ -72,11 +72,7 @@ static void prepareTestFolders() throws IOException { @Test void testCreateMappedTransferObjectType() throws Exception { - testName = "TestCreateMappedTransferObjectType"; - - jslModel = JslParser.getModelFromFiles( - "MappedTransferObjectTypeModel", List.of(new File("src/test/resources/transferobject/TestCreateMappedTransferObjectTypeModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslTransferObjectChoices2PsmTransferObjectTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslTransferObjectChoices2PsmTransferObjectTypeTest.java index 1559947f..2f30219c 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslTransferObjectChoices2PsmTransferObjectTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslTransferObjectChoices2PsmTransferObjectTypeTest.java @@ -79,7 +79,6 @@ void testTransferObjectChicesModel() throws Exception { jslModel = JslParser.getModelFromFiles( - "TransferObjectChoicesModel", List.of(new File("src/test/resources/transferobject/TestTransferObjectChoicesModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslTransferObjectConstructor2PsmTransferObjectTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslTransferObjectConstructor2PsmTransferObjectTypeTest.java index 534e716f..3309824b 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslTransferObjectConstructor2PsmTransferObjectTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslTransferObjectConstructor2PsmTransferObjectTypeTest.java @@ -73,11 +73,8 @@ static void prepareTestFolders() throws IOException { @Test void testTransferObjectConstructorModel() throws Exception { - testName = "TestTransferObjectConstructor"; - jslModel = JslParser.getModelFromFiles( - "TransferObjectConstructorModel", List.of(new File("src/test/resources/transferobject/TestTransferObjectConstructorModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslUnmappedTranferObject2PsmTransferObjectTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslUnmappedTranferObject2PsmTransferObjectTypeTest.java index 034bbc63..f0ba4bc2 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslUnmappedTranferObject2PsmTransferObjectTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/transferobject/JslUnmappedTranferObject2PsmTransferObjectTypeTest.java @@ -71,11 +71,8 @@ static void prepareTestFolders() throws IOException { @Test void testCreateUnmappedTransferObjectType() throws Exception { - testName = "TestCreateUnmappedTransferObjectType"; - jslModel = JslParser.getModelFromFiles( - "UnmappedTransferObjectTypeModel", List.of(new File("src/test/resources/transferobject/TestCreateUnmappedTransferObjectTypeModel.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslBinaryTypeDeclaration2PsmBinaryTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslBinaryTypeDeclaration2PsmBinaryTypeTest.java index b990fed7..2b88b335 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslBinaryTypeDeclaration2PsmBinaryTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslBinaryTypeDeclaration2PsmBinaryTypeTest.java @@ -64,10 +64,8 @@ static void prepareTestFolders() throws IOException { @Test void testDeclaration() throws Exception { - testName = "TestDeclaration"; jslModel = JslParser.getModelFromStrings( - "DeclarationModel", List.of("model DeclarationModel;\n" + "\n" + "type binary Picture mime-type:[\"image/png\", \"image/*\"] max-file-size:1024 KiB;\n" @@ -85,10 +83,8 @@ void testDeclaration() throws Exception { @Test void testEntityMemberRequired() throws Exception { - testName = "TestEntityMemberRequired"; jslModel = JslParser.getModelFromStrings( - "EntityMemberRequiredModel", List.of("model EntityMemberRequiredModel;\n" + "\n" + "type binary Picture mime-type:[\"image/png\", \"image/*\"] max-file-size:1024 KiB;\n" + @@ -113,10 +109,8 @@ void testEntityMemberRequired() throws Exception { @Test void testEntityMemberInheritance() throws Exception { - testName = "TestEntityMemberInheritance"; jslModel = JslParser.getModelFromStrings( - "EntityMemberInheritanceModel", List.of("model EntityMemberInheritanceModel;\n" + "\n" + "type binary Picture mime-type:[\"image/png\", \"image/*\"] max-file-size:1024 KiB;\n" + @@ -143,10 +137,8 @@ void testEntityMemberInheritance() throws Exception { @Test void testEntityMemberIdentifier() throws Exception { - testName = "TestEntityMemberIdentifier"; jslModel = JslParser.getModelFromStrings( - "EntityMemberIdentifierModel", List.of("model EntityMemberIdentifierModel;\n" + "\n" + "type binary Picture mime-type : [\"image/png\", \"image/*\"] max-file-size : 1024 KiB;\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslBooleanTypeDeclaration2PsmBooleanTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslBooleanTypeDeclaration2PsmBooleanTypeTest.java index 1a3944cc..b75c4f0e 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslBooleanTypeDeclaration2PsmBooleanTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslBooleanTypeDeclaration2PsmBooleanTypeTest.java @@ -63,10 +63,8 @@ static void prepareTestFolders() throws IOException { @Test void testDeclaration() throws Exception { - testName = "TestDeclaration"; jslModel = JslParser.getModelFromStrings( - "DeclarationModel", List.of("model DeclarationModel;\n" + "\n" + "type boolean Boolean;\n" @@ -79,10 +77,8 @@ void testDeclaration() throws Exception { @Test void testEntityMember() throws Exception { - testName = "TestEntityMember"; jslModel = JslParser.getModelFromStrings( - "EntityMemberModel", List.of("model EntityMemberModel;\n" + "\n" + "type boolean Vaccinated;\n" + @@ -106,10 +102,8 @@ void testEntityMember() throws Exception { @Test void testEntityMemberRequired() throws Exception { - testName = "TestEntityMemberRequired"; jslModel = JslParser.getModelFromStrings( - "EntityMemberRequiredModel", List.of("model EntityMemberRequiredModel;\n" + "\n" + "type boolean Vaccinated;\n" + @@ -133,10 +127,8 @@ void testEntityMemberRequired() throws Exception { @Test void testEntityMemberInheritance() throws Exception { - testName = "TestEntityMemberInheritance"; jslModel = JslParser.getModelFromStrings( - "EntityMemberInheritanceModel", List.of("model EntityMemberInheritanceModel;\n" + "\n" + "type boolean Vaccinated;\n" + @@ -164,10 +156,8 @@ void testEntityMemberInheritance() throws Exception { @Test void testEntityMemberIdentifier() throws Exception { - testName = "TestEntityMemberIdentifier"; jslModel = JslParser.getModelFromStrings( - "EntityMemberIdentifierModel", List.of("model EntityMemberIdentifierModel;\n" + "\n" + "type boolean Vaccinated;\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslDateDeclaration2PsmDateTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslDateDeclaration2PsmDateTypeTest.java index 561a8131..f42638f1 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslDateDeclaration2PsmDateTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslDateDeclaration2PsmDateTypeTest.java @@ -63,10 +63,8 @@ static void prepareTestFolders() throws IOException { @Test void testDeclaration() throws Exception { - testName = "TestDeclaration"; jslModel = JslParser.getModelFromStrings( - "DeclarationModel", List.of("model DeclarationModel;\n" + "\n" + "type date Date;\n" @@ -80,10 +78,8 @@ void testDeclaration() throws Exception { @Test void testEntityMember() throws Exception { - testName = "TestEntityMember"; jslModel = JslParser.getModelFromStrings( - "EntityMemberModel", List.of("model EntityMemberModel;\n" + "\n" + "type date Date;\n" + @@ -107,10 +103,8 @@ void testEntityMember() throws Exception { @Test void testEntityMemberRequired() throws Exception { - testName = "TestEntityMemberRequired"; jslModel = JslParser.getModelFromStrings( - "EntityMemberRequiredModel", List.of("model EntityMemberRequiredModel;\n" + "\n" + "type date Date;\n" + @@ -134,10 +128,8 @@ void testEntityMemberRequired() throws Exception { @Test void testEntityMemberInheritance() throws Exception { - testName = "TestEntityMemberInheritance"; jslModel = JslParser.getModelFromStrings( - "EntityMemberInheritanceModel", List.of("model EntityMemberInheritanceModel;\n" + "\n" + "type date Date;\n" + @@ -163,10 +155,8 @@ void testEntityMemberInheritance() throws Exception { @Test void testEntityMemberIdentifier() throws Exception { - testName = "TestEntityMemberIdentifier"; jslModel = JslParser.getModelFromStrings( - "EntityMemberIdentifierModel", List.of("model EntityMemberIdentifierModel;\n" + "\n" + "type date Date;\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslEnumDeclaration2PsmEnumerationTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslEnumDeclaration2PsmEnumerationTypeTest.java index b0aaabf7..cc5ba013 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslEnumDeclaration2PsmEnumerationTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslEnumDeclaration2PsmEnumerationTypeTest.java @@ -65,10 +65,8 @@ static void prepareTestFolders() throws IOException { @Test void testDeclaration() throws Exception { - testName = "TestDeclaration"; jslModel = JslParser.getModelFromStrings( - "DeclarationModel", List.of("model DeclarationModel;\n" + "\n" + "enum LeadStatus {\n" + @@ -95,10 +93,8 @@ void testDeclaration() throws Exception { @Test void testEntityMember() throws Exception { - testName = "TestEntityMember"; jslModel = JslParser.getModelFromStrings( - "EntityMemberModel", List.of("model EntityMemberModel;\n" + "\n" + "enum LeadStatus {\n" + @@ -127,10 +123,8 @@ void testEntityMember() throws Exception { @Test void testEntityMemberRequired() throws Exception { - testName = "TestEntityMemberRequired"; jslModel = JslParser.getModelFromStrings( - "EntityMemberRequiredModel", List.of("model EntityMemberRequiredModel;\n" + "\n" + "enum LeadStatus {\n" + @@ -156,10 +150,8 @@ void testEntityMemberRequired() throws Exception { @Test void testEntityMemberInheritance() throws Exception { - testName = "TestEntityMemberInheritance"; jslModel = JslParser.getModelFromStrings( - "EntityMemberInheritanceModel", List.of("model EntityMemberInheritanceModel;\n" + "\n" + "enum LeadStatus {\n" + @@ -189,10 +181,8 @@ void testEntityMemberInheritance() throws Exception { @Test void testEntityMemberIdentifier() throws Exception { - testName = "TestEntityMemberIdentifier"; jslModel = JslParser.getModelFromStrings( - "EntityMemberIdentifierModel", List.of("model EntityMemberIdentifierModel;\n" + "\n" + "enum LeadStatus {\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslNumericTypeDeclaration2PsmNumericTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslNumericTypeDeclaration2PsmNumericTypeTest.java index 7c95bd8b..a3b0721a 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslNumericTypeDeclaration2PsmNumericTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslNumericTypeDeclaration2PsmNumericTypeTest.java @@ -63,10 +63,8 @@ static void prepareTestFolders() throws IOException { @Test void testDeclaration() throws Exception { - testName = "TestDeclaration"; jslModel = JslParser.getModelFromStrings( - "DeclarationModel", List.of("model DeclarationModel;\n" + "\n" + "type numeric MyNumber precision:12 scale:5;\n" @@ -82,10 +80,8 @@ void testDeclaration() throws Exception { @Test void testEntityMember() throws Exception { - testName = "TestEntityMember"; jslModel = JslParser.getModelFromStrings( - "EntityMemberModel", List.of("model EntityMemberModel;\n" + "\n" + "type numeric Height precision:3 scale:0;\n" + @@ -109,10 +105,8 @@ void testEntityMember() throws Exception { @Test void testEntityMemberRequired() throws Exception { - testName = "TestEntityMemberRequired"; jslModel = JslParser.getModelFromStrings( - "EntityMemberRequiredModel", List.of("model EntityMemberRequiredModel;\n" + "\n" + "type numeric Height precision:3 scale:0;\n" + @@ -136,10 +130,8 @@ void testEntityMemberRequired() throws Exception { @Test void testEntityMemberInheritance() throws Exception { - testName = "TestEntityMemberInheritance"; jslModel = JslParser.getModelFromStrings( - "EntityMemberInheritanceModel", List.of("model EntityMemberInheritanceModel;\n" + "\n" + "type numeric Height precision:3 scale:0;\n" + @@ -166,10 +158,8 @@ void testEntityMemberInheritance() throws Exception { @Test void testEntityMemberIdentifier() throws Exception { - testName = "TestEntityMemberIdentifier"; jslModel = JslParser.getModelFromStrings( - "EntityMemberIdentifierModel", List.of("model EntityMemberIdentifierModel;\n" + "\n" + "type numeric Height precision:3 scale:0;\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslStringTypeDeclaration2PsmStringTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslStringTypeDeclaration2PsmStringTypeTest.java index c6c8203a..2cd3dcdc 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslStringTypeDeclaration2PsmStringTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslStringTypeDeclaration2PsmStringTypeTest.java @@ -63,10 +63,8 @@ static void prepareTestFolders() throws IOException { @Test void testDeclaration() throws Exception { - testName = "TestDeclaration"; jslModel = JslParser.getModelFromStrings( - "DeclarationModel", List.of("model DeclarationModel;\n" + "\n" + "type string Name min-size:0 max-size:32 regex:\"/^[a-zA-Z]+(([',. -][a-zA-Z ])?[a-zA-Z]*)*$/g\";\n" @@ -82,10 +80,8 @@ void testDeclaration() throws Exception { @Test void testEntityMember() throws Exception { - testName = "TestEntityMember"; jslModel = JslParser.getModelFromStrings( - "EntityMemberModel", List.of("model EntityMemberModel;\n" + "\n" + "type string Name min-size:0 max-size:32;\n" + @@ -109,10 +105,8 @@ void testEntityMember() throws Exception { @Test void testEntityMemberRequired() throws Exception { - testName = "TestEntityMemberRequired"; jslModel = JslParser.getModelFromStrings( - "EntityMemberRequiredModel", List.of("model EntityMemberRequiredModel;\n" + "\n" + "type string Name min-size:0 max-size:32;\n" + @@ -136,10 +130,8 @@ void testEntityMemberRequired() throws Exception { @Test void testEntityMemberInheritance() throws Exception { - testName = "TestEntityMemberInheritance"; jslModel = JslParser.getModelFromStrings( - "EntityMemberInheritanceModel", List.of("model EntityMemberInheritanceModel;\n" + "\n" + "type string Name min-size:0 max-size:32;\n" + @@ -166,10 +158,8 @@ void testEntityMemberInheritance() throws Exception { @Test void testEntityMemberIdentifier() throws Exception { - testName = "TestEntityMemberIdentifier"; jslModel = JslParser.getModelFromStrings( - "EntityMemberIdentifierModel", List.of("model EntityMemberIdentifierModel;\n" + "\n" + "type string Name min-size:0 max-size:32;\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslTimeTypeDeclaration2PsmTimeTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslTimeTypeDeclaration2PsmTimeTypeTest.java index 80835701..9e0bb3b8 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslTimeTypeDeclaration2PsmTimeTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslTimeTypeDeclaration2PsmTimeTypeTest.java @@ -63,10 +63,8 @@ static void prepareTestFolders() throws IOException { @Test void testDeclaration() throws Exception { - testName = "TestDeclaration"; jslModel = JslParser.getModelFromStrings( - "DeclarationModel", List.of("model DeclarationModel;\n" + "\n" + "type time MyTime;\n" @@ -80,10 +78,8 @@ void testDeclaration() throws Exception { @Test void testEntityMember() throws Exception { - testName = "TestEntityMember"; jslModel = JslParser.getModelFromStrings( - "EntityMemberModel", List.of("model EntityMemberModel;\n" + "\n" + "type time MyTime;\n" + @@ -107,10 +103,8 @@ void testEntityMember() throws Exception { @Test void testEntityMemberRequired() throws Exception { - testName = "TestEntityMemberRequired"; jslModel = JslParser.getModelFromStrings( - "EntityMemberRequiredModel", List.of("model EntityMemberRequiredModel;\n" + "\n" + "type time MyTime;\n" + @@ -133,10 +127,8 @@ void testEntityMemberRequired() throws Exception { @Test void testEntityMemberInheritance() throws Exception { - testName = "TestEntityMemberInheritance"; jslModel = JslParser.getModelFromStrings( - "EntityMemberInheritanceModel", List.of("model EntityMemberInheritanceModel;\n" + "\n" + "type time MyTime;\n" + @@ -162,10 +154,8 @@ void testEntityMemberInheritance() throws Exception { @Test void testEntityMemberIdentifier() throws Exception { - testName = "TestEntityMemberIdentifier"; jslModel = JslParser.getModelFromStrings( - "EntityMemberIdentifierModel", List.of("model EntityMemberIdentifierModel;\n" + "\n" + "type time MyTime;\n" + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslTimestampTypeDeclaration2PsmTimestampTypeTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslTimestampTypeDeclaration2PsmTimestampTypeTest.java index 3151f806..5c2cb9b5 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslTimestampTypeDeclaration2PsmTimestampTypeTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/type/JslTimestampTypeDeclaration2PsmTimestampTypeTest.java @@ -63,10 +63,8 @@ static void prepareTestFolders() throws IOException { @Test void testDeclaration() throws Exception { - testName = "TestDeclaration"; jslModel = JslParser.getModelFromStrings( - "DeclarationModel", List.of("model DeclarationModel;\n" + "\n" + "type timestamp Timestamp;\n" @@ -80,10 +78,8 @@ void testDeclaration() throws Exception { @Test void testEntityMember() throws Exception { - testName = "TestEntityMember"; jslModel = JslParser.getModelFromStrings( - "EntityMemberModel", List.of("model EntityMemberModel;\n" + "\n" + "type timestamp Timestamp;\n" + @@ -107,10 +103,8 @@ void testEntityMember() throws Exception { @Test void testEntityMemberRequired() throws Exception { - testName = "TestEntityMemberRequired"; jslModel = JslParser.getModelFromStrings( - "EntityMemberRequiredModel", List.of("model EntityMemberRequiredModel;\n" + "\n" + "type timestamp Timestamp;\n" + @@ -133,10 +127,8 @@ void testEntityMemberRequired() throws Exception { @Test void testEntityMemberInheritance() throws Exception { - testName = "TestEntityMemberInheritance"; jslModel = JslParser.getModelFromStrings( - "EntityMemberInheritanceModel", List.of("model EntityMemberInheritanceModel;\n" + "\n" + "type timestamp Timestamp;\n" + @@ -161,10 +153,8 @@ void testEntityMemberInheritance() throws Exception { @Test void testEntityMemberIdentifier() throws Exception { - testName = "TestEntityMemberIdentifier"; jslModel = JslParser.getModelFromStrings( - "EntityMemberIdentifierModel", List.of("model EntityMemberIdentifierModel;\n" + "\n" + "type timestamp Timestamp;\n" + From 62a2e259c732ef0457e5e91a9b7cec25e56cb349 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Tue, 26 Nov 2024 01:27:01 +0100 Subject: [PATCH 09/12] Fixing tests --- .../judo/tatami/jsl/jsl2psm/Jsl2Psm.java | 4 ++-- .../judo/tatami/jsl/jsl2psm/AbstractTest.java | 4 ++-- .../jsl2psm/TransformationParametersTest.java | 24 +++++++++---------- .../JslExpressionToJqlExpressionTest.java | 1 + .../JslInstanceFunctionTranslationTest.java | 1 + 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java b/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java index 1317b165..d237b39b 100644 --- a/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java +++ b/judo-tatami-jsl-jsl2psm/src/main/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/Jsl2Psm.java @@ -187,13 +187,13 @@ public static Jsl2PsmTransformationTrace executeJsl2PsmTransformation(Jsl2PsmPar ExecutionContext executionContext = executionContextBuilder .log(log) - .parallel(true) .modelContexts(ImmutableList.builder() .add(WrappedEmfModelContext.wrappedEmfModelContextBuilder() .log(log) .name("JSL") .resource(parameter.jslModel.getResource()) .useCache(parameter.useCache) + .validateModel(false) .build() ) .add(WrappedEmfModelContext.wrappedEmfModelContextBuilder() @@ -201,7 +201,7 @@ public static Jsl2PsmTransformationTrace executeJsl2PsmTransformation(Jsl2PsmPar .name("JUDOPSM") .resource(parameter.psmModel.getResource()) .validateModel(false) - .useCache(false) + .useCache(parameter.useCache) .build() ) .build() diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java index aabf33a2..28f5cdb9 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/AbstractTest.java @@ -158,8 +158,8 @@ protected void transform() throws Exception { .log(slf4jlog) .jslModel(jslModel) .psmModel(psmModel) -// .parallel(true) -// .useCache(true) + .parallel(true) + .useCache(true) .generateBehaviours(generateBehaviours()) .createTrace(true))); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/TransformationParametersTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/TransformationParametersTest.java index 0532ede2..ece8a52c 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/TransformationParametersTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/TransformationParametersTest.java @@ -68,28 +68,27 @@ static void prepareTestFolders() throws IOException { @Override public Jsl2PsmParameterBuilder addTransformationParameters(String testName, Jsl2PsmParameterBuilder parameters) { - - if (testName.equals("TestNoDefaultTransferObject")) { + if (testName.equals(this.getClass().getSimpleName() + ".testNoDefaultTransferObject")) { return parameters.generateDefaultTransferObject(false); - } else if (testName.equals("TestEntityPrefix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testEntityPrefix")) { return parameters.entityNamePrefix("_Entity_"); - } else if (testName.equals("TestEntityPostfix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testEntityPostfix")) { return parameters.entityNamePrefix("").entityNamePostfix("_Entity"); - } else if (testName.equals("TestTransferObjectPrefix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testTransferObjectPrefix")) { return parameters.defaultTransferObjectNamePrefix("_DefaultTransferObject"); - } else if (testName.equals("TestTransferObjectPostfix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testTransferObjectPostfix")) { return parameters.defaultTransferObjectNamePostfix("_DefaultTransferObject"); - } else if (testName.equals("TestDefaultDefaultNamePrefix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testDefaultDefaultNamePrefix")) { return parameters.defaultDefaultNamePrefix("_pre_"); - } else if (testName.equals("TestDefaultDefaultNameMidfix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testDefaultDefaultNameMidfix")) { return parameters.defaultDefaultNameMidfix("_mid_"); - } else if (testName.equals("TestDefaultDefaultNamePostfix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testDefaultDefaultNamePostfix")) { return parameters.defaultDefaultNamePostfix("_post"); - } else if (testName.equals("TestDefaultReadsNamePrefix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testDefaultReadsNamePrefix")) { return parameters.defaultReadsNamePrefix("_pre_"); - } else if (testName.equals("TestDefaultReadsNameMidfix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testDefaultReadsNameMidfix")) { return parameters.defaultReadsNameMidfix("_mid_"); - } else if (testName.equals("TestDefaultReadsNamePostfix")) { + } else if (testName.equals(this.getClass().getSimpleName() + ".testDefaultReadsNamePostfix")) { return parameters.defaultReadsNamePostfix("_post"); } return parameters; @@ -318,3 +317,4 @@ void testDefaultReadsNamePostfix() throws Exception { } } + diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslExpressionToJqlExpressionTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslExpressionToJqlExpressionTest.java index 0d07b7dc..9cd02f34 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslExpressionToJqlExpressionTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/derived/JslExpressionToJqlExpressionTest.java @@ -68,6 +68,7 @@ static void prepareTestFolders() throws IOException { void testDerivedExpressionModel() throws Exception { jslModel = JslParser.getModelFromFiles( + "TestDerivedExpressionModel", List.of(new File("src/test/resources/derived/TestDerivedExpressionModel.jsl"), new File("src/test/resources/derived/TestDerivedExpressionModelInherited.jsl")) ); diff --git a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/functions/JslInstanceFunctionTranslationTest.java b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/functions/JslInstanceFunctionTranslationTest.java index 7828c42f..42cf5393 100644 --- a/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/functions/JslInstanceFunctionTranslationTest.java +++ b/judo-tatami-jsl-jsl2psm/src/test/java/hu/blackbelt/judo/tatami/jsl/jsl2psm/functions/JslInstanceFunctionTranslationTest.java @@ -71,6 +71,7 @@ static void prepareTestFolders() throws IOException { void testInstanceFunctionTest() throws Exception { jslModel = JslParser.getModelFromFiles( + "TestInstanceFunctionModel", List.of(new File("src/test/resources/function/TestInstanceFunctionModel.jsl"), new File("src/test/resources/function/ImportedTestInstanceFunctionModel.jsl")) ); From 055f2795a9f44c8a95973b935785bcb931e2a2af Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Tue, 26 Nov 2024 03:06:10 +0100 Subject: [PATCH 10/12] JNG-5995 [Release] Updating versions --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 05ad0de5..2c932889 100644 --- a/pom.xml +++ b/pom.xml @@ -59,27 +59,27 @@ 5.5.1 3.5.1 - 1.5.1.20240414_020123_4ed0f7e3_develop + 1.5.1.20241126_013841_e14011dd_feature_JNG_5995_UpdateEclipse 3.2 3.3.0 - 1.0.3.20240925_122018_18faac23_develop - 1.0.2.20240612_080018_05e004e9_develop - 1.0.4.20240410_091349_e488ea5d_develop - 1.1.0.20241108_101226_9e56a9c2_develop - 1.3.0.20240924_131124_116febb4_develop - 1.1.4.20240414_042403_a93471de_develop - 1.0.5.20240414_043040_426cab39_develop - 1.0.2.20240414_042408_3af8577f_develop + 1.0.3.20241126_013855_3282abba_feature_JNG_5995_UpdateEclipse + 1.0.2.20241126_014638_fdca1592_feature_JNG_5995_UpdateEclipse + 1.0.4.20241126_013900_c599a469_feature_JNG_5995_UpdateEclipse + 1.1.0.20241126_014732_d77edb20_feature_JNG_5995_UpdateEclipse + 1.3.0.20241126_014641_a0d1138b_feature_JNG_5995_UpdateEclipse + 1.1.4.20241126_014654_ff7f91a6_feature_JNG_5995_UpdateEclipse + 1.0.5.20241126_015206_3381a2ad_feature_JNG_5995_UpdateEclipse + 1.0.2.20241126_014720_368d30b4_feature_JNG_5995_UpdateEclipse 1.0.4.20240411_140837_58d4ecbd_develop - 1.0.4.20240611_125218_e11f47d1_develop + 1.0.4.20241126_015345_6b135990_feature_JNG_5995_UpdateEclipse 1.0.3.20241023_175321_d8df730b_develop - 1.1.3.20241024_041531_59f25da4_develop + 1.1.3.20241126_015344_255dafa1_feature_JNG_5995_UpdateEclipse - 1.0.6.20241122_162056_bf708b50_develop - 1.1.6.20241118_041357_3ef43773_develop - 1.1.4.20241118_012712_812a8cc6_develop + 1.0.6.20241126_020121_838877e7_feature_JNG_5995_UpdateEclipse + 1.1.6.20241126_015803_bb6c8c6c_feature_JNG_5995_UpdateEclipse + 1.1.4.20241126_014110_5cd8d114_feature_JNG_5995_UpdateEclipse 3.9.1.2184 From b7c86a4976d548ebe684e9a755b1c1c11507c385 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Tue, 26 Nov 2024 03:36:03 +0100 Subject: [PATCH 11/12] Fixing script --- .../src/main/epsilon/transformations/psm/jslToPsm.etl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/jslToPsm.etl b/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/jslToPsm.etl index 9b60b6bc..e184140c 100644 --- a/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/jslToPsm.etl +++ b/judo-tatami-jsl-jsl2psm/src/main/epsilon/transformations/psm/jslToPsm.etl @@ -56,9 +56,9 @@ pre { } post { - //for (c in JUDOPSM!Cardinality.all()) { - // c.setId(c.eContainer.getId()+"/cardinality"); - //} + for (c in JUDOPSM!Cardinality.all()) { + c.setId(c.eContainer.getId()+"/cardinality"); + } // Collect primitive types which are not directly referenced as field types for (c in JSL!NavigationBaseDeclarationReference.all().select(n | n.reference.isKindOf(JSL!PrimitiveDeclaration))) { From b0223334ff0524f66abdc37a578bca3d883881ee Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Tue, 26 Nov 2024 23:17:18 +0100 Subject: [PATCH 12/12] JNG-5995 [Release] Updating versions --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 2c932889..5fb54f20 100644 --- a/pom.xml +++ b/pom.xml @@ -59,27 +59,27 @@ 5.5.1 3.5.1 - 1.5.1.20241126_013841_e14011dd_feature_JNG_5995_UpdateEclipse + 1.5.1.20241126_215218_2124427f_feature_JNG_5995_UpdateEclipse 3.2 3.3.0 - 1.0.3.20241126_013855_3282abba_feature_JNG_5995_UpdateEclipse - 1.0.2.20241126_014638_fdca1592_feature_JNG_5995_UpdateEclipse - 1.0.4.20241126_013900_c599a469_feature_JNG_5995_UpdateEclipse - 1.1.0.20241126_014732_d77edb20_feature_JNG_5995_UpdateEclipse - 1.3.0.20241126_014641_a0d1138b_feature_JNG_5995_UpdateEclipse - 1.1.4.20241126_014654_ff7f91a6_feature_JNG_5995_UpdateEclipse - 1.0.5.20241126_015206_3381a2ad_feature_JNG_5995_UpdateEclipse - 1.0.2.20241126_014720_368d30b4_feature_JNG_5995_UpdateEclipse + 1.0.3.20241126_215233_5db74392_feature_JNG_5995_UpdateEclipse + 1.0.2.20241126_215959_0cfbe0c8_feature_JNG_5995_UpdateEclipse + 1.0.4.20241126_215231_4a7cf136_feature_JNG_5995_UpdateEclipse + 1.1.0.20241126_220041_378da74b_feature_JNG_5995_UpdateEclipse + 1.3.0.20241126_220012_534c1d82_feature_JNG_5995_UpdateEclipse + 1.1.4.20241126_220023_bc4126f5_feature_JNG_5995_UpdateEclipse + 1.0.5.20241126_220238_13274e01_feature_JNG_5995_UpdateEclipse + 1.0.2.20241126_220108_a8ae4cdc_feature_JNG_5995_UpdateEclipse 1.0.4.20240411_140837_58d4ecbd_develop - 1.0.4.20241126_015345_6b135990_feature_JNG_5995_UpdateEclipse + 1.0.4.20241126_220530_7df395a2_feature_JNG_5995_UpdateEclipse 1.0.3.20241023_175321_d8df730b_develop - 1.1.3.20241126_015344_255dafa1_feature_JNG_5995_UpdateEclipse + 1.1.3.20241126_220538_defd1bad_feature_JNG_5995_UpdateEclipse - 1.0.6.20241126_020121_838877e7_feature_JNG_5995_UpdateEclipse - 1.1.6.20241126_015803_bb6c8c6c_feature_JNG_5995_UpdateEclipse - 1.1.4.20241126_014110_5cd8d114_feature_JNG_5995_UpdateEclipse + 1.0.6.20241126_221356_64152786_feature_JNG_5995_UpdateEclipse + 1.1.6.20241126_220921_4f571662_feature_JNG_5995_UpdateEclipse + 1.1.4.20241126_215435_9b076a14_feature_JNG_5995_UpdateEclipse 3.9.1.2184