From f4a126f307ba460c33be3bd1a26427965ab8d6d3 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 21 Jul 2026 14:26:13 +0200 Subject: [PATCH 01/11] test pdfexport style test --- .../table/pt1/test/Pt1TableTransformationTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java index 4dd8e2aa25..70d73c5826 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java @@ -43,6 +43,8 @@ import org.osgi.service.event.EventAdmin; import org.osgi.test.common.annotation.InjectService; import org.osgi.test.junit5.service.ServiceExtension; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test Pt1 Table transformation @@ -52,9 +54,9 @@ @TestInstance(Lifecycle.PER_CLASS) @ExtendWith(ServiceExtension.class) class Pt1TableTransformationTest extends Pt1TableTest { - private static List Ssks_Pagebreak_Column_Index = List.of("49", "76"); + private static String XSL_DIR = "res/xsl"; private static boolean compareXSLDoc(final Document actual, @@ -87,7 +89,7 @@ protected static Stream getReferenceFiles() { @InjectService EventAdmin eventAdmin; - + Logger LOGGER = LoggerFactory.getLogger(Pt1TableTransformationTest.class); @InjectService List transformationServices; @@ -99,6 +101,8 @@ void testPDFExportStyle() throws Exception { givenPlanProFile(PPHN_1_10_0_3_20220517_PLANPRO); setupTransformationService(eventAdmin); for (final PlanPro2TableTransformationService service : transformationServices) { + System.out.println("Test PDFExportStyle: " + + service.getTableNameInfo().getShortName()); final TransformTable transformTable = new TransformTable( ExportType.INVENTORY_RECORDS, service.getTableNameInfo().getShortName().toLowerCase(), From 5d482957fc24fe38b9c259dcb591458f148effe7 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 21 Jul 2026 14:38:42 +0200 Subject: [PATCH 02/11] Update --- .../set/feature/table/pt1/test/Pt1TableTransformationTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java index 70d73c5826..3b86cb0d54 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java @@ -43,8 +43,6 @@ import org.osgi.service.event.EventAdmin; import org.osgi.test.common.annotation.InjectService; import org.osgi.test.junit5.service.ServiceExtension; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test Pt1 Table transformation @@ -89,7 +87,6 @@ protected static Stream getReferenceFiles() { @InjectService EventAdmin eventAdmin; - Logger LOGGER = LoggerFactory.getLogger(Pt1TableTransformationTest.class); @InjectService List transformationServices; From 8653945bd39716a8cebe8519443c0e267e9c79de Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 21 Jul 2026 15:24:11 +0200 Subject: [PATCH 03/11] test --- .../table/pt1/test/Pt1TableTransformationTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java index 3b86cb0d54..9131af6b21 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java @@ -87,6 +87,7 @@ protected static Stream getReferenceFiles() { @InjectService EventAdmin eventAdmin; + @InjectService List transformationServices; @@ -97,9 +98,12 @@ protected static Stream getReferenceFiles() { void testPDFExportStyle() throws Exception { givenPlanProFile(PPHN_1_10_0_3_20220517_PLANPRO); setupTransformationService(eventAdmin); + System.out + .println("pdfExportStylteTest: Injected TransformationService"); + transformationServices.stream() + .map(service -> service.getTableNameInfo().getShortName()) + .forEach(name -> System.out.print(name)); for (final PlanPro2TableTransformationService service : transformationServices) { - System.out.println("Test PDFExportStyle: " - + service.getTableNameInfo().getShortName()); final TransformTable transformTable = new TransformTable( ExportType.INVENTORY_RECORDS, service.getTableNameInfo().getShortName().toLowerCase(), @@ -132,6 +136,10 @@ void testTransformator(final String file) throws Exception { setupTransformationService(eventAdmin); System.setProperty(ToolboxProperties.DEVELOPMENT_MODE, Boolean.FALSE.toString()); + System.out.println("transformatorTest: Injected TransformationService"); + transformationServices.stream() + .map(service -> service.getTableNameInfo().getShortName()) + .forEach(name -> System.out.print(name)); for (final PlanPro2TableTransformationService transformationService : transformationServices) { for (final MultiContainer_AttributeGroup container : getLSTContainer()) { // Test transformation table From 735151ea27053a3478f5e7b95599503c1fa60866 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 21 Jul 2026 15:44:00 +0200 Subject: [PATCH 04/11] test inject needed service --- .../pt1/test/Pt1TableTransformationTest.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java index 9131af6b21..d0a1dc4cfc 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java @@ -25,6 +25,9 @@ import org.eclipse.set.basis.constants.ExportType; import org.eclipse.set.basis.constants.TableType; import org.eclipse.set.core.services.enumtranslation.EnumTranslationService; +import org.eclipse.set.core.services.geometry.GeoKanteGeometryService; +import org.eclipse.set.core.services.graph.BankService; +import org.eclipse.set.core.services.graph.TopologicalGraphService; import org.eclipse.set.feature.table.PlanPro2TableTransformationService; import org.eclipse.set.feature.table.pt1.test.utils.CustomDOMReader; import org.eclipse.set.feature.table.pt1.test.utils.CustomNodeComparator; @@ -85,9 +88,17 @@ protected static Stream getReferenceFiles() { Arguments.of(SINGLE_STATE_PLAN, "zustandpphn")); } + @InjectService + BankService bankService; + @InjectService EventAdmin eventAdmin; + @InjectService + GeoKanteGeometryService geometryService; + + @InjectService + TopologicalGraphService topgrahpService; @InjectService List transformationServices; @@ -102,7 +113,7 @@ void testPDFExportStyle() throws Exception { .println("pdfExportStylteTest: Injected TransformationService"); transformationServices.stream() .map(service -> service.getTableNameInfo().getShortName()) - .forEach(name -> System.out.print(name)); + .forEach(System.out::println); for (final PlanPro2TableTransformationService service : transformationServices) { final TransformTable transformTable = new TransformTable( ExportType.INVENTORY_RECORDS, @@ -139,7 +150,7 @@ void testTransformator(final String file) throws Exception { System.out.println("transformatorTest: Injected TransformationService"); transformationServices.stream() .map(service -> service.getTableNameInfo().getShortName()) - .forEach(name -> System.out.print(name)); + .forEach(System.out::println); for (final PlanPro2TableTransformationService transformationService : transformationServices) { for (final MultiContainer_AttributeGroup container : getLSTContainer()) { // Test transformation table From ee0f0612cff60f7188cdcded41314eda5c44c460 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 21 Jul 2026 15:56:24 +0200 Subject: [PATCH 05/11] add missing dependency --- .../org.eclipse.set.feature.table.pt1.test/META-INF/MANIFEST.MF | 1 + 1 file changed, 1 insertion(+) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.feature.table.pt1.test/META-INF/MANIFEST.MF index ce6fd932e4..02e2ffa6d8 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/META-INF/MANIFEST.MF +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/META-INF/MANIFEST.MF @@ -27,6 +27,7 @@ Import-Package: com.google.common.util.concurrent, org.eclipse.set.core.services.cache, org.eclipse.set.core.services.enumtranslation, org.eclipse.set.core.services.geometry, + org.eclipse.set.core.services.graph, org.eclipse.set.model.tablemodel, org.eclipse.set.model.temporaryintegration, org.eclipse.set.ppmodel.extensions.container, From 5ae6b3cf36257ca466230cd26bae63471ebb46bc Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 21 Jul 2026 16:22:27 +0200 Subject: [PATCH 06/11] test --- .../table/pt1/test/Pt1TableTransformationTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java index d0a1dc4cfc..1349fb4c12 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java @@ -88,17 +88,17 @@ protected static Stream getReferenceFiles() { Arguments.of(SINGLE_STATE_PLAN, "zustandpphn")); } - @InjectService + @InjectService(timeout = 5000) BankService bankService; @InjectService EventAdmin eventAdmin; - - @InjectService + @InjectService(timeout = 5000) GeoKanteGeometryService geometryService; - @InjectService + @InjectService(timeout = 5000) TopologicalGraphService topgrahpService; + @InjectService List transformationServices; From a00b644e06373efa3139bc1ad74da96fc8ac6b6e Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 21 Jul 2026 16:30:52 +0200 Subject: [PATCH 07/11] test --- .../feature/table/pt1/test/Pt1TableTransformationTest.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java index 1349fb4c12..b096a558b1 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java @@ -25,8 +25,6 @@ import org.eclipse.set.basis.constants.ExportType; import org.eclipse.set.basis.constants.TableType; import org.eclipse.set.core.services.enumtranslation.EnumTranslationService; -import org.eclipse.set.core.services.geometry.GeoKanteGeometryService; -import org.eclipse.set.core.services.graph.BankService; import org.eclipse.set.core.services.graph.TopologicalGraphService; import org.eclipse.set.feature.table.PlanPro2TableTransformationService; import org.eclipse.set.feature.table.pt1.test.utils.CustomDOMReader; @@ -88,13 +86,8 @@ protected static Stream getReferenceFiles() { Arguments.of(SINGLE_STATE_PLAN, "zustandpphn")); } - @InjectService(timeout = 5000) - BankService bankService; - @InjectService EventAdmin eventAdmin; - @InjectService(timeout = 5000) - GeoKanteGeometryService geometryService; @InjectService(timeout = 5000) TopologicalGraphService topgrahpService; From 375f80efde8cbac0874141fe1541ceb3301d752d Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 21 Jul 2026 17:15:11 +0200 Subject: [PATCH 08/11] test --- .../pt1/test/Pt1TableTransformationTest.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java index b096a558b1..2c465574a2 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java @@ -25,7 +25,6 @@ import org.eclipse.set.basis.constants.ExportType; import org.eclipse.set.basis.constants.TableType; import org.eclipse.set.core.services.enumtranslation.EnumTranslationService; -import org.eclipse.set.core.services.graph.TopologicalGraphService; import org.eclipse.set.feature.table.PlanPro2TableTransformationService; import org.eclipse.set.feature.table.pt1.test.utils.CustomDOMReader; import org.eclipse.set.feature.table.pt1.test.utils.CustomNodeComparator; @@ -41,6 +40,9 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; import org.osgi.service.event.EventAdmin; import org.osgi.test.common.annotation.InjectService; import org.osgi.test.junit5.service.ServiceExtension; @@ -87,10 +89,10 @@ protected static Stream getReferenceFiles() { } @InjectService - EventAdmin eventAdmin; + BundleContext context; - @InjectService(timeout = 5000) - TopologicalGraphService topgrahpService; + @InjectService + EventAdmin eventAdmin; @InjectService List transformationServices; @@ -102,6 +104,12 @@ protected static Stream getReferenceFiles() { void testPDFExportStyle() throws Exception { givenPlanProFile(PPHN_1_10_0_3_20220517_PLANPRO); setupTransformationService(eventAdmin); + for (final Bundle b : context.getBundles()) { + System.out.println(b.getSymbolicName() + " -> " + b.getState()); + } + final ServiceReference[] refs = context.getServiceReferences((String) null, + null); + System.out.println("Registered services: " + refs.length); System.out .println("pdfExportStylteTest: Injected TransformationService"); transformationServices.stream() From 71da521288b0c5816ed29840d9bbb6947fbd796e Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Mon, 10 Aug 2026 12:10:06 +0200 Subject: [PATCH 09/11] Test --- java/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java/pom.xml b/java/pom.xml index 01d9e669f6..b6653ed1b1 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -315,6 +315,11 @@ win32 x86_64 + + linux + gtk + x86_64 + ignore From bf5714931970dc19187bb1bac7a8d4627ad6694f Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Mon, 10 Aug 2026 12:29:51 +0200 Subject: [PATCH 10/11] update feature.xml --- .../org.eclipse.set.feature/feature.xml | 2 +- .../feature.xml | 373 +++--------------- 2 files changed, 62 insertions(+), 313 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature/feature.xml b/java/bundles/org.eclipse.set.feature/feature.xml index f88dd8460f..2ef98ee2bf 100644 --- a/java/bundles/org.eclipse.set.feature/feature.xml +++ b/java/bundles/org.eclipse.set.feature/feature.xml @@ -4,7 +4,7 @@ label="Eclipse Signalling Engineering Toolbox Feature" version="2.7.0.qualifier" provider-name="Eclipse Signalling Engineering Toolbox" - os="win32"> + os="linux,win32"> Eclipse Signalling Engineering Toolbox main feature, containing the entirety of the toolbox. diff --git a/java/bundles/org.eclipse.set.i18n.nl_de.feature/feature.xml b/java/bundles/org.eclipse.set.i18n.nl_de.feature/feature.xml index ea5254c888..5477df8286 100644 --- a/java/bundles/org.eclipse.set.i18n.nl_de.feature/feature.xml +++ b/java/bundles/org.eclipse.set.i18n.nl_de.feature/feature.xml @@ -135,489 +135,238 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> - - + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> - - + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> - + version="0.0.0"/> + + \ No newline at end of file From 4e02611c17009d158aa9cb68b63307eb800d798a Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Mon, 10 Aug 2026 12:57:35 +0200 Subject: [PATCH 11/11] Update test case --- .../table/pt1/test/Pt1TableTransformationTest.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java index 2c465574a2..3c7b61cacb 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/src/org/eclipse/set/feature/table/pt1/test/Pt1TableTransformationTest.java @@ -40,9 +40,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; import org.osgi.service.event.EventAdmin; import org.osgi.test.common.annotation.InjectService; import org.osgi.test.junit5.service.ServiceExtension; @@ -88,9 +85,6 @@ protected static Stream getReferenceFiles() { Arguments.of(SINGLE_STATE_PLAN, "zustandpphn")); } - @InjectService - BundleContext context; - @InjectService EventAdmin eventAdmin; @@ -104,12 +98,6 @@ protected static Stream getReferenceFiles() { void testPDFExportStyle() throws Exception { givenPlanProFile(PPHN_1_10_0_3_20220517_PLANPRO); setupTransformationService(eventAdmin); - for (final Bundle b : context.getBundles()) { - System.out.println(b.getSymbolicName() + " -> " + b.getState()); - } - final ServiceReference[] refs = context.getServiceReferences((String) null, - null); - System.out.println("Registered services: " + refs.length); System.out .println("pdfExportStylteTest: Injected TransformationService"); transformationServices.stream()