From 5d4d77cff56f8c74348c6d85b11a77554e814653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 21 Aug 2026 17:04:52 +0200 Subject: [PATCH] Also test import. --- .../converter/supplier/cdf/CAL_3_ITest.java | 15 ++++---- .../converter/supplier/cdf/CLASS10_ITest.java | 17 +++++---- .../converter/supplier/cdf/CLASSVP_ITest.java | 10 ++++-- .../converter/supplier/cdf/DIONEX_ITest.java | 10 ++++-- .../converter/supplier/cdf/DNX_7AN_ITest.java | 10 ++++-- .../supplier/cdf/EXAMPLE1_ITest.java | 10 ++++-- .../converter/supplier/cdf/EXAMPLE_ITest.java | 10 ++++-- .../csd/converter/supplier/cdf/PCB_ITest.java | 10 ++++-- .../supplier/cdf/PK_SUM01N01_ITest.java | 10 ++++-- .../supplier/cdf/SHIMADZU_ITest.java | 10 ++++-- .../converter/supplier/cdf/SHMDZU1_ITest.java | 10 ++++-- .../converter/supplier/cdf/SOLV001_ITest.java | 10 ++++-- .../supplier/cdf/TGNTHPGC_ITest.java | 10 ++++-- .../supplier/cdf/TGNTHPLAS_ITest.java | 10 ++++-- .../supplier/cdf/TGNTPE41_ITest.java | 10 ++++-- .../converter/supplier/cdf/WATERS4_ITest.java | 15 ++++---- .../supplier/cdf/WAT_MS2D_ITest.java | 15 ++++---- .../gaml/fragment/test/Atlas_ITest.java | 15 ++++---- .../gaml/fragment/test/Multichrom_ITest.java | 15 ++++---- .../fragment/test/TurbochromGC_ITest.java | 15 ++++---- .../fragment/test/TurbochromLC_ITest.java | 15 ++++---- .../fragment/test/TS_AB2_FLSCAN_ITest.java | 15 ++++---- .../ChromatogramImportExport_ITest.java | 17 ++++----- .../animl/converter/StrictImport_ITest.java | 12 ++++--- ...sSpectrumImportConverter_Cattle_ITest.java | 12 ++++--- ...ssSpectrumImportConverter_Horse_ITest.java | 12 ++++--- ...assSpectrumImportConverter_Lamb_ITest.java | 12 ++++--- ...MassSpectrumImportConverter_Pig_ITest.java | 12 ++++--- .../cdf/ChromatogramImportExport_ITest.java | 35 +++++++------------ .../supplier/cdf/EXTREL_CENTSCNH_ITest.java | 15 ++++---- .../supplier/cdf/EXTREL_CENTSCNL_ITest.java | 15 ++++---- .../supplier/cdf/EXTREL_CENTSIDH_ITest.java | 15 ++++---- .../supplier/cdf/EXTREL_CENTSIDL_ITest.java | 15 ++++---- .../supplier/cdf/EXTREL_CONTINUM_ITest.java | 15 ++++---- .../supplier/cdf/EXTREL_LIBRARY_ITest.java | 15 ++++---- .../supplier/cdf/FINNIGAN_CENTSCNH_ITest.java | 15 ++++---- .../supplier/cdf/FINNIGAN_CENTSCNL_ITest.java | 8 ++--- .../supplier/cdf/FINNIGAN_CONTINUM_ITest.java | 15 ++++---- .../supplier/cdf/FINNIGAN_LIBRARY_ITest.java | 15 ++++---- .../supplier/cdf/FISONS_A_CENTSCNH_ITest.java | 15 ++++---- .../supplier/cdf/FISONS_A_CENTSCNL_ITest.java | 15 ++++---- .../supplier/cdf/FISONS_A_CENTSIDH_ITest.java | 15 ++++---- .../supplier/cdf/FISONS_A_CONTINUM_ITest.java | 15 ++++---- .../supplier/cdf/FISONS_A_LIBRARY_ITest.java | 15 ++++---- .../supplier/cdf/HP_CENTSCNH_ITest.java | 15 ++++---- .../supplier/cdf/HP_CENTSIDH_ITest.java | 15 ++++---- .../supplier/cdf/KRATOS_CENTSCNH_ITest.java | 15 ++++---- .../supplier/cdf/KRATOS_CENTSCNL_ITest.java | 15 ++++---- .../converter/supplier/cdf/NIST50_ITest.java | 15 ++++---- .../supplier/cdf/PE_SCIEX_CENTSCNH_ITest.java | 15 ++++---- .../supplier/cdf/PE_SCIEX_CENTSCNL_ITest.java | 15 ++++---- .../supplier/cdf/PE_SCIEX_CENTSIDH_ITest.java | 15 ++++---- .../supplier/cdf/PE_SCIEX_CENTSIDL_ITest.java | 15 ++++---- .../supplier/cdf/PE_SCIEX_CONTINUM_ITest.java | 15 ++++---- .../msd/converter/supplier/cdf/QD_ITest.java | 15 ++++---- .../supplier/cdf/TEKNIVNT_CENTSCNH_ITest.java | 15 ++++---- .../supplier/cdf/TEKNIVNT_CENTSCNL_ITest.java | 15 ++++---- .../supplier/cdf/TEKNIVNT_CONTINUM_ITest.java | 11 ++++-- .../cdf/io/support/DateSupport_1_Test.java | 3 -- .../converter/ImportConverter_1_ITest.java | 24 ++++++++----- .../converter/ImportConverter_2_ITest.java | 24 ++++++++----- .../converter/ImportConverter_3_ITest.java | 14 +++++--- .../converter/ImportConverter_4_ITest.java | 14 +++++--- .../converter/ImportConverter_5_ITest.java | 14 +++++--- .../converter/ReImportConverter_1_ITest.java | 16 ++++++--- .../converter/ReImportConverter_2_ITest.java | 15 +++++--- .../test/MicromassMasslynx_ITest.java | 15 ++++---- .../gaml/fragment/test/Xcalibur_ITest.java | 15 ++++---- ...MassSpectrumImportConverter_MS1_ITest.java | 10 ++++-- ...SpectrumImportConverter_MSforID_ITest.java | 10 ++++-- ...portConverter_ProteinPilot_Many_ITest.java | 10 ++++-- ...rtConverter_ProteinPilot_Single_ITest.java | 10 ++++-- ...mImportConverter_RKI_Ring_Trial_ITest.java | 11 ++++-- ...ssSpectrumImportConverter_Ecoli_ITest.java | 11 ++++-- .../ChromatogramImportConverter_ITest.java | 15 ++++---- .../ChromatogramImportConverter_ITest.java | 14 +++++--- .../ChromatogramImportConverter_ITest.java | 15 ++++---- .../fragment/test/BrukerXWinNMR1D_ITest.java | 12 ++++--- .../io/AbiPrism3100GeneticAnalyser_ITest.java | 12 +++++-- .../io/AbiPrism310GeneticAnalyser_ITest.java | 12 +++++-- .../io/AbiPrism3730GeneticAnalyser_ITest.java | 12 +++++-- .../supplier/abif/io/EmptyFile_ITest.java | 15 ++++---- .../supplier/abif/io/InvalidData_ITest.java | 9 ++--- .../ChromatogramImportExport_ITest.java | 21 ++++++----- .../axr/fragment/test/AXRImport_ITest.java | 12 ++++--- .../axr/fragment/test/AXRMissingX_ITest.java | 12 ++++--- .../fragment/test/AXRRealFileSmoke_ITest.java | 12 ++++--- .../axr/fragment/test/InvalidAXR_ITest.java | 15 ++++---- .../supplier/cdf/AAA250PM_ITest.java | 15 ++++---- .../converter/supplier/cdf/ACID_ITest.java | 15 ++++---- .../converter/supplier/cdf/HP_CH_ITest.java | 15 ++++---- .../supplier/cdf/ICI_21_2_ITest.java | 11 ++++-- .../wsd/converter/supplier/cdf/SPA_ITest.java | 15 ++++---- .../supplier/cdf/STEROIDS_ITest.java | 15 ++++---- .../converter/supplier/cdf/VARIAN1_ITest.java | 15 ++++---- .../converter/supplier/cdf/VARIAN2_ITest.java | 15 ++++---- .../converter/supplier/cdf/VARIAN3_ITest.java | 15 ++++---- .../converter/supplier/cdf/VARIAN4_ITest.java | 15 ++++---- .../converter/supplier/cdf/WAT_490_ITest.java | 8 ++--- .../supplier/cdf/WAT_9962_ITest.java | 15 ++++---- .../gaml/fragment/test/Helios_ITest.java | 8 ++--- .../gaml/fragment/test/MassLynx_ITest.java | 12 ++++--- 102 files changed, 754 insertions(+), 642 deletions(-) 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 ccd41b2f1..3bb1d19c2 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class CAL_3_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/CAL_3.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 9468b96e0..bc6fed790 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 @@ -21,31 +21,30 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class CLASS10_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Shimadzu/CLASS10.CDF");// actually LC ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - - assertNotNull(chromatogram); + assertNotNull(chromatogram); } @Test 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 cfb51830c..acd6cabcb 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 @@ -20,20 +20,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class CLASSVP_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Shimadzu/CLASSVP.CDF"); // actually LC ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 74a5d626a..218779b17 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class DIONEX_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Dionex/DIONEX.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 181c78e90..637550f9b 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class DNX_7AN_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Dionex/DNX-7AN.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 844a749b6..44a0a47ee 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EXAMPLE1_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/EXAMPLE1.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 c87e8ae52..11ab65d88 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EXAMPLE_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/EXAMPLE.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 ab291056a..035313254 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PCB_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PCB.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 b55a29798..b27ca5da9 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PK_SUM01N01_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PK-SUM01N01.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 a5af7df34..d17e4da68 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class SHIMADZU_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Shimadzu/SHIMADZU.CDF"); // optical detector ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 b8c9a92c7..426c03a48 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class SHMDZU1_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Shimadzu/SHMDZU1.CDF"); // optical detector ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 4bbbf946c..86164f83e 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class SOLV001_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PerkinElmer/SOLV001.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 dfb6e9e7d..1bcbd9532 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TGNTHPGC_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Thru-Put Systems/tgnthpgc.cdf"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 bee8490df..ef841b0c6 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TGNTHPLAS_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Thru-Put Systems/tgnthplas.cdf"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); 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 c070e84f1..bb3d70753 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 @@ -21,20 +21,24 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TGNTPE41_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Thru-Put Systems/tgntpe41.cdf"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/WATERS4_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/WATERS4_ITest.java index dc03b634e..307dd672f 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/WATERS4_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/WATERS4_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class WATERS4_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Waters/WATERS4.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/WAT_MS2D_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/WAT_MS2D_ITest.java index ec930c01a..7c093ff15 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/WAT_MS2D_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/WAT_MS2D_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class WAT_MS2D_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Waters/WAT_MS2D.CDF"); ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/Atlas_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/Atlas_ITest.java index 3b553ae19..cdcf72d33 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/Atlas_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/Atlas_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.gaml.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class Atlas_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/TLS_Atlas.gaml"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); assertEquals(14, chromatogram.getReferencedChromatograms().size()); } diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/Multichrom_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/Multichrom_ITest.java index d78d41ead..0338412b2 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/Multichrom_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/Multichrom_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.gaml.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class Multichrom_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/TLS_Multichrom.gaml"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/TurbochromGC_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/TurbochromGC_ITest.java index 6155962db..0dbfbb5d2 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/TurbochromGC_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/TurbochromGC_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.gaml.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TurbochromGC_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/PE_Turbochrom_GC.gaml"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/TurbochromLC_ITest.java b/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/TurbochromLC_ITest.java index 520ce7599..835cec48b 100644 --- a/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/TurbochromLC_ITest.java +++ b/openchrom/tests/net.openchrom.csd.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/TurbochromLC_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.csd.converter.supplier.gaml.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TurbochromLC_ITest { private IChromatogramCSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/PE_Turbochrom_LC.gaml"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.fsd.converter.supplier.gaml.fragment.test/src/net/openchrom/fsd/converter/supplier/gaml/fragment/test/TS_AB2_FLSCAN_ITest.java b/openchrom/tests/net.openchrom.fsd.converter.supplier.gaml.fragment.test/src/net/openchrom/fsd/converter/supplier/gaml/fragment/test/TS_AB2_FLSCAN_ITest.java index 112d911f1..f4eabcd36 100644 --- a/openchrom/tests/net.openchrom.fsd.converter.supplier.gaml.fragment.test/src/net/openchrom/fsd/converter/supplier/gaml/fragment/test/TS_AB2_FLSCAN_ITest.java +++ b/openchrom/tests/net.openchrom.fsd.converter.supplier.gaml.fragment.test/src/net/openchrom/fsd/converter/supplier/gaml/fragment/test/TS_AB2_FLSCAN_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.fsd.model.core.ISpectrumFSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.fsd.converter.supplier.gaml.converter.ScanImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TS_AB2_FLSCAN_ITest { private ISpectrumFSD spectrumFSD; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/TS_AB2_FLSCAN.gaml"); ScanImportConverter importConverter = new ScanImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); spectrumFSD = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(spectrumFSD); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.animl.fragment.test/src/net/openchrom/msd/converter/supplier/animl/converter/ChromatogramImportExport_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.animl.fragment.test/src/net/openchrom/msd/converter/supplier/animl/converter/ChromatogramImportExport_ITest.java index 40ca1210f..d171db7c5 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.animl.fragment.test/src/net/openchrom/msd/converter/supplier/animl/converter/ChromatogramImportExport_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.animl.fragment.test/src/net/openchrom/msd/converter/supplier/animl/converter/ChromatogramImportExport_ITest.java @@ -25,7 +25,6 @@ import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.VersionConstants; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; @@ -36,8 +35,8 @@ public class ChromatogramImportExport_ITest { private IChromatogramMSD chromatogram; private File fileExport; - @BeforeAll - public void setUp() { + @Test + public void testReimport() { /* * Import @@ -76,6 +75,10 @@ public void setUp() { for(IProcessingMessage message : processingInfo.getMessages()) { System.out.println(message.getMessage()); } + + assertNotNull(chromatogram); + assertEquals(5726, chromatogram.getNumberOfScans()); + assertEquals(72, chromatogram.getPeaks().size()); } @AfterAll @@ -83,12 +86,4 @@ public void tearDown() { fileExport.delete(); } - - @Test - public void testReimport() { - - assertNotNull(chromatogram); - assertEquals(5726, chromatogram.getNumberOfScans()); - assertEquals(72, chromatogram.getPeaks().size()); - } } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.animl.fragment.test/src/net/openchrom/msd/converter/supplier/animl/converter/StrictImport_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.animl.fragment.test/src/net/openchrom/msd/converter/supplier/animl/converter/StrictImport_ITest.java index e2a29496d..4f9e01864 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.animl.fragment.test/src/net/openchrom/msd/converter/supplier/animl/converter/StrictImport_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.animl.fragment.test/src/net/openchrom/msd/converter/supplier/animl/converter/StrictImport_ITest.java @@ -23,29 +23,33 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.support.history.IEditInformation; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class StrictImport_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/MS_STRICT.animl"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test public void testChromatogram() { - assertNotNull(chromatogram); assertEquals("Test Sample", chromatogram.getSampleName()); assertEquals("Gaston Bradford", chromatogram.getOperator()); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Cattle_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Cattle_ITest.java index ffad991e9..b21ef2c3a 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Cattle_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Cattle_ITest.java @@ -24,32 +24,36 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.btmsp.converter.model.IMainSpectraProjection; import net.openchrom.msd.converter.supplier.btmsp.converter.model.MainSpectraProjection; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_Cattle_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("data/cattle.btmsp"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test public void testBasicValidation() { - assertNotNull(massSpectra); assertFalse(massSpectra.getList().isEmpty()); IScanMSD massSpectrum = massSpectra.getList().get(0); assertEquals(70, massSpectrum.getNumberOfIons()); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Horse_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Horse_ITest.java index 759a13b48..db73b3cd7 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Horse_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Horse_ITest.java @@ -24,32 +24,36 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.btmsp.converter.model.IMainSpectraProjection; import net.openchrom.msd.converter.supplier.btmsp.converter.model.MainSpectraProjection; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_Horse_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("data/horse.btmsp"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test public void testBasicValidation() { - assertNotNull(massSpectra); assertFalse(massSpectra.getList().isEmpty()); IScanMSD massSpectrum = massSpectra.getList().get(0); assertEquals(70, massSpectrum.getNumberOfIons()); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Lamb_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Lamb_ITest.java index 0514a68eb..8edf5d12d 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Lamb_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Lamb_ITest.java @@ -24,32 +24,36 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.btmsp.converter.model.IMainSpectraProjection; import net.openchrom.msd.converter.supplier.btmsp.converter.model.MainSpectraProjection; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_Lamb_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("data/lamb.btmsp"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test public void testBasicValidation() { - assertNotNull(massSpectra); assertFalse(massSpectra.getList().isEmpty()); IScanMSD massSpectrum = massSpectra.getList().get(0); assertEquals(70, massSpectrum.getNumberOfIons()); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Pig_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Pig_ITest.java index 1936f655f..4eef98cb8 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Pig_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.btmsp.fragment.test/src/net/openchrom/msd/converter/supplier/btmsp/converter/MassSpectrumImportConverter_Pig_ITest.java @@ -24,32 +24,36 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.btmsp.converter.model.IMainSpectraProjection; import net.openchrom.msd.converter.supplier.btmsp.converter.model.MainSpectraProjection; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_Pig_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("data/pig.btmsp"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test public void testBasicValidation() { - assertNotNull(massSpectra); assertFalse(massSpectra.getList().isEmpty()); IScanMSD massSpectrum = massSpectra.getList().get(0); assertEquals(70, massSpectrum.getNumberOfIons()); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/ChromatogramImportExport_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/ChromatogramImportExport_ITest.java index 0f12da3bd..452847ab0 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/ChromatogramImportExport_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/ChromatogramImportExport_ITest.java @@ -26,20 +26,24 @@ import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.VersionConstants; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ChromatogramImportExport_ITest { private IChromatogramMSD chromatogram; private IChromatogramMSD chromatogramImport; private File fileExport; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testReImport() { /* * Import @@ -58,6 +62,7 @@ public void setUp() { File fileImport = new File("testData/Chromatogram2.ocb"); IProcessingInfo processingInfoImport = ChromatogramConverterMSD.getInstance().convert(fileImport, extensionPointImport, new NullProgressMonitor()); chromatogramImport = processingInfoImport.getProcessingResult(); + assertNotNull(chromatogramImport); for(IProcessingMessage message : processingInfoImport.getMessages()) { System.out.println(message.getMessage()); } @@ -67,6 +72,7 @@ public void setUp() { fileExport = new File(pathExport); IProcessingInfo processingInfoExport = ChromatogramConverterMSD.getInstance().convert(fileExport, chromatogramImport, extensionPointExportReimport, new NullProgressMonitor()); fileExport = processingInfoExport.getProcessingResult(); + assertTrue(fileExport.exists()); for(IProcessingMessage message : processingInfoExport.getMessages()) { System.out.println(message.getMessage()); } @@ -78,6 +84,9 @@ public void setUp() { for(IProcessingMessage message : processingInfo.getMessages()) { System.out.println(message.getMessage()); } + assertNotNull(chromatogram); + assertEquals(5726, chromatogram.getNumberOfScans()); + assertEquals(930401, chromatogram.getNumberOfScanIons()); } @AfterAll @@ -85,24 +94,4 @@ public void tearDown() { fileExport.delete(); } - - @Test - public void testImport() { - - assertNotNull(chromatogramImport); - } - - @Test - public void testExport() { - - assertTrue(fileExport.exists()); - } - - @Test - public void testReimport() { - - assertNotNull(chromatogram); - assertEquals(5726, chromatogram.getNumberOfScans()); - assertEquals(930401, chromatogram.getNumberOfScanIons()); - } } \ No newline at end of file diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSCNH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSCNH_ITest.java index 219a6244a..b00046542 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSCNH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSCNH_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EXTREL_CENTSCNH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/EXTREL/CENTSCNH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSCNL_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSCNL_ITest.java index 51bd14986..3c6b6d9bd 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSCNL_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSCNL_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EXTREL_CENTSCNL_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/EXTREL/CENTSCNL.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSIDH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSIDH_ITest.java index 1700a3520..1eda843b4 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSIDH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSIDH_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EXTREL_CENTSIDH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/EXTREL/CENTSIDH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSIDL_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSIDL_ITest.java index a37a37b96..0036721e9 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSIDL_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CENTSIDL_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EXTREL_CENTSIDL_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/EXTREL/CENTSIDL.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CONTINUM_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CONTINUM_ITest.java index 7f5fcfd43..59bb72da9 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CONTINUM_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_CONTINUM_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EXTREL_CONTINUM_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/EXTREL/CONTINUM.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_LIBRARY_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_LIBRARY_ITest.java index 38b679d11..fd52cb573 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_LIBRARY_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/EXTREL_LIBRARY_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EXTREL_LIBRARY_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/EXTREL/LIBRARY.CDF"); // TODO: detect as a library ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 4673835ae..6aca3b8e5 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 @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class FINNIGAN_CENTSCNH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/FINNIGAN/CENTSCNH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CENTSCNL_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CENTSCNL_ITest.java index 13b86445d..3252f9adb 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CENTSCNL_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FINNIGAN_CENTSCNL_ITest.java @@ -21,13 +21,16 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class FINNIGAN_CENTSCNL_ITest { private IChromatogramMSD chromatogram; @@ -39,11 +42,6 @@ public void setUp() { ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 6b760db57..37459f730 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 @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class FINNIGAN_CONTINUM_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/FINNIGAN/CONTINUM.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 fb732af06..18920aad2 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 @@ -21,32 +21,31 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) @Disabled // TODO: load as a library (no scan_acquisition_time) public class FINNIGAN_LIBRARY_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/FINNIGAN/LIBRARY.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSCNH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSCNH_ITest.java index c7cf05af6..e6f658afc 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSCNH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSCNH_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class FISONS_A_CENTSCNH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/FISONS_A/CENTSCNH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSCNL_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSCNL_ITest.java index 66d2f9776..f527b1f29 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSCNL_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSCNL_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class FISONS_A_CENTSCNL_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/FISONS_A/CENTSCNL.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSIDH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSIDH_ITest.java index 43beacae7..9ad84c130 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSIDH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CENTSIDH_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class FISONS_A_CENTSIDH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/FISONS_A/CENTSIDH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CONTINUM_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CONTINUM_ITest.java index 2dc6b5f52..9ed547dd1 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CONTINUM_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_CONTINUM_ITest.java @@ -19,32 +19,31 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @Disabled("NotEnoughScanDataStored") // TODO @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class FISONS_A_CONTINUM_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/FISONS_A/CONTINUM.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_LIBRARY_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_LIBRARY_ITest.java index c9998efd9..5d1a94af0 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_LIBRARY_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/FISONS_A_LIBRARY_ITest.java @@ -19,30 +19,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class FISONS_A_LIBRARY_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/FISONS_A/LIBRARY.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } } 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 b552300de..8ea7177e5 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class HP_CENTSCNH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/HP/CENTSCNH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 e1125766d..c7e176f9b 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class HP_CENTSIDH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/HP/CENTSIDH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 9dcd20696..3ab9e328e 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class KRATOS_CENTSCNH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/KRATOS/CENTSCNH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 726371e06..94dc52815 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class KRATOS_CENTSCNL_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/KRATOS/CENTSCNL.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/NIST50_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/NIST50_ITest.java index 02dd7c304..aa28aef5f 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/NIST50_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/NIST50_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class NIST50_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/TEST/NIST_50.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSCNH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSCNH_ITest.java index 0d6cd8394..0f3a403fb 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSCNH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSCNH_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PE_SCIEX_CENTSCNH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PE_SCIEX/CENTSCNH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSCNL_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSCNL_ITest.java index 0d4e57252..4b9c35748 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSCNL_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSCNL_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PE_SCIEX_CENTSCNL_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PE_SCIEX/CENTSCNL.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSIDH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSIDH_ITest.java index 1c4b48408..3e7e97655 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSIDH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSIDH_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PE_SCIEX_CENTSIDH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PE_SCIEX/CENTSIDH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSIDL_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSIDL_ITest.java index 999f4177a..c0375f516 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSIDL_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CENTSIDL_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PE_SCIEX_CENTSIDL_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PE_SCIEX/CENTSIDL.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CONTINUM_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CONTINUM_ITest.java index 743f3e23a..0b287df40 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CONTINUM_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/PE_SCIEX_CONTINUM_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PE_SCIEX_CONTINUM_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PE_SCIEX/CONTINUM.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/QD_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/QD_ITest.java index a162e6d87..1912e2f20 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/QD_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/QD_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class QD_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/TEST/QD.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CENTSCNH_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CENTSCNH_ITest.java index 6a3d3fc34..e4f2759b8 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CENTSCNH_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CENTSCNH_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TEKNIVNT_CENTSCNH_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/TEKNIVNT/CENTSCNH.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CENTSCNL_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CENTSCNL_ITest.java index 16b4a935e..060b0d5c5 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CENTSCNL_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/TEKNIVNT_CENTSCNL_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TEKNIVNT_CENTSCNL_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/TEKNIVNT/CENTSCNL.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 a2126f0b8..158e65278 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 @@ -21,27 +21,32 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cdf.converter.ChromatogramImportConverter; @Disabled("Fails to load.") // TODO @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TEKNIVNT_CONTINUM_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/TEKNIVNT/CONTINUM.CDF"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/io/support/DateSupport_1_Test.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/io/support/DateSupport_1_Test.java index 21c3d075c..9545243c6 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/io/support/DateSupport_1_Test.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cdf.fragment.test/src/net/openchrom/msd/converter/supplier/cdf/io/support/DateSupport_1_Test.java @@ -19,12 +19,9 @@ import java.util.TimeZone; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.util.DefaultTimeZone; @DefaultTimeZone("CET") -@TestInstance(Lifecycle.PER_CLASS) public class DateSupport_1_Test { @Test diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_1_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_1_ITest.java index 8757dd096..fc1dfd2e9 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_1_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_1_ITest.java @@ -15,6 +15,7 @@ package net.openchrom.msd.converter.supplier.cms.converter; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; @@ -24,33 +25,38 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ImportConverter_1_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File importFile = new File("testData/files/import/MassSpectra1.cms"); IDatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(importFile, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test - public void test_1() { + public void test1() { assertEquals(5, massSpectra.size()); } @Test - public void test_2() { + public void test2() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(1); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; @@ -64,7 +70,7 @@ public void test_2() { } @Test - public void test_3() { + public void test3() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(2); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; @@ -77,7 +83,7 @@ public void test_3() { } @Test - public void test_4() { + public void test4() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(3); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; @@ -89,7 +95,7 @@ public void test_4() { } @Test - public void test_5() { + public void test5() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(4); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; @@ -113,7 +119,7 @@ public void test_5() { } @Test - public void test_6() { + public void test6() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(5); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_2_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_2_ITest.java index f0c44ef9d..8b86e9e1f 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_2_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_2_ITest.java @@ -15,6 +15,7 @@ package net.openchrom.msd.converter.supplier.cms.converter; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; @@ -24,35 +25,40 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cms.model.ICalibratedVendorLibraryMassSpectrum; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ImportConverter_2_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File importFile = new File("testData/files/import/MassSpectra2.cms"); IDatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(importFile, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test - public void test_1() { + public void test1() { assertEquals(5, massSpectra.size()); } @Test - public void test_2() { + public void test2() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(1); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; @@ -76,7 +82,7 @@ public void test_2() { } @Test - public void test_3() { + public void test3() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(2); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; @@ -92,7 +98,7 @@ public void test_3() { } @Test - public void test_4() { + public void test4() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(3); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; @@ -107,7 +113,7 @@ public void test_4() { } @Test - public void test_5() { + public void test5() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(4); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; @@ -134,7 +140,7 @@ public void test_5() { } @Test - public void test_6() { + public void test6() { IScanMSD massSpectrum = massSpectra.getMassSpectrum(5); ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)massSpectrum; diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_3_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_3_ITest.java index a045fb6da..93d038d08 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_3_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_3_ITest.java @@ -15,6 +15,7 @@ package net.openchrom.msd.converter.supplier.cms.converter; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.util.List; @@ -24,30 +25,35 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cms.model.ICalibratedVendorMassSpectrum; import net.openchrom.msd.converter.supplier.cms.model.IIonMeasurement; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ImportConverter_3_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File importFile = new File("testData/files/import/MassSpectra3.cms"); IDatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(importFile, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test - public void test_1() { + public void test1() { assertEquals(1, massSpectra.size()); IScanMSD massSpectrum = massSpectra.getMassSpectrum(1); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_4_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_4_ITest.java index 9a9087f97..1d32673f1 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_4_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_4_ITest.java @@ -13,6 +13,7 @@ package net.openchrom.msd.converter.supplier.cms.converter; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.util.List; @@ -22,30 +23,35 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cms.model.ICalibratedVendorMassSpectrum; import net.openchrom.msd.converter.supplier.cms.model.IIonMeasurement; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ImportConverter_4_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File importFile = new File("testData/files/import/MassSpectra4.cms"); IDatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(importFile, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test - public void test_1() { + public void test1() { assertEquals(4, massSpectra.size()); IScanMSD massSpectrum = massSpectra.getMassSpectrum(1); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_5_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_5_ITest.java index 51f574cf2..a7291520f 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_5_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ImportConverter_5_ITest.java @@ -13,6 +13,7 @@ package net.openchrom.msd.converter.supplier.cms.converter; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.util.List; @@ -22,30 +23,35 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cms.model.ICalibratedVendorMassSpectrum; import net.openchrom.msd.converter.supplier.cms.model.IIonMeasurement; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ImportConverter_5_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File importFile = new File("testData/files/import/MassSpectra4.cms"); IDatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(importFile, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test - public void test_1() { + public void test1() { assertEquals(4, massSpectra.size()); IScanMSD massSpectrum = massSpectra.getMassSpectrum(1); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ReImportConverter_1_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ReImportConverter_1_ITest.java index b56f5fb34..0f01b724f 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ReImportConverter_1_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ReImportConverter_1_ITest.java @@ -15,6 +15,7 @@ package net.openchrom.msd.converter.supplier.cms.converter; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; @@ -25,22 +26,26 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cms.model.ICalibratedVendorLibraryMassSpectrum; import net.openchrom.msd.converter.supplier.cms.model.ICalibratedVendorMassSpectrum; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ReImportConverter_1_ITest { private IMassSpectra massSpectra1, massSpectra2; private File exportFile; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testReImport() { IDatabaseImportConverter importConverter = new DatabaseImportConverter(); IDatabaseExportConverter exportConverter = new DatabaseExportConverter(); @@ -50,6 +55,7 @@ public void setUp() { File importFile = new File("testData/files/import/MassSpectra2.cms"); IProcessingInfo processingInfoImport = importConverter.convert(importFile, new NullProgressMonitor()); massSpectra1 = processingInfoImport.getProcessingResult(); + assertNotNull(massSpectra1); /* * Export */ @@ -62,7 +68,7 @@ public void setUp() { File reImportFile = new File(exportFolder, File.separator + "MassSpectraExport1.CMS"); IProcessingInfo processingInfoReImport = importConverter.convert(reImportFile, new NullProgressMonitor()); massSpectra2 = processingInfoReImport.getProcessingResult(); - + assertNotNull(massSpectra2); } @AfterAll @@ -75,7 +81,7 @@ public void tearDown() { } @Test - public void test_1() { + public void test1() { assertEquals(massSpectra1.size(), massSpectra2.size()); for(int i = 1; i <= massSpectra1.size(); i++) { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ReImportConverter_2_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ReImportConverter_2_ITest.java index f22b64867..45bd87c3b 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ReImportConverter_2_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.cms.fragment.test/src/net/openchrom/msd/converter/supplier/cms/converter/ReImportConverter_2_ITest.java @@ -14,6 +14,7 @@ package net.openchrom.msd.converter.supplier.cms.converter; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; @@ -24,22 +25,26 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.cms.model.ICalibratedVendorLibraryMassSpectrum; import net.openchrom.msd.converter.supplier.cms.model.ICalibratedVendorMassSpectrum; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ReImportConverter_2_ITest { private IMassSpectra massSpectra1, massSpectra2; private File exportFile; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testReImport() { IDatabaseImportConverter importConverter = new DatabaseImportConverter(); IDatabaseExportConverter exportConverter = new DatabaseExportConverter(); @@ -49,6 +54,7 @@ public void setUp() { File importFile = new File("testData/files/import/MassSpectra5.cms"); IProcessingInfo processingInfoImport = importConverter.convert(importFile, new NullProgressMonitor()); massSpectra1 = processingInfoImport.getProcessingResult(); + assertNotNull(massSpectra1); // calculate and subtract signal zero offset for(IScanMSD spectrum : massSpectra1.getList()) { if(spectrum instanceof ICalibratedVendorMassSpectrum calibratedVendorMassSpectrum) { @@ -70,6 +76,7 @@ public void setUp() { File reImportFile = new File(exportFolder, File.separator + "MassSpectraExport2.CMS"); IProcessingInfo processingInfoReImport = importConverter.convert(reImportFile, new NullProgressMonitor()); massSpectra2 = processingInfoReImport.getProcessingResult(); + assertNotNull(massSpectra2); } @AfterAll @@ -82,7 +89,7 @@ public void tearDown() { } @Test - public void test_1() { + public void test1() { assertEquals(massSpectra1.size(), massSpectra2.size()); for(int i = 1; i <= massSpectra1.size(); i++) { diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.gaml.fragment.test/src/net/openchrom/msd/converter/supplier/gaml/fragment/test/MicromassMasslynx_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.gaml.fragment.test/src/net/openchrom/msd/converter/supplier/gaml/fragment/test/MicromassMasslynx_ITest.java index d0426c1cb..2fa48e4c6 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.gaml.fragment.test/src/net/openchrom/msd/converter/supplier/gaml/fragment/test/MicromassMasslynx_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.gaml.fragment.test/src/net/openchrom/msd/converter/supplier/gaml/fragment/test/MicromassMasslynx_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.gaml.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MicromassMasslynx_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/Micromass_Masslynx.gaml"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.gaml.fragment.test/src/net/openchrom/msd/converter/supplier/gaml/fragment/test/Xcalibur_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.gaml.fragment.test/src/net/openchrom/msd/converter/supplier/gaml/fragment/test/Xcalibur_ITest.java index c5e97546d..9e882a660 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.gaml.fragment.test/src/net/openchrom/msd/converter/supplier/gaml/fragment/test/Xcalibur_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.gaml.fragment.test/src/net/openchrom/msd/converter/supplier/gaml/fragment/test/Xcalibur_ITest.java @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.gaml.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class Xcalibur_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/TF_Xcalibur.gaml"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_MS1_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_MS1_ITest.java index 69d3e7bb4..c17685612 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_MS1_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_MS1_ITest.java @@ -21,18 +21,22 @@ import org.eclipse.chemclipse.msd.model.core.IMassSpectra; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_MS1_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/MS1.mgf"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_MSforID_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_MSforID_ITest.java index 8e59faf6a..4bbc61f53 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_MSforID_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_MSforID_ITest.java @@ -20,18 +20,22 @@ import org.eclipse.chemclipse.msd.model.core.IMassSpectra; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_MSforID_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/msforid/Testgemisch_U_PP_LXQ_20141210.mgf"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_ProteinPilot_Many_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_ProteinPilot_Many_ITest.java index ce9d0b5f1..4a2b7811f 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_ProteinPilot_Many_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_ProteinPilot_Many_ITest.java @@ -20,18 +20,22 @@ import org.eclipse.chemclipse.msd.model.core.IMassSpectra; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_ProteinPilot_Many_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/proteinpilot/manyElements.mgf"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_ProteinPilot_Single_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_ProteinPilot_Single_ITest.java index cd1c58850..0df153fa5 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_ProteinPilot_Single_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.mgf.fragment.test/src/net/openchrom/msd/converter/supplier/mgf/converter/MassSpectrumImportConverter_ProteinPilot_Single_ITest.java @@ -21,18 +21,22 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_ProteinPilot_Single_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/proteinpilot/singleElement.mgf"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.microbems.muf.fragment.test/src/net/openchrom/msd/converter/supplier/muf/converter/MassSpectrumImportConverter_RKI_Ring_Trial_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.microbems.muf.fragment.test/src/net/openchrom/msd/converter/supplier/muf/converter/MassSpectrumImportConverter_RKI_Ring_Trial_ITest.java index 625444b0b..9c57d2de2 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.microbems.muf.fragment.test/src/net/openchrom/msd/converter/supplier/muf/converter/MassSpectrumImportConverter_RKI_Ring_Trial_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.microbems.muf.fragment.test/src/net/openchrom/msd/converter/supplier/muf/converter/MassSpectrumImportConverter_RKI_Ring_Trial_ITest.java @@ -25,22 +25,26 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.IProcessingMessage; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.muf.converter.model.ICultivationConditions; import net.openchrom.msd.converter.supplier.muf.converter.model.ISpectraMultiFileMassSpectra; import net.openchrom.msd.converter.supplier.muf.converter.model.ITaxonomicInformation; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_RKI_Ring_Trial_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("data/RKI-ring-trial-spectra.muf"); MassSpectrumImportConverter importConverter = new MassSpectrumImportConverter(); @@ -49,6 +53,7 @@ public void setUp() { System.out.println(message.getMessage()); } massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.microbems.pkf.fragment.test/src/net/openchrom/msd/converter/supplier/pkf/converter/MassSpectrumImportConverter_Ecoli_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.microbems.pkf.fragment.test/src/net/openchrom/msd/converter/supplier/pkf/converter/MassSpectrumImportConverter_Ecoli_ITest.java index 0356aafba..5bb8f231d 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.microbems.pkf.fragment.test/src/net/openchrom/msd/converter/supplier/pkf/converter/MassSpectrumImportConverter_Ecoli_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.microbems.pkf.fragment.test/src/net/openchrom/msd/converter/supplier/pkf/converter/MassSpectrumImportConverter_Ecoli_ITest.java @@ -23,25 +23,30 @@ import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.microbems.pkf.converter.DatabaseImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassSpectrumImportConverter_Ecoli_ITest { private IMassSpectra massSpectra; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("data/ecoli-peaklist-oct16.pkf"); DatabaseImportConverter importConverter = new DatabaseImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); massSpectra = processingInfo.getProcessingResult(); + assertNotNull(massSpectra); } @Test diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.mz5.fragment.test/src/net/openchrom/msd/converter/supplier/mz5/fragment/test/ChromatogramImportConverter_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.mz5.fragment.test/src/net/openchrom/msd/converter/supplier/mz5/fragment/test/ChromatogramImportConverter_ITest.java index feb47d2a3..c4cef4c6b 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.mz5.fragment.test/src/net/openchrom/msd/converter/supplier/mz5/fragment/test/ChromatogramImportConverter_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.mz5.fragment.test/src/net/openchrom/msd/converter/supplier/mz5/fragment/test/ChromatogramImportConverter_ITest.java @@ -22,30 +22,29 @@ import org.eclipse.chemclipse.msd.model.core.IRegularMassSpectrum; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.mz5.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ChromatogramImportConverter_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/test.mz5"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.mzdb.fragment.test/src/net/openchrom/msd/converter/supplier/mzdb/fragment/test/ChromatogramImportConverter_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.mzdb.fragment.test/src/net/openchrom/msd/converter/supplier/mzdb/fragment/test/ChromatogramImportConverter_ITest.java index e8f1b97fc..6dfa37004 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.mzdb.fragment.test/src/net/openchrom/msd/converter/supplier/mzdb/fragment/test/ChromatogramImportConverter_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.mzdb.fragment.test/src/net/openchrom/msd/converter/supplier/mzdb/fragment/test/ChromatogramImportConverter_ITest.java @@ -22,31 +22,35 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.support.history.IEditInformation; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.mzdb.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ChromatogramImportConverter_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/small.mzDB"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test - public void testLoading() { + public void testSample() { - assertNotNull(chromatogram); assertEquals("1", chromatogram.getSampleName()); } diff --git a/openchrom/tests/net.openchrom.msd.converter.supplier.mzmlb.fragment.test/src/net/openchrom/msd/converter/supplier/mzmlb/fragment/test/ChromatogramImportConverter_ITest.java b/openchrom/tests/net.openchrom.msd.converter.supplier.mzmlb.fragment.test/src/net/openchrom/msd/converter/supplier/mzmlb/fragment/test/ChromatogramImportConverter_ITest.java index e18097eee..726ad64a1 100644 --- a/openchrom/tests/net.openchrom.msd.converter.supplier.mzmlb.fragment.test/src/net/openchrom/msd/converter/supplier/mzmlb/fragment/test/ChromatogramImportConverter_ITest.java +++ b/openchrom/tests/net.openchrom.msd.converter.supplier.mzmlb.fragment.test/src/net/openchrom/msd/converter/supplier/mzmlb/fragment/test/ChromatogramImportConverter_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.msd.converter.supplier.mzmlb.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ChromatogramImportConverter_ITest { private IChromatogramMSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/test.mzMLb"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.nmr.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/BrukerXWinNMR1D_ITest.java b/openchrom/tests/net.openchrom.nmr.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/BrukerXWinNMR1D_ITest.java index 2bd808f49..d010a704a 100644 --- a/openchrom/tests/net.openchrom.nmr.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/BrukerXWinNMR1D_ITest.java +++ b/openchrom/tests/net.openchrom.nmr.converter.supplier.gaml.fragment.test/src/net/openchrom/csd/converter/supplier/gaml/fragment/test/BrukerXWinNMR1D_ITest.java @@ -23,31 +23,35 @@ import org.eclipse.chemclipse.nmr.model.core.ISpectrumNMR; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.nmr.converter.supplier.gaml.converter.ScanImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class BrukerXWinNMR1D_ITest { private Collection> complexSignals; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/Bruker_XWINNMR_1D.gaml"); ScanImportConverter importConverter = new ScanImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); complexSignals = processingInfo.getProcessingResult().getComplexSignalMeasurements(); + assertNotNull(complexSignals); } @Test public void testLoading() { - assertNotNull(complexSignals); assertFalse(complexSignals.isEmpty()); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism3100GeneticAnalyser_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism3100GeneticAnalyser_ITest.java index 336f909fa..ce4c047d3 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism3100GeneticAnalyser_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism3100GeneticAnalyser_ITest.java @@ -14,6 +14,7 @@ package net.openchrom.wsd.converter.supplier.abif.io; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; @@ -21,25 +22,30 @@ import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.abif.core.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class AbiPrism3100GeneticAnalyser_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File fileImport = new File("testdata/files/import/3100.ab1"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(fileImport, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism310GeneticAnalyser_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism310GeneticAnalyser_ITest.java index 34568e244..a0ea73327 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism310GeneticAnalyser_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism310GeneticAnalyser_ITest.java @@ -14,32 +14,38 @@ package net.openchrom.wsd.converter.supplier.abif.io; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.abif.core.ChromatogramImportConverter; import net.openchrom.wsd.converter.supplier.abif.model.IVendorChromatogram; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class AbiPrism310GeneticAnalyser_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File fileImport = new File("testdata/files/import/310.ab1"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(fileImport, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism3730GeneticAnalyser_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism3730GeneticAnalyser_ITest.java index 1501e2bbf..6b48e4bb3 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism3730GeneticAnalyser_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/AbiPrism3730GeneticAnalyser_ITest.java @@ -14,31 +14,37 @@ package net.openchrom.wsd.converter.supplier.abif.io; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.abif.core.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class AbiPrism3730GeneticAnalyser_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File fileImport = new File("testdata/files/import/3730.ab1"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(fileImport, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/EmptyFile_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/EmptyFile_ITest.java index ce88c13a9..508b5fc88 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/EmptyFile_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/EmptyFile_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.abif.core.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class EmptyFile_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File fileImport = new File("testdata/files/import/empty.ab1"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(fileImport, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testValidFile() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/InvalidData_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/InvalidData_ITest.java index 471c12556..443eba859 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/InvalidData_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.abif.fragment.test/src/net/openchrom/wsd/converter/supplier/abif/io/InvalidData_ITest.java @@ -21,13 +21,15 @@ import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.abif.core.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class InvalidData_ITest { private IChromatogramWSD chromatogram; @@ -39,11 +41,6 @@ public void setUp() { ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(fileImport, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testInvalidFile() { - assertNull(chromatogram); } } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.animl.fragment.test/src/net/openchrom/wsd/converter/supplier/animl/converter/ChromatogramImportExport_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.animl.fragment.test/src/net/openchrom/wsd/converter/supplier/animl/converter/ChromatogramImportExport_ITest.java index d5468b232..42fab6417 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.animl.fragment.test/src/net/openchrom/wsd/converter/supplier/animl/converter/ChromatogramImportExport_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.animl.fragment.test/src/net/openchrom/wsd/converter/supplier/animl/converter/ChromatogramImportExport_ITest.java @@ -25,20 +25,24 @@ import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.VersionConstants; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ChromatogramImportExport_ITest { private IChromatogramWSD chromatogramImport; private IChromatogramWSD chromatogram; private File fileExport; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testReImport() { /* * Import @@ -78,6 +82,9 @@ public void setUp() { for(IProcessingMessage message : processingInfo.getMessages()) { System.out.println(message.getMessage()); } + assertNotNull(chromatogram); + assertEquals(4950, chromatogram.getNumberOfScans()); + assertEquals(280f, chromatogram.getWavelengths().iterator().next(), 0); } @AfterAll @@ -85,12 +92,4 @@ public void tearDown() { fileExport.delete(); } - - @Test - public void testReimport() { - - assertNotNull(chromatogram); - assertEquals(4950, chromatogram.getNumberOfScans()); - assertEquals(280f, chromatogram.getWavelengths().iterator().next(), 0); - } } \ No newline at end of file diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRImport_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRImport_ITest.java index 4830a1b13..cc76c95a3 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRImport_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRImport_ITest.java @@ -17,31 +17,35 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.axr.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class AXRImport_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testdata/files/import/valid.axr"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test public void testLoadChromatogram() { - assertNotNull(chromatogram); assertEquals(5, chromatogram.getNumberOfScans()); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRMissingX_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRMissingX_ITest.java index 1ef359448..ef802751e 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRMissingX_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRMissingX_ITest.java @@ -17,31 +17,35 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.axr.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class AXRMissingX_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testdata/files/import/missing-x.axr"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test public void testLoadChromatogram() { - assertNotNull(chromatogram); assertEquals(4, chromatogram.getNumberOfScans()); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRRealFileSmoke_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRRealFileSmoke_ITest.java index 70258d6e0..abfad8cbd 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRRealFileSmoke_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/AXRRealFileSmoke_ITest.java @@ -18,32 +18,36 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.axr.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class AXRRealFileSmoke_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testdata/files/import/Moses_Lake_Low_Focus9_006.axr"); assertTrue(file.isFile(), "Real AXR smoke file not found: " + file.getAbsolutePath()); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test public void testLoadRealChromatogram() { - assertNotNull(chromatogram); assertEquals(30150, chromatogram.getNumberOfScans()); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/InvalidAXR_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/InvalidAXR_ITest.java index 8ae88b5cb..5b4277640 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/InvalidAXR_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.axr.fragment.test/src/net/openchrom/wsd/converter/supplier/axr/fragment/test/InvalidAXR_ITest.java @@ -16,30 +16,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.axr.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class InvalidAXR_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testdata/files/import/invalid.axr"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testInvalidFile() { - assertNull(chromatogram); } } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/AAA250PM_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/AAA250PM_ITest.java index 2012f9161..348465368 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/AAA250PM_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/AAA250PM_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class AAA250PM_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/AAA250PM.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 f711ec5d3..4609088c7 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ACID_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/PerkinElmer/ACID.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/HP_CH_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/HP_CH_ITest.java index a92fcbac3..3d7f5f649 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/HP_CH_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/HP_CH_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class HP_CH_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Hewlett Packard/HP-CH.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 e62c8ad16..841a0ee23 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 @@ -21,25 +21,30 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ICI_21_2_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/ICI_21_2.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test 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 18981a205..21f5774a6 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 @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class SPA_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/SPA.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/STEROIDS_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/STEROIDS_ITest.java index 16c7c355d..6d4783c8d 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/STEROIDS_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/STEROIDS_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class STEROIDS_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/STEROIDS.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 f3c8045e1..e8e656271 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class VARIAN1_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Varian/VARIAN1.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 61a81e7a8..220001925 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) @TestInstance(Lifecycle.PER_CLASS) public class VARIAN2_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Varian/VARIAN2.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 2b47c7a6c..58861d4ae 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class VARIAN3_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Varian/VARIAN3.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } 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 e9b47b64b..05d975e6d 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 @@ -21,30 +21,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class VARIAN4_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Varian/VARIAN4.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/WAT_490_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/WAT_490_ITest.java index 4485f2b77..a22ab4cda 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/WAT_490_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/WAT_490_ITest.java @@ -21,13 +21,16 @@ import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class WAT_490_ITest { private IChromatogramWSD chromatogram; @@ -39,11 +42,6 @@ public void setUp() { ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/WAT_9962_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/WAT_9962_ITest.java index 3bee57806..bb59d2064 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/WAT_9962_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.cdf.fragment.test/src/net/openchrom/wsd/converter/supplier/cdf/WAT_9962_ITest.java @@ -20,30 +20,29 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.cdf.converter.ChromatogramImportConverterWSD; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class WAT_9962_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/Waters/WAT_9962.CDF"); ChromatogramImportConverterWSD importConverter = new ChromatogramImportConverterWSD(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(chromatogram); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.gaml.fragment.test/src/net/openchrom/wsd/converter/supplier/gaml/fragment/test/Helios_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.gaml.fragment.test/src/net/openchrom/wsd/converter/supplier/gaml/fragment/test/Helios_ITest.java index 6f61ad97f..29e6f1aa5 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.gaml.fragment.test/src/net/openchrom/wsd/converter/supplier/gaml/fragment/test/Helios_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.gaml.fragment.test/src/net/openchrom/wsd/converter/supplier/gaml/fragment/test/Helios_ITest.java @@ -21,13 +21,16 @@ import org.eclipse.chemclipse.wsd.model.core.ISpectrumWSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.gaml.converter.ScanImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class Helios_ITest { private ISpectrumWSD spectrumWSD; @@ -39,11 +42,6 @@ public void setUp() { ScanImportConverter importConverter = new ScanImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); spectrumWSD = processingInfo.getProcessingResult(); - } - - @Test - public void testLoading() { - assertNotNull(spectrumWSD); } diff --git a/openchrom/tests/net.openchrom.wsd.converter.supplier.gaml.fragment.test/src/net/openchrom/wsd/converter/supplier/gaml/fragment/test/MassLynx_ITest.java b/openchrom/tests/net.openchrom.wsd.converter.supplier.gaml.fragment.test/src/net/openchrom/wsd/converter/supplier/gaml/fragment/test/MassLynx_ITest.java index 673e7772f..fa4aaf3dc 100644 --- a/openchrom/tests/net.openchrom.wsd.converter.supplier.gaml.fragment.test/src/net/openchrom/wsd/converter/supplier/gaml/fragment/test/MassLynx_ITest.java +++ b/openchrom/tests/net.openchrom.wsd.converter.supplier.gaml.fragment.test/src/net/openchrom/wsd/converter/supplier/gaml/fragment/test/MassLynx_ITest.java @@ -20,31 +20,35 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.core.runtime.NullProgressMonitor; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.TestMethodOrder; import net.openchrom.wsd.converter.supplier.gaml.converter.ChromatogramImportConverter; @TestInstance(Lifecycle.PER_CLASS) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MassLynx_ITest { private IChromatogramWSD chromatogram; - @BeforeAll - public void setUp() { + @Test + @Order(1) + public void testImport() { File file = new File("testData/files/import/Micromass_Masslynx.gaml"); ChromatogramImportConverter importConverter = new ChromatogramImportConverter(); IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); chromatogram = processingInfo.getProcessingResult(); + assertNotNull(chromatogram); } @Test public void testLoading() { - assertNotNull(chromatogram); assertEquals(562, chromatogram.getScans().size()); }