From b43ea794d871bd7fb832cb5deb0eaf8d62b7e9a6 Mon Sep 17 00:00:00 2001 From: derek Date: Mon, 28 Nov 2011 21:59:09 -0500 Subject: [PATCH] Reorganized test suite source tree --- src/test/CMakeLists.txt | 2 +- src/test/TestMain.cpp | 13 ++------- .../BamAlignmentDefaultTest.h | 0 .../{BamAlignment => }/BamAlignmentFlagTest.h | 0 src/test/api/BamIndex/BamToolsIndexTest.h | 0 .../BamMultiReaderFileOpsTest.h | 0 .../{BamReader => }/BamReaderFileOpsTest.h | 0 .../BamAuxBamRegionTest.h => BamRegionTest.h} | 0 src/test/api/BamToolsApiTest.h | 28 +++++++++++++++++++ ...idatorTest.h => SamHeaderValidationTest.h} | 18 ++++++------ .../SamReadGroupDictionaryTest.h | 0 .../SamSequenceDictionaryTest.h | 0 .../index}/BamIndexFactoryTest.h | 0 .../index}/BamStandardIndexTest.h | 0 .../api/internal/index/BamToolsIndexTest.h | 13 +++++++++ src/test/toolkit/BamToolsToolkitTest.h | 6 ++++ src/test/utils/BamToolsUtilsTest.h | 6 ++++ 17 files changed, 66 insertions(+), 20 deletions(-) rename src/test/api/{BamAlignment => }/BamAlignmentDefaultTest.h (100%) rename src/test/api/{BamAlignment => }/BamAlignmentFlagTest.h (100%) delete mode 100644 src/test/api/BamIndex/BamToolsIndexTest.h rename src/test/api/{BamMultiReader => }/BamMultiReaderFileOpsTest.h (100%) rename src/test/api/{BamReader => }/BamReaderFileOpsTest.h (100%) rename src/test/api/{BamAux/BamAuxBamRegionTest.h => BamRegionTest.h} (100%) create mode 100644 src/test/api/BamToolsApiTest.h rename src/test/api/{SamHeader/SamHeaderValidatorTest.h => SamHeaderValidationTest.h} (94%) rename src/test/api/{SamHeader => }/SamReadGroupDictionaryTest.h (100%) rename src/test/api/{SamHeader => }/SamSequenceDictionaryTest.h (100%) rename src/test/api/{BamIndex => internal/index}/BamIndexFactoryTest.h (100%) rename src/test/api/{BamIndex => internal/index}/BamStandardIndexTest.h (100%) create mode 100644 src/test/api/internal/index/BamToolsIndexTest.h create mode 100644 src/test/toolkit/BamToolsToolkitTest.h create mode 100644 src/test/utils/BamToolsUtilsTest.h diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 984ee7c..2026958 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -24,5 +24,5 @@ target_link_libraries( BamTools-test BamTools BamTools-utils jsoncpp gtest ) # add test - running 'make check' will ensure build & run add_test( BamToolsTest BamTools-test ) add_custom_target( check COMMAND ${EXECUTABLE_OUTPUT_PATH}/test_bamtools - DEPENDS BamTools-test ) + DEPENDS BamTools-test gtest ) diff --git a/src/test/TestMain.cpp b/src/test/TestMain.cpp index 878e6e8..8d2d861 100755 --- a/src/test/TestMain.cpp +++ b/src/test/TestMain.cpp @@ -3,16 +3,9 @@ #include // BamTools unit tests -#include "test/api/BamAlignment/BamAlignmentDefaultTest.h" -#include "test/api/BamAlignment/BamAlignmentFlagTest.h" -#include "test/api/BamAux/BamAuxBamRegionTest.h" -#include "test/api/BamIndex/BamIndexFactoryTest.h" -#include "test/api/BamIndex/BamStandardIndexTest.h" -#include "test/api/BamMultiReader/BamMultiReaderFileOpsTest.h" -#include "test/api/BamReader/BamReaderFileOpsTest.h" -#include "test/api/SamHeader/SamHeaderValidatorTest.h" -#include "test/api/SamHeader/SamReadGroupDictionaryTest.h" -#include "test/api/SamHeader/SamSequenceDictionaryTest.h" +#include "test/api/BamToolsApiTest.h" +#include "test/toolkit/BamToolsToolkitTest.h" +#include "test/utils/BamToolsUtilsTest.h" int main(int argc, char* argv[]) { ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/api/BamAlignment/BamAlignmentDefaultTest.h b/src/test/api/BamAlignmentDefaultTest.h similarity index 100% rename from src/test/api/BamAlignment/BamAlignmentDefaultTest.h rename to src/test/api/BamAlignmentDefaultTest.h diff --git a/src/test/api/BamAlignment/BamAlignmentFlagTest.h b/src/test/api/BamAlignmentFlagTest.h similarity index 100% rename from src/test/api/BamAlignment/BamAlignmentFlagTest.h rename to src/test/api/BamAlignmentFlagTest.h diff --git a/src/test/api/BamIndex/BamToolsIndexTest.h b/src/test/api/BamIndex/BamToolsIndexTest.h deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/api/BamMultiReader/BamMultiReaderFileOpsTest.h b/src/test/api/BamMultiReaderFileOpsTest.h similarity index 100% rename from src/test/api/BamMultiReader/BamMultiReaderFileOpsTest.h rename to src/test/api/BamMultiReaderFileOpsTest.h diff --git a/src/test/api/BamReader/BamReaderFileOpsTest.h b/src/test/api/BamReaderFileOpsTest.h similarity index 100% rename from src/test/api/BamReader/BamReaderFileOpsTest.h rename to src/test/api/BamReaderFileOpsTest.h diff --git a/src/test/api/BamAux/BamAuxBamRegionTest.h b/src/test/api/BamRegionTest.h similarity index 100% rename from src/test/api/BamAux/BamAuxBamRegionTest.h rename to src/test/api/BamRegionTest.h diff --git a/src/test/api/BamToolsApiTest.h b/src/test/api/BamToolsApiTest.h new file mode 100644 index 0000000..a7ba5ae --- /dev/null +++ b/src/test/api/BamToolsApiTest.h @@ -0,0 +1,28 @@ +#ifndef BAMTOOLS_TEST_API_H +#define BAMTOOLS_TEST_API_H + +// general API behavior +#include "BamAlignmentDefaultTest.h" +#include "BamAlignmentFlagTest.h" +#include "BamMultiReaderFileOpsTest.h" +#include "BamReaderFileOpsTest.h" +#include "BamRegionTest.h" +#include "SamHeaderValidationTest.h" +#include "SamReadGroupDictionaryTest.h" +#include "SamSequenceDictionaryTest.h" + +// internal BAM behavior + +// internal indexing behavior +#include "internal/index/BamIndexFactoryTest.h" +#include "internal/index/BamStandardIndexTest.h" +#include "internal/index/BamToolsIndexTest.h" + +// internal I/O behavior + +// internal SAM behavior + +// internal utils behavior + +#endif // BAMTOOLS_TEST_API_H + diff --git a/src/test/api/SamHeader/SamHeaderValidatorTest.h b/src/test/api/SamHeaderValidationTest.h similarity index 94% rename from src/test/api/SamHeader/SamHeaderValidatorTest.h rename to src/test/api/SamHeaderValidationTest.h index bec004a..4b59505 100644 --- a/src/test/api/SamHeader/SamHeaderValidatorTest.h +++ b/src/test/api/SamHeaderValidationTest.h @@ -1,12 +1,12 @@ -#ifndef SAMHEADER_VALIDATORTEST_H -#define SAMHEADER_VALIDATORTEST_H +#ifndef SAMHEADER_VALIDATIONTEST_H +#define SAMHEADER_VALIDATIONTEST_H #include "api/SamHeader.h" #include #include #include -TEST(SamHeader_ValidatorTest, EmptyHeader) { +TEST(SamHeader_ValidationTest, EmptyHeader) { BamTools::SamHeader header(""); std::string headerText = header.ToString(); @@ -14,7 +14,7 @@ TEST(SamHeader_ValidatorTest, EmptyHeader) { EXPECT_TRUE(header.IsValid()); } -TEST(SamHeader_ValidatorTest, Version) { +TEST(SamHeader_ValidationTest, Version) { BamTools::SamHeader header(""); @@ -50,7 +50,7 @@ TEST(SamHeader_ValidatorTest, Version) { EXPECT_FALSE(header.IsValid()); } -TEST(SamHeader_ValidatorTest, GroupOrder) { +TEST(SamHeader_ValidationTest, GroupOrder) { BamTools::SamHeader header(""); @@ -71,7 +71,7 @@ TEST(SamHeader_ValidatorTest, GroupOrder) { EXPECT_FALSE(header.IsValid()); } -TEST(SamHeader_ValidatorTest, SortOrder) { +TEST(SamHeader_ValidationTest, SortOrder) { BamTools::SamHeader header(""); @@ -92,7 +92,7 @@ TEST(SamHeader_ValidatorTest, SortOrder) { EXPECT_FALSE(header.IsValid()); } -TEST(SamHeader_ValidatorTest, SequenceDictionary) { +TEST(SamHeader_ValidationTest, SequenceDictionary) { BamTools::SamHeader header(""); BamTools::SamSequence sequence; @@ -190,7 +190,7 @@ TEST(SamHeader_ValidatorTest, SequenceDictionary) { EXPECT_FALSE(header.IsValid()); } -TEST(SamHeader_ValidatorTest, ReadGroupDictionary) { +TEST(SamHeader_ValidationTest, ReadGroupDictionary) { BamTools::SamHeader header(""); BamTools::SamReadGroup readGroup; @@ -289,4 +289,4 @@ TEST(SamHeader_ValidatorTest, ReadGroupDictionary) { EXPECT_FALSE(header.IsValid()); } -#endif // SAMHEADER_VALIDATORTEST_H +#endif // SAMHEADER_VALIDATIONTEST_H diff --git a/src/test/api/SamHeader/SamReadGroupDictionaryTest.h b/src/test/api/SamReadGroupDictionaryTest.h similarity index 100% rename from src/test/api/SamHeader/SamReadGroupDictionaryTest.h rename to src/test/api/SamReadGroupDictionaryTest.h diff --git a/src/test/api/SamHeader/SamSequenceDictionaryTest.h b/src/test/api/SamSequenceDictionaryTest.h similarity index 100% rename from src/test/api/SamHeader/SamSequenceDictionaryTest.h rename to src/test/api/SamSequenceDictionaryTest.h diff --git a/src/test/api/BamIndex/BamIndexFactoryTest.h b/src/test/api/internal/index/BamIndexFactoryTest.h similarity index 100% rename from src/test/api/BamIndex/BamIndexFactoryTest.h rename to src/test/api/internal/index/BamIndexFactoryTest.h diff --git a/src/test/api/BamIndex/BamStandardIndexTest.h b/src/test/api/internal/index/BamStandardIndexTest.h similarity index 100% rename from src/test/api/BamIndex/BamStandardIndexTest.h rename to src/test/api/internal/index/BamStandardIndexTest.h diff --git a/src/test/api/internal/index/BamToolsIndexTest.h b/src/test/api/internal/index/BamToolsIndexTest.h new file mode 100644 index 0000000..e1b6cd4 --- /dev/null +++ b/src/test/api/internal/index/BamToolsIndexTest.h @@ -0,0 +1,13 @@ +#ifndef BAMTOOLSINDEX_TEST_H +#define BAMTOOLSINDEX_TEST_H + +#include +#include "api/internal/index/BamToolsIndex_p.h" + +TEST(BamToolsIndexTest, Open) { + + + +} + +#endif // BAMTOOLSINDEX_TEST_H diff --git a/src/test/toolkit/BamToolsToolkitTest.h b/src/test/toolkit/BamToolsToolkitTest.h new file mode 100644 index 0000000..2655cdd --- /dev/null +++ b/src/test/toolkit/BamToolsToolkitTest.h @@ -0,0 +1,6 @@ +#ifndef BAMTOOLS_TEST_TOOLKIT_H +#define BAMTOOLS_TEST_TOOLKIT_H + + +#endif // BAMTOOLS_TEST_TOOLKIT_H + diff --git a/src/test/utils/BamToolsUtilsTest.h b/src/test/utils/BamToolsUtilsTest.h new file mode 100644 index 0000000..6e7b060 --- /dev/null +++ b/src/test/utils/BamToolsUtilsTest.h @@ -0,0 +1,6 @@ +#ifndef BAMTOOLS_TEST_UTILS_H +#define BAMTOOLS_TEST_UTILS_H + + +#endif // BAMTOOLS_TEST_UTILS_H + -- 2.39.2