UT refactoring

5 files changed, 35 insertions, 74 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe996e5..c03f633 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
+project(atracdenc)
+
 if (UNIX)
     add_subdirectory(3rd/gtest-1.7.0)
     add_subdirectory(test)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0838942..689224e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,14 +56,13 @@ include_directories(
 set(SOURCE_FFT_LIB fft/kissfft_impl/kiss_fft.c)
 set_source_files_properties(fft/kissfft_impl/kiss_fft.c PROPERTIES COMPILE_FLAGS -Dkiss_fft_scalar=double)
 set(SOURCE_OMA_LIB oma/liboma/src/liboma.c)
-set(SOURCE_EXE
-    main.cpp
+set(SOURCE_BITSTREAM_LIB bitstream/bitstream.cpp)
+set(SOURCE_ATRACDENC_IMPL
     wav.cpp
     aea.cpp
     env.cpp
     transient_detector.cpp
     atrac1denc.cpp
-    bitstream/bitstream.cpp
     atrac/atrac1.cpp
     atrac/atrac1_dequantiser.cpp
     atrac/atrac_scale.cpp
@@ -74,11 +73,16 @@ set(SOURCE_EXE
     atrac/atrac3.cpp
     atrac/atrac3_bitstream.cpp
     mdct/mdct.cpp
-    )
+)
 
 add_library(fft_impl STATIC ${SOURCE_FFT_LIB})
 add_library(pcm_io STATIC ${SOURCE_PCM_IO_LIB})
 add_library(oma STATIC ${SOURCE_OMA_LIB})
+add_library(bitstream STATIC ${SOURCE_BITSTREAM_LIB})
+add_library(atracdenc_impl STATIC ${SOURCE_ATRACDENC_IMPL})
+set(SOURCE_EXE
+    main.cpp
+)
 add_executable(atracdenc ${SOURCE_EXE})
-target_link_libraries(atracdenc fft_impl pcm_io oma ${SNDFILE_LIBRARIES})
+target_link_libraries(atracdenc fft_impl pcm_io oma bitstream atracdenc_impl ${SNDFILE_LIBRARIES})
 
diff --git a/src/bitstream/bitstream_ut.cpp b/src/bitstream/bitstream_ut.cpp
index 853b969..a426e7c 100644
--- a/src/bitstream/bitstream_ut.cpp
+++ b/src/bitstream/bitstream_ut.cpp
@@ -35,7 +35,7 @@ TEST(TBitStream, SimpleWriteRead) {
     EXPECT_EQ(true, bs.Read(1));
 }
 
-TEST(TBisStream, OverlapWriteRead) {
+TEST(TBitStream, OverlapWriteRead) {
     TBitStream bs;
     bs.Write(101, 22);
     EXPECT_EQ(22, bs.GetSizeInBits());
@@ -51,7 +51,7 @@ TEST(TBisStream, OverlapWriteRead) {
     EXPECT_EQ(323, bs.Read(22));
 }
 
-TEST(TBisStream, OverlapWriteRead2) {
+TEST(TBitStream, OverlapWriteRead2) {
     TBitStream bs;
     bs.Write(2, 2);
     bs.Write(7, 4);
@@ -62,7 +62,7 @@ TEST(TBisStream, OverlapWriteRead2) {
     EXPECT_EQ(10003, bs.Read(16));
 }
 
-TEST(TBisStream, OverlapWriteRead3) {
+TEST(TBitStream, OverlapWriteRead3) {
     TBitStream bs;
     bs.Write(40, 6);
     bs.Write(3, 2);
@@ -120,7 +120,7 @@ TEST(TBisStream, OverlapWriteRead3) {
 }
 
 
-TEST(TBisStream, SignWriteRead) {
+TEST(TBitStream, SignWriteRead) {
     TBitStream bs;
     bs.Write(MakeSign(-2, 3), 3);
     bs.Write(MakeSign(-1, 3), 3);
diff --git a/src/mdct/mdct_ut.cpp b/src/mdct/mdct_ut.cpp
index f9fb688..31f6f81 100644
--- a/src/mdct/mdct_ut.cpp
+++ b/src/mdct/mdct_ut.cpp
@@ -49,7 +49,7 @@ static vector<TFloat> midct(TFloat* x, int N) {
     return res;
 }
 
-TEST(TBitStream, MDCT32) {
+TEST(TMdctTest, MDCT32) {
     const int N = 32;
     TMDCT<N> transform(N);
     vector<TFloat> src(N);
@@ -64,7 +64,7 @@ TEST(TBitStream, MDCT32) {
     }
 }
 
-TEST(TBitStream, MDCT64) {
+TEST(TMdctTest, MDCT64) {
     const int N = 64;
     TMDCT<N> transform(N);
     vector<TFloat> src(N);
@@ -79,7 +79,7 @@ TEST(TBitStream, MDCT64) {
     }
 }
 
-TEST(TBitStream, MDCT128) {
+TEST(TMdctTest, MDCT128) {
     const int N = 128;
     TMDCT<N> transform(N);
     vector<TFloat> src(N);
@@ -94,7 +94,7 @@ TEST(TBitStream, MDCT128) {
     }
 }
 
-TEST(TBitStream, MDCT256) {
+TEST(TMdctTest, MDCT256) {
     const int N = 256;
     TMDCT<N> transform(N);
     vector<TFloat> src(N);
@@ -109,7 +109,7 @@ TEST(TBitStream, MDCT256) {
     }
 }
 
-TEST(TBitStream, MDCT256_RAND) {
+TEST(TMdctTest, MDCT256_RAND) {
     const int N = 256;
     TMDCT<N> transform(N);
     vector<TFloat> src(N);
@@ -124,7 +124,7 @@ TEST(TBitStream, MDCT256_RAND) {
     }
 }
 
-TEST(TBitStream, MIDCT32) {
+TEST(TMdctTest, MIDCT32) {
     const int N = 32;
     TMIDCT<N> transform;
     vector<TFloat> src(N);
@@ -139,7 +139,7 @@ TEST(TBitStream, MIDCT32) {
     }
 }
 
-TEST(TBitStream, MIDCT64) {
+TEST(TMdctTest, MIDCT64) {
     const int N = 64;
     TMIDCT<N> transform;
     vector<TFloat> src(N);
@@ -154,7 +154,7 @@ TEST(TBitStream, MIDCT64) {
     }
 }
 
-TEST(TBitStream, MIDCT128) {
+TEST(TMdctTest, MIDCT128) {
     const int N = 128;
     TMIDCT<N> transform(N);
     vector<TFloat> src(N);
@@ -169,7 +169,7 @@ TEST(TBitStream, MIDCT128) {
     }
 }
 
-TEST(TBitStream, MIDCT256) {
+TEST(TMdctTest, MIDCT256) {
     const int N = 256;
     TMIDCT<N> transform(N);
     vector<TFloat> src(N);
@@ -184,7 +184,7 @@ TEST(TBitStream, MIDCT256) {
     }
 }
 
-TEST(TBitStream, MIDCT256_RAND) {
+TEST(TMdctTest, MIDCT256_RAND) {
     const int N = 256;
     TMIDCT<N> transform(N);
     vector<TFloat> src(N);
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0425f7a..ceb9009 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,65 +24,20 @@ endif ()
 
 include_directories(${gtest_SOURCE_DIR}/include)
 
-set(mdct_test_sources
-    ../src/mdct/mdct.cpp
+set(atracdenc_ut
     ../src/mdct/mdct_ut.cpp
-)
-add_executable(mdct_test ${mdct_test_sources})
-target_link_libraries(mdct_test fft_impl gtest_main)
-
-set(bitstream_test_sources
-    ../src/bitstream/bitstream.cpp
     ../src/bitstream/bitstream_ut.cpp
-)
-add_executable(bitstream_test ${bitstream_test_sources})
-target_link_libraries(bitstream_test gtest_main)
-
-set(atrac1mdct_test_sources
-    ../src/env.cpp
-    ../src/atrac1denc.cpp
-    ../src/transient_detector.cpp
-    ../src/bitstream/bitstream.cpp
-    ../src/atrac/atrac_psy_common.cpp
-    ../src/atrac/atrac_scale.cpp
-    ../src/atrac/atrac1_dequantiser.cpp
-    ../src/atrac/atrac1_bitalloc.cpp
-    ../src/atrac/atrac1.cpp
-    ../src/atrac/atrac3.cpp #atrac_scale has explicit instantiation
-    ../src/atracdenc_ut.cpp
-    ../src/aea.cpp
-    ../src/mdct/mdct.cpp
-)
-add_executable(atrac1mdct_test ${atrac1mdct_test_sources})
-target_link_libraries(atrac1mdct_test fft_impl gtest_main)
-
-set(atrac3mdct_test_sources
-    ../src/env.cpp
-    ../src/atrac3denc.cpp
-    ../src/transient_detector.cpp
-    ../src/bitstream/bitstream.cpp
-    ../src/atrac/atrac_psy_common.cpp
-    ../src/atrac/atrac_scale.cpp
-    ../src/atrac/atrac3_bitstream.cpp
-    ../src/atrac/atrac1.cpp #atrac_scale has explicit instantiation
-    ../src/atrac/atrac3.cpp
-    ../src/atrac3denc_ut.cpp
-    ../src/oma.cpp
-    ../src/mdct/mdct.cpp
-)
-add_executable(atrac3mdct_test ${atrac3mdct_test_sources})
-target_link_libraries(atrac3mdct_test fft_impl oma gtest_main)
-
-set(util_test_sources
     ../src/util_ut.cpp
+    ../src/atracdenc_ut.cpp
+    ../src/transient_detector_ut.cpp
 )
-add_executable(util_test ${util_test_sources})
-target_link_libraries(util_test gtest_main)
 
-set(transient_detector_test_sources
-    ../src/transient_detector_ut.cpp
-    ../src/transient_detector.cpp
+add_executable(atracdenc_ut ${atracdenc_ut})
+target_link_libraries(atracdenc_ut
+    bitstream
+    fft_impl
+    gtest_main
+    atracdenc_impl
+    oma
 )
-add_executable(transient_detector_test ${transient_detector_test_sources})
-target_link_libraries(transient_detector_test gtest_main)