From b18b8ee3659cd431ce72575865267b3744c8e18e Mon Sep 17 00:00:00 2001 From: Peter Peterson <petersonpf@ornl.gov> Date: Thu, 30 Dec 2010 04:39:51 +0000 Subject: [PATCH] Adding tests for NeXus. Refs #1881. --- Code/Mantid/Framework/Nexus/CMakeLists.txt | 91 ++++++++++++++++------ 1 file changed, 68 insertions(+), 23 deletions(-) diff --git a/Code/Mantid/Framework/Nexus/CMakeLists.txt b/Code/Mantid/Framework/Nexus/CMakeLists.txt index 3c8c10a4a52..240b6f60bf9 100644 --- a/Code/Mantid/Framework/Nexus/CMakeLists.txt +++ b/Code/Mantid/Framework/Nexus/CMakeLists.txt @@ -1,28 +1,68 @@ set ( SRC_FILES src/LoadInstrumentFromNexus.cpp - src/LoadInstrumentFromSNSNexus.cpp src/LoadISISNexus2.cpp - src/LoadISISNexus.cpp src/LoadLogsFromSNSNexus.cpp - src/LoadMuonLog.cpp src/LoadMuonNexus2.cpp src/LoadMuonNexus.cpp - src/LoadNeXus.cpp src/LoadNexusMonitors.cpp - src/LoadNexusProcessed.cpp src/LoadSNSEventNexus.cpp - src/LoadSNSNexus.cpp src/LoadTOFRawNeXus.cpp - src/MuonNexusReader.cpp src/NexusClasses.cpp - src/NeXusException.cpp src/NeXusFile.cpp src/NexusFileIO.cpp - src/NeXusStream.cpp src/SaveNeXus.cpp src/SaveNexusProcessed.cpp - src/SaveNXSPE.cpp ) + src/LoadInstrumentFromSNSNexus.cpp + src/LoadISISNexus2.cpp + src/LoadISISNexus.cpp + src/LoadLogsFromSNSNexus.cpp + src/LoadMuonLog.cpp + src/LoadMuonNexus2.cpp + src/LoadMuonNexus.cpp + src/LoadNeXus.cpp + src/LoadNexusMonitors.cpp + src/LoadNexusProcessed.cpp + src/LoadSNSEventNexus.cpp + src/LoadSNSNexus.cpp + src/LoadTOFRawNeXus.cpp + src/MuonNexusReader.cpp + src/NexusClasses.cpp + src/NeXusException.cpp + src/NeXusFile.cpp + src/NexusFileIO.cpp + src/NeXusStream.cpp + src/SaveNeXus.cpp + src/SaveNexusProcessed.cpp + src/SaveNXSPE.cpp + src/SaveSNSNexus.cpp ) set ( INC_FILES inc/MantidNexus/LoadInstrumentFromNexus.h - inc/MantidNexus/LoadInstrumentFromSNSNexus.h - inc/MantidNexus/LoadISISNexus2.h inc/MantidNexus/LoadISISNexus.h - inc/MantidNexus/LoadLogsFromSNSNexus.h - inc/MantidNexus/LoadMuonLog.h inc/MantidNexus/LoadMuonNexus2.h - inc/MantidNexus/LoadMuonNexus.h inc/MantidNexus/LoadNeXus.h - inc/MantidNexus/LoadNexusMonitors.h - inc/MantidNexus/LoadNexusProcessed.h - inc/MantidNexus/LoadSNSEventNexus.h - inc/MantidNexus/LoadSNSNexus.h inc/MantidNexus/LoadTOFRawNeXus.h - inc/MantidNexus/MuonNexusReader.h inc/MantidNexus/NexusClasses.h - inc/MantidNexus/NexusFileIO.h inc/MantidNexus/SaveNeXus.h - inc/MantidNexus/SaveNexusProcessed.h inc/MantidNexus/SaveNXSPE.h ) + inc/MantidNexus/LoadInstrumentFromSNSNexus.h + inc/MantidNexus/LoadISISNexus2.h + inc/MantidNexus/LoadISISNexus.h + inc/MantidNexus/LoadLogsFromSNSNexus.h + inc/MantidNexus/LoadMuonLog.h + inc/MantidNexus/LoadMuonNexus2.h + inc/MantidNexus/LoadMuonNexus.h + inc/MantidNexus/LoadNeXus.h + inc/MantidNexus/LoadNexusMonitors.h + inc/MantidNexus/LoadNexusProcessed.h + inc/MantidNexus/LoadSNSEventNexus.h + inc/MantidNexus/LoadSNSNexus.h + inc/MantidNexus/LoadTOFRawNeXus.h + inc/MantidNexus/MuonNexusReader.h + inc/MantidNexus/NexusClasses.h + inc/MantidNexus/NexusFileIO.h + inc/MantidNexus/SaveNeXus.h + inc/MantidNexus/SaveNexusProcessed.h + inc/MantidNexus/SaveNXSPE.h + inc/MantidNexus/SaveSNSNexus.h ) + +set ( TEST_FILES #test/LoadInstrumentFromSNSNexusTest.h # TODO requires DataHandling + #test/LoadISISNexusTest.h # TODO requires DataHandling + #test/LoadLogsFromSNSNexusTest.h # TODO fails + #test/LoadMuonLogTest.h # TODO requires DataHandling + #test/LoadMuonNexus2Test.h # TODO requires DataHandling + #test/LoadMuonNexusTest.h # TODO requires DataHandling + #test/LoadNexusMonitorsTest.h # TODO fails + #test/LoadNexusProcessedTest.h # TODO requires DataHandling + #test/LoadNexusTest.h # TODO requires DataHandling + #test/LoadRSaveNLoadNcspTest.h # TODO requires DataHandling + #test/LoadSNSEventNexusTest.h # TODO requires DataHandling + test/LoadSNSNexusTest.h + #test/LoadTOFRawNeXusTest.h # TODO fails to compile + test/NexusAPITest.h + #test/SaveNexusProcessedTest.h # TODO requires DataHandling + #test/SaveNeXusTest.h # TODO requires DataHandling + #test/SaveNXSPETest.h # TODO requires DataHandling + ) # For Windows: add_definitions ( -DIN_MANTID_NEXUS -DIN_NEXUS_CPP_LIBRARY ) @@ -40,4 +80,9 @@ set_property ( TARGET Nexus PROPERTY FOLDER "Framework" ) include_directories ( inc ) -target_link_libraries ( Nexus ${MANTIDLIBS} ${NEXUS_LIBRARIES} ) \ No newline at end of file +target_link_libraries ( Nexus ${MANTIDLIBS} ${NEXUS_LIBRARIES} ) + +if ( CXXTEST_FOUND ) + cxxtest_add_test ( NexusTest ${TEST_FILES} ) + target_link_libraries( NexusTest Nexus ) +endif () -- GitLab