From 17e8e9a493ccd1ca0d2a6b4e4741d2879aeeb0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 24 Jul 2026 18:16:35 +0200 Subject: [PATCH 1/2] Test date and operator. --- .../csd/converter/supplier/cdf/CAL_3_ITest.java | 13 +++++++++++++ .../csd/converter/supplier/cdf/CLASS10_ITest.java | 13 +++++++++++++ .../csd/converter/supplier/cdf/CLASSVP_ITest.java | 6 ++++++ .../csd/converter/supplier/cdf/DIONEX_ITest.java | 7 +++++++ .../csd/converter/supplier/cdf/DNX_7AN_ITest.java | 13 +++++++++++++ .../csd/converter/supplier/cdf/EXAMPLE1_ITest.java | 7 +++++++ .../csd/converter/supplier/cdf/EXAMPLE_ITest.java | 7 +++++++ .../csd/converter/supplier/cdf/PCB_ITest.java | 7 +++++++ .../converter/supplier/cdf/PK_SUM01N01_ITest.java | 13 +++++++++++++ .../csd/converter/supplier/cdf/SHIMADZU_ITest.java | 13 +++++++++++++ .../csd/converter/supplier/cdf/SHMDZU1_ITest.java | 13 +++++++++++++ .../csd/converter/supplier/cdf/SOLV001_ITest.java | 7 +++++++ .../csd/converter/supplier/cdf/TGNTHPGC_ITest.java | 13 +++++++++++++ .../converter/supplier/cdf/TGNTHPLAS_ITest.java | 13 +++++++++++++ .../csd/converter/supplier/cdf/TGNTPE41_ITest.java | 13 +++++++++++++ .../supplier/cdf/FINNIGAN_CENTSCNH_ITest.java | 6 ++++++ .../supplier/cdf/FINNIGAN_CONTINUM_ITest.java | 6 ++++++ .../supplier/cdf/FINNIGAN_LIBRARY_ITest.java | 13 +++++++++++++ .../converter/supplier/cdf/HP_CENTSCNH_ITest.java | 13 +++++++++++++ .../converter/supplier/cdf/HP_CENTSIDH_ITest.java | 13 +++++++++++++ .../supplier/cdf/KRATOS_CENTSCNH_ITest.java | 13 +++++++++++++ .../supplier/cdf/KRATOS_CENTSCNL_ITest.java | 13 +++++++++++++ .../supplier/cdf/TEKNIVNT_CONTINUM_ITest.java | 14 ++++++++++++++ .../wsd/converter/supplier/cdf/ACID_ITest.java | 13 +++++++++++++ .../wsd/converter/supplier/cdf/ICI_21_2_ITest.java | 13 +++++++++++++ .../wsd/converter/supplier/cdf/SPA_ITest.java | 6 ++++++ .../wsd/converter/supplier/cdf/VARIAN1_ITest.java | 13 +++++++++++++ .../wsd/converter/supplier/cdf/VARIAN2_ITest.java | 13 +++++++++++++ .../wsd/converter/supplier/cdf/VARIAN3_ITest.java | 13 +++++++++++++ .../wsd/converter/supplier/cdf/VARIAN4_ITest.java | 13 +++++++++++++ 30 files changed, 333 insertions(+) diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CAL_3_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CAL_3_ITest.java index ac700fba8..ccd41b2f1 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CAL_3_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CAL_3_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1992-12-25T11:58:47Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("A. Chemist", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASS10_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASS10_ITest.java index 84da311ba..9468b96e0 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASS10_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASS10_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1994-06-07T00:35:56Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("Shimadzu", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASSVP_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASSVP_ITest.java index 216aae8b7..cfb51830c 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASSVP_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASSVP_ITest.java @@ -47,6 +47,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testOperator() { + + assertEquals("DF", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DIONEX_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DIONEX_ITest.java index 61f9299b4..74a5d626a 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DIONEX_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DIONEX_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1990-04-25T23:44:59Z"), chromatogram.getDate().toInstant()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DNX_7AN_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DNX_7AN_ITest.java index ffaba4939..181c78e90 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DNX_7AN_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DNX_7AN_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1996-07-24T02:12:07Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("none", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE1_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE1_ITest.java index ab32d41fe..844a749b6 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE1_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE1_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1985-06-18T23:22:00Z"), chromatogram.getDate().toInstant()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE_ITest.java index df9969e47..c87e8ae52 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1985-06-18T23:22:00Z"), chromatogram.getDate().toInstant()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PCB_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PCB_ITest.java index 84f5d7d7a..ab291056a 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PCB_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PCB_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1986-04-02T01:45:00Z"), chromatogram.getDate().toInstant()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PK_SUM01N01_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PK_SUM01N01_ITest.java index 47aa7accb..b55a29798 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PK_SUM01N01_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PK_SUM01N01_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1990-08-06T15:42:29Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("FLD", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHIMADZU_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHIMADZU_ITest.java index 0c2179764..a5af7df34 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHIMADZU_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHIMADZU_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1988-06-17T19:25:14Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("tim", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHMDZU1_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHMDZU1_ITest.java index 3a86c4f8f..b8c9a92c7 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHMDZU1_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHMDZU1_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1988-06-17T19:25:14Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("Tim", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SOLV001_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SOLV001_ITest.java index 9645d8446..4bbbf946c 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SOLV001_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SOLV001_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1989-04-02T18:29:20Z"), chromatogram.getDate().toInstant()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTHPGC_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTHPGC_ITest.java index f592b0b07..dfb6e9e7d 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTHPGC_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTHPGC_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1997-01-28T19:56:42Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("bph", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTHPLAS_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTHPLAS_ITest.java index 901a98ca7..bee8490df 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTHPLAS_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTHPLAS_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1997-01-28T19:58:23Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("Unknown", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTPE41_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTPE41_ITest.java index 3fe655130..c070e84f1 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTPE41_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/TGNTPE41_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1997-01-28T19:54:49Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("JDJ", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CENTSCNH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CENTSCNH_ITest.java index 733b31cbe..4673835ae 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CENTSCNH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CENTSCNH_ITest.java @@ -47,6 +47,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testOperator() { + + assertEquals("Finnigan", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CONTINUM_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CONTINUM_ITest.java index 9c8c0d5ac..6b760db57 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CONTINUM_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CONTINUM_ITest.java @@ -47,6 +47,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testOperator() { + + assertEquals("iain", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_LIBRARY_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_LIBRARY_ITest.java index ff116f16d..fb732af06 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_LIBRARY_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_LIBRARY_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -49,6 +50,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1997-01-28T19:58:23Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("Unknown", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/HP_CENTSCNH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/HP_CENTSCNH_ITest.java index e7a4f686d..b552300de 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/HP_CENTSCNH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/HP_CENTSCNH_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1993-08-31T04:24:39Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("perkins", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/HP_CENTSIDH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/HP_CENTSIDH_ITest.java index e6997d985..e1125766d 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/HP_CENTSIDH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/HP_CENTSIDH_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1993-09-21T04:25:41Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("perkins", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/KRATOS_CENTSCNH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/KRATOS_CENTSCNH_ITest.java index e79147e41..9dcd20696 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/KRATOS_CENTSCNH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/KRATOS_CENTSCNH_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1993-09-09T13:41:39Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("David Anderson", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/KRATOS_CENTSCNL_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/KRATOS_CENTSCNL_ITest.java index b4aacd4d6..726371e06 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/KRATOS_CENTSCNL_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/KRATOS_CENTSCNL_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1993-09-09T13:41:55Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("David Anderson", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CONTINUM_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CONTINUM_ITest.java index 9880736f8..a2126f0b8 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CONTINUM_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CONTINUM_ITest.java @@ -12,9 +12,11 @@ *******************************************************************************/ package net.openchrom.msd.converter.supplier.cdf; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; @@ -42,6 +44,18 @@ public void setUp() { chromatogram = processingInfo.getProcessingResult(); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1997-01-28T19:58:23Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("Unknown", chromatogram.getOperator()); + } + @Test public void testLoading() { diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/ACID_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/ACID_ITest.java index ed3980ed6..f711ec5d3 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/ACID_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/ACID_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1985-04-29T22:24:14Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("Doug Miller", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/ICI_21_2_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/ICI_21_2_ITest.java index 2e4271cac..e62c8ad16 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/ICI_21_2_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/ICI_21_2_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; @@ -41,6 +42,18 @@ public void setUp() { chromatogram = processingInfo.getProcessingResult(); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1992-01-15T17:00:00Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("John Bryan Malone", chromatogram.getOperator()); + } + @Test public void testLoading() { diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/SPA_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/SPA_ITest.java index b417a197e..18981a205 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/SPA_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/SPA_ITest.java @@ -47,6 +47,12 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testOperator() { + + assertEquals("RK", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN1_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN1_ITest.java index 7b6684124..f3c8045e1 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN1_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN1_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1988-08-20T16:19:44Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("MEA", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN2_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN2_ITest.java index 2d0f1fafc..61a81e7a8 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN2_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN2_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1988-08-26T01:41:18Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("MEA", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN3_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN3_ITest.java index 177ffd0a2..2b47c7a6c 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN3_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN3_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1988-08-20T16:19:44Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("MEA", chromatogram.getOperator()); + } + @Test public void testScans() { diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN4_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN4_ITest.java index 133171695..e9b47b64b 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN4_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/VARIAN4_ITest.java @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; +import java.time.Instant; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; @@ -47,6 +48,18 @@ public void testLoading() { assertNotNull(chromatogram); } + @Test + public void testDate() { + + assertEquals(Instant.parse("1988-08-26T01:41:18Z"), chromatogram.getDate().toInstant()); + } + + @Test + public void testOperator() { + + assertEquals("MEA", chromatogram.getOperator()); + } + @Test public void testScans() { From 8177056cabf18fe2e3ca4e60b38ac2f73bafc248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 24 Jul 2026 18:20:46 +0200 Subject: [PATCH 2/2] Remove empty classes. --- .../axr/fragment/test/TestPathHelper.java | 14 ------------- .../supplier/cdf/TestPathHelper.java | 21 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/TestPathHelper.java delete mode 100644 openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/TestPathHelper.java diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/TestPathHelper.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/TestPathHelper.java deleted file mode 100644 index c761d5305..000000000 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/TestPathHelper.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2026 Lablicate GmbH. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package net.openchrom.wsd.converter.supplier.axr.fragment.test; - -public class TestPathHelper { - -} diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/TestPathHelper.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/TestPathHelper.java deleted file mode 100644 index a0662766f..000000000 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/TestPathHelper.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2024, 2026 Lablicate GmbH. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Matthias Mailänder - initial API and implementation - *******************************************************************************/ -package net.openchrom.wsd.converter.supplier.cdf; - -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; - -@TestInstance(Lifecycle.PER_CLASS) -public class TestPathHelper { - -}