Skip to content

Commit 5ae5ed6

Browse files
dcherednikdcherednik
committed
UT refactoring
1 parent d20ddaf commit 5ae5ed6

File tree

5 files changed

+35
-74
lines changed

5 files changed

+35
-74
lines changed

‎CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
22

3+
project(atracdenc)
4+
35
if (UNIX)
46
add_subdirectory(3rd/gtest-1.7.0)
57
add_subdirectory(test)

‎src/CMakeLists.txt

+9-5
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ include_directories(
5656
set(SOURCE_FFT_LIB fft/kissfft_impl/kiss_fft.c)
5757
set_source_files_properties(fft/kissfft_impl/kiss_fft.c PROPERTIES COMPILE_FLAGS -Dkiss_fft_scalar=double)
5858
set(SOURCE_OMA_LIB oma/liboma/src/liboma.c)
59-
set(SOURCE_EXE
60-
main.cpp
59+
set(SOURCE_BITSTREAM_LIB bitstream/bitstream.cpp)
60+
set(SOURCE_ATRACDENC_IMPL
6161
wav.cpp
6262
aea.cpp
6363
env.cpp
6464
transient_detector.cpp
6565
atrac1denc.cpp
66-
bitstream/bitstream.cpp
6766
atrac/atrac1.cpp
6867
atrac/atrac1_dequantiser.cpp
6968
atrac/atrac_scale.cpp
@@ -74,11 +73,16 @@ set(SOURCE_EXE
7473
atrac/atrac3.cpp
7574
atrac/atrac3_bitstream.cpp
7675
mdct/mdct.cpp
77-
)
76+
)
7877

7978
add_library(fft_impl STATIC ${SOURCE_FFT_LIB})
8079
add_library(pcm_io STATIC ${SOURCE_PCM_IO_LIB})
8180
add_library(oma STATIC ${SOURCE_OMA_LIB})
81+
add_library(bitstream STATIC ${SOURCE_BITSTREAM_LIB})
82+
add_library(atracdenc_impl STATIC ${SOURCE_ATRACDENC_IMPL})
83+
set(SOURCE_EXE
84+
main.cpp
85+
)
8286
add_executable(atracdenc ${SOURCE_EXE})
83-
target_link_libraries(atracdenc fft_impl pcm_io oma ${SNDFILE_LIBRARIES})
87+
target_link_libraries(atracdenc fft_impl pcm_io oma bitstream atracdenc_impl ${SNDFILE_LIBRARIES})
8488

‎src/bitstream/bitstream_ut.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TEST(TBitStream, SimpleWriteRead) {
3535
EXPECT_EQ(true, bs.Read(1));
3636
}
3737

38-
TEST(TBisStream, OverlapWriteRead) {
38+
TEST(TBitStream, OverlapWriteRead) {
3939
TBitStream bs;
4040
bs.Write(101, 22);
4141
EXPECT_EQ(22, bs.GetSizeInBits());
@@ -51,7 +51,7 @@ TEST(TBisStream, OverlapWriteRead) {
5151
EXPECT_EQ(323, bs.Read(22));
5252
}
5353

54-
TEST(TBisStream, OverlapWriteRead2) {
54+
TEST(TBitStream, OverlapWriteRead2) {
5555
TBitStream bs;
5656
bs.Write(2, 2);
5757
bs.Write(7, 4);
@@ -62,7 +62,7 @@ TEST(TBisStream, OverlapWriteRead2) {
6262
EXPECT_EQ(10003, bs.Read(16));
6363
}
6464

65-
TEST(TBisStream, OverlapWriteRead3) {
65+
TEST(TBitStream, OverlapWriteRead3) {
6666
TBitStream bs;
6767
bs.Write(40, 6);
6868
bs.Write(3, 2);
@@ -120,7 +120,7 @@ TEST(TBisStream, OverlapWriteRead3) {
120120
}
121121

122122

123-
TEST(TBisStream, SignWriteRead) {
123+
TEST(TBitStream, SignWriteRead) {
124124
TBitStream bs;
125125
bs.Write(MakeSign(-2, 3), 3);
126126
bs.Write(MakeSign(-1, 3), 3);

‎src/mdct/mdct_ut.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static vector<TFloat> midct(TFloat* x, int N) {
4949
return res;
5050
}
5151

52-
TEST(TBitStream, MDCT32) {
52+
TEST(TMdctTest, MDCT32) {
5353
const int N = 32;
5454
TMDCT<N> transform(N);
5555
vector<TFloat> src(N);
@@ -64,7 +64,7 @@ TEST(TBitStream, MDCT32) {
6464
}
6565
}
6666

67-
TEST(TBitStream, MDCT64) {
67+
TEST(TMdctTest, MDCT64) {
6868
const int N = 64;
6969
TMDCT<N> transform(N);
7070
vector<TFloat> src(N);
@@ -79,7 +79,7 @@ TEST(TBitStream, MDCT64) {
7979
}
8080
}
8181

82-
TEST(TBitStream, MDCT128) {
82+
TEST(TMdctTest, MDCT128) {
8383
const int N = 128;
8484
TMDCT<N> transform(N);
8585
vector<TFloat> src(N);
@@ -94,7 +94,7 @@ TEST(TBitStream, MDCT128) {
9494
}
9595
}
9696

97-
TEST(TBitStream, MDCT256) {
97+
TEST(TMdctTest, MDCT256) {
9898
const int N = 256;
9999
TMDCT<N> transform(N);
100100
vector<TFloat> src(N);
@@ -109,7 +109,7 @@ TEST(TBitStream, MDCT256) {
109109
}
110110
}
111111

112-
TEST(TBitStream, MDCT256_RAND) {
112+
TEST(TMdctTest, MDCT256_RAND) {
113113
const int N = 256;
114114
TMDCT<N> transform(N);
115115
vector<TFloat> src(N);
@@ -124,7 +124,7 @@ TEST(TBitStream, MDCT256_RAND) {
124124
}
125125
}
126126

127-
TEST(TBitStream, MIDCT32) {
127+
TEST(TMdctTest, MIDCT32) {
128128
const int N = 32;
129129
TMIDCT<N> transform;
130130
vector<TFloat> src(N);
@@ -139,7 +139,7 @@ TEST(TBitStream, MIDCT32) {
139139
}
140140
}
141141

142-
TEST(TBitStream, MIDCT64) {
142+
TEST(TMdctTest, MIDCT64) {
143143
const int N = 64;
144144
TMIDCT<N> transform;
145145
vector<TFloat> src(N);
@@ -154,7 +154,7 @@ TEST(TBitStream, MIDCT64) {
154154
}
155155
}
156156

157-
TEST(TBitStream, MIDCT128) {
157+
TEST(TMdctTest, MIDCT128) {
158158
const int N = 128;
159159
TMIDCT<N> transform(N);
160160
vector<TFloat> src(N);
@@ -169,7 +169,7 @@ TEST(TBitStream, MIDCT128) {
169169
}
170170
}
171171

172-
TEST(TBitStream, MIDCT256) {
172+
TEST(TMdctTest, MIDCT256) {
173173
const int N = 256;
174174
TMIDCT<N> transform(N);
175175
vector<TFloat> src(N);
@@ -184,7 +184,7 @@ TEST(TBitStream, MIDCT256) {
184184
}
185185
}
186186

187-
TEST(TBitStream, MIDCT256_RAND) {
187+
TEST(TMdctTest, MIDCT256_RAND) {
188188
const int N = 256;
189189
TMIDCT<N> transform(N);
190190
vector<TFloat> src(N);

‎test/CMakeLists.txt

+10-55
Original file line numberDiff line numberDiff line change
@@ -24,65 +24,20 @@ endif ()
2424

2525
include_directories(${gtest_SOURCE_DIR}/include)
2626

27-
set(mdct_test_sources
28-
../src/mdct/mdct.cpp
27+
set(atracdenc_ut
2928
../src/mdct/mdct_ut.cpp
30-
)
31-
add_executable(mdct_test ${mdct_test_sources})
32-
target_link_libraries(mdct_test fft_impl gtest_main)
33-
34-
set(bitstream_test_sources
35-
../src/bitstream/bitstream.cpp
3629
../src/bitstream/bitstream_ut.cpp
37-
)
38-
add_executable(bitstream_test ${bitstream_test_sources})
39-
target_link_libraries(bitstream_test gtest_main)
40-
41-
set(atrac1mdct_test_sources
42-
../src/env.cpp
43-
../src/atrac1denc.cpp
44-
../src/transient_detector.cpp
45-
../src/bitstream/bitstream.cpp
46-
../src/atrac/atrac_psy_common.cpp
47-
../src/atrac/atrac_scale.cpp
48-
../src/atrac/atrac1_dequantiser.cpp
49-
../src/atrac/atrac1_bitalloc.cpp
50-
../src/atrac/atrac1.cpp
51-
../src/atrac/atrac3.cpp #atrac_scale has explicit instantiation
52-
../src/atracdenc_ut.cpp
53-
../src/aea.cpp
54-
../src/mdct/mdct.cpp
55-
)
56-
add_executable(atrac1mdct_test ${atrac1mdct_test_sources})
57-
target_link_libraries(atrac1mdct_test fft_impl gtest_main)
58-
59-
set(atrac3mdct_test_sources
60-
../src/env.cpp
61-
../src/atrac3denc.cpp
62-
../src/transient_detector.cpp
63-
../src/bitstream/bitstream.cpp
64-
../src/atrac/atrac_psy_common.cpp
65-
../src/atrac/atrac_scale.cpp
66-
../src/atrac/atrac3_bitstream.cpp
67-
../src/atrac/atrac1.cpp #atrac_scale has explicit instantiation
68-
../src/atrac/atrac3.cpp
69-
../src/atrac3denc_ut.cpp
70-
../src/oma.cpp
71-
../src/mdct/mdct.cpp
72-
)
73-
add_executable(atrac3mdct_test ${atrac3mdct_test_sources})
74-
target_link_libraries(atrac3mdct_test fft_impl oma gtest_main)
75-
76-
set(util_test_sources
7730
../src/util_ut.cpp
31+
../src/atracdenc_ut.cpp
32+
../src/transient_detector_ut.cpp
7833
)
79-
add_executable(util_test ${util_test_sources})
80-
target_link_libraries(util_test gtest_main)
8134

82-
set(transient_detector_test_sources
83-
../src/transient_detector_ut.cpp
84-
../src/transient_detector.cpp
35+
add_executable(atracdenc_ut ${atracdenc_ut})
36+
target_link_libraries(atracdenc_ut
37+
bitstream
38+
fft_impl
39+
gtest_main
40+
atracdenc_impl
41+
oma
8542
)
86-
add_executable(transient_detector_test ${transient_detector_test_sources})
87-
target_link_libraries(transient_detector_test gtest_main)
8843

0 commit comments

Comments
 (0)