Remove templatization of the AudioVector test
This CL converts the unit tests for AudioVector from typed tests to
regular tests. It is in preparation for removing templatization for
AudioVector in an upcoming CL.
BUG=1363
R=turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2319005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4903 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc b/webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc
index c5f1ba4..a7ddbb4 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc
@@ -20,22 +20,12 @@
namespace webrtc {
-// The tests in this file are so called typed tests (see e.g.,
-// http://code.google.com/p/googletest/wiki/AdvancedGuide#Typed_Tests).
-// This means that the tests are written with the typename T as an unknown
-// template type. The tests are then instantiated for a few types; int16_t,
-// int32_t and double in this case. Each test is then run once for each of these
-// types.
-// A few special tricks are needed. For instance, the member variable |array_|
-// in the test fixture must be accessed using this->array_ in the tests.
-
-template<typename T>
class AudioVectorTest : public ::testing::Test {
protected:
virtual void SetUp() {
// Populate test array.
for (size_t i = 0; i < array_length(); ++i) {
- array_[i] = static_cast<T>(i);
+ array_[i] = i;
}
}
@@ -43,48 +33,44 @@
return sizeof(array_) / sizeof(array_[0]);
}
- T array_[10];
+ int16_t array_[10];
};
-// Instantiate typed tests with int16_t, int32_t, and double.
-typedef ::testing::Types<int16_t, int32_t, double> MyTypes;
-TYPED_TEST_CASE(AudioVectorTest, MyTypes);
-
// Create and destroy AudioVector objects, both empty and with a predefined
// length.
-TYPED_TEST(AudioVectorTest, CreateAndDestroy) {
- AudioVector<TypeParam> vec1;
+TEST_F(AudioVectorTest, CreateAndDestroy) {
+ AudioVector<int16_t> vec1;
EXPECT_TRUE(vec1.Empty());
EXPECT_EQ(0u, vec1.Size());
size_t initial_size = 17;
- AudioVector<TypeParam> vec2(initial_size);
+ AudioVector<int16_t> vec2(initial_size);
EXPECT_FALSE(vec2.Empty());
EXPECT_EQ(initial_size, vec2.Size());
}
// Test the subscript operator [] for getting and setting.
-TYPED_TEST(AudioVectorTest, SubscriptOperator) {
- AudioVector<TypeParam> vec(this->array_length());
- for (size_t i = 0; i < this->array_length(); ++i) {
- vec[i] = static_cast<TypeParam>(i);
- const TypeParam& value = vec[i]; // Make sure to use the const version.
- EXPECT_EQ(static_cast<TypeParam>(i), value);
+TEST_F(AudioVectorTest, SubscriptOperator) {
+ AudioVector<int16_t> vec(array_length());
+ for (size_t i = 0; i < array_length(); ++i) {
+ vec[i] = static_cast<int16_t>(i);
+ const int16_t& value = vec[i]; // Make sure to use the const version.
+ EXPECT_EQ(static_cast<int16_t>(i), value);
}
}
// Test the PushBack method and the CopyFrom method. The Clear method is also
// invoked.
-TYPED_TEST(AudioVectorTest, PushBackAndCopy) {
- AudioVector<TypeParam> vec;
- AudioVector<TypeParam> vec_copy;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, PushBackAndCopy) {
+ AudioVector<int16_t> vec;
+ AudioVector<int16_t> vec_copy;
+ vec.PushBack(array_, array_length());
vec.CopyFrom(&vec_copy); // Copy from |vec| to |vec_copy|.
- ASSERT_EQ(this->array_length(), vec.Size());
- ASSERT_EQ(this->array_length(), vec_copy.Size());
- for (size_t i = 0; i < this->array_length(); ++i) {
- EXPECT_EQ(this->array_[i], vec[i]);
- EXPECT_EQ(this->array_[i], vec_copy[i]);
+ ASSERT_EQ(array_length(), vec.Size());
+ ASSERT_EQ(array_length(), vec_copy.Size());
+ for (size_t i = 0; i < array_length(); ++i) {
+ EXPECT_EQ(array_[i], vec[i]);
+ EXPECT_EQ(array_[i], vec_copy[i]);
}
// Clear |vec| and verify that it is empty.
@@ -97,105 +83,105 @@
}
// Try to copy to a NULL pointer. Nothing should happen.
-TYPED_TEST(AudioVectorTest, CopyToNull) {
- AudioVector<TypeParam> vec;
- AudioVector<TypeParam>* vec_copy = NULL;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, CopyToNull) {
+ AudioVector<int16_t> vec;
+ AudioVector<int16_t>* vec_copy = NULL;
+ vec.PushBack(array_, array_length());
vec.CopyFrom(vec_copy);
}
// Test the PushBack method with another AudioVector as input argument.
-TYPED_TEST(AudioVectorTest, PushBackVector) {
+TEST_F(AudioVectorTest, PushBackVector) {
static const size_t kLength = 10;
- AudioVector<TypeParam> vec1(kLength);
- AudioVector<TypeParam> vec2(kLength);
+ AudioVector<int16_t> vec1(kLength);
+ AudioVector<int16_t> vec2(kLength);
// Set the first vector to [0, 1, ..., kLength - 1].
// Set the second vector to [kLength, kLength + 1, ..., 2 * kLength - 1].
for (size_t i = 0; i < kLength; ++i) {
- vec1[i] = static_cast<TypeParam>(i);
- vec2[i] = static_cast<TypeParam>(i + kLength);
+ vec1[i] = static_cast<int16_t>(i);
+ vec2[i] = static_cast<int16_t>(i + kLength);
}
// Append vec2 to the back of vec1.
vec1.PushBack(vec2);
ASSERT_EQ(2 * kLength, vec1.Size());
for (size_t i = 0; i < 2 * kLength; ++i) {
- EXPECT_EQ(static_cast<TypeParam>(i), vec1[i]);
+ EXPECT_EQ(static_cast<int16_t>(i), vec1[i]);
}
}
// Test the PushFront method.
-TYPED_TEST(AudioVectorTest, PushFront) {
- AudioVector<TypeParam> vec;
- vec.PushFront(this->array_, this->array_length());
- ASSERT_EQ(this->array_length(), vec.Size());
- for (size_t i = 0; i < this->array_length(); ++i) {
- EXPECT_EQ(this->array_[i], vec[i]);
+TEST_F(AudioVectorTest, PushFront) {
+ AudioVector<int16_t> vec;
+ vec.PushFront(array_, array_length());
+ ASSERT_EQ(array_length(), vec.Size());
+ for (size_t i = 0; i < array_length(); ++i) {
+ EXPECT_EQ(array_[i], vec[i]);
}
}
// Test the PushFront method with another AudioVector as input argument.
-TYPED_TEST(AudioVectorTest, PushFrontVector) {
+TEST_F(AudioVectorTest, PushFrontVector) {
static const size_t kLength = 10;
- AudioVector<TypeParam> vec1(kLength);
- AudioVector<TypeParam> vec2(kLength);
+ AudioVector<int16_t> vec1(kLength);
+ AudioVector<int16_t> vec2(kLength);
// Set the first vector to [0, 1, ..., kLength - 1].
// Set the second vector to [kLength, kLength + 1, ..., 2 * kLength - 1].
for (size_t i = 0; i < kLength; ++i) {
- vec1[i] = static_cast<TypeParam>(i);
- vec2[i] = static_cast<TypeParam>(i + kLength);
+ vec1[i] = static_cast<int16_t>(i);
+ vec2[i] = static_cast<int16_t>(i + kLength);
}
// Prepend vec1 to the front of vec2.
vec2.PushFront(vec1);
ASSERT_EQ(2 * kLength, vec2.Size());
for (size_t i = 0; i < 2 * kLength; ++i) {
- EXPECT_EQ(static_cast<TypeParam>(i), vec2[i]);
+ EXPECT_EQ(static_cast<int16_t>(i), vec2[i]);
}
}
// Test the PopFront method.
-TYPED_TEST(AudioVectorTest, PopFront) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, PopFront) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
vec.PopFront(1); // Remove one element.
- EXPECT_EQ(this->array_length() - 1u, vec.Size());
- for (size_t i = 0; i < this->array_length() - 1; ++i) {
- EXPECT_EQ(static_cast<TypeParam>(i + 1), vec[i]);
+ EXPECT_EQ(array_length() - 1u, vec.Size());
+ for (size_t i = 0; i < array_length() - 1; ++i) {
+ EXPECT_EQ(static_cast<int16_t>(i + 1), vec[i]);
}
- vec.PopFront(this->array_length()); // Remove more elements than vector size.
+ vec.PopFront(array_length()); // Remove more elements than vector size.
EXPECT_EQ(0u, vec.Size());
}
// Test the PopBack method.
-TYPED_TEST(AudioVectorTest, PopBack) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, PopBack) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
vec.PopBack(1); // Remove one element.
- EXPECT_EQ(this->array_length() - 1u, vec.Size());
- for (size_t i = 0; i < this->array_length() - 1; ++i) {
- EXPECT_EQ(static_cast<TypeParam>(i), vec[i]);
+ EXPECT_EQ(array_length() - 1u, vec.Size());
+ for (size_t i = 0; i < array_length() - 1; ++i) {
+ EXPECT_EQ(static_cast<int16_t>(i), vec[i]);
}
- vec.PopBack(this->array_length()); // Remove more elements than vector size.
+ vec.PopBack(array_length()); // Remove more elements than vector size.
EXPECT_EQ(0u, vec.Size());
}
// Test the Extend method.
-TYPED_TEST(AudioVectorTest, Extend) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, Extend) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
vec.Extend(5); // Extend with 5 elements, which should all be zeros.
- ASSERT_EQ(this->array_length() + 5u, vec.Size());
+ ASSERT_EQ(array_length() + 5u, vec.Size());
// Verify that all are zero.
- for (size_t i = this->array_length(); i < this->array_length() + 5; ++i) {
+ for (size_t i = array_length(); i < array_length() + 5; ++i) {
EXPECT_EQ(0, vec[i]);
}
}
// Test the InsertAt method with an insert position in the middle of the vector.
-TYPED_TEST(AudioVectorTest, InsertAt) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, InsertAt) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
static const int kNewLength = 5;
- TypeParam new_array[kNewLength];
+ int16_t new_array[kNewLength];
// Set array elements to {100, 101, 102, ... }.
for (int i = 0; i < kNewLength; ++i) {
new_array[i] = 100 + i;
@@ -207,30 +193,30 @@
// |insert_position|, |insert_position| + 1, ..., kLength - 1}.
size_t pos = 0;
for (int i = 0; i < insert_position; ++i) {
- EXPECT_EQ(this->array_[i], vec[pos]);
+ EXPECT_EQ(array_[i], vec[pos]);
++pos;
}
for (int i = 0; i < kNewLength; ++i) {
EXPECT_EQ(new_array[i], vec[pos]);
++pos;
}
- for (size_t i = insert_position; i < this->array_length(); ++i) {
- EXPECT_EQ(this->array_[i], vec[pos]);
+ for (size_t i = insert_position; i < array_length(); ++i) {
+ EXPECT_EQ(array_[i], vec[pos]);
++pos;
}
}
// Test the InsertZerosAt method with an insert position in the middle of the
// vector. Use the InsertAt method as reference.
-TYPED_TEST(AudioVectorTest, InsertZerosAt) {
- AudioVector<TypeParam> vec;
- AudioVector<TypeParam> vec_ref;
- vec.PushBack(this->array_, this->array_length());
- vec_ref.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, InsertZerosAt) {
+ AudioVector<int16_t> vec;
+ AudioVector<int16_t> vec_ref;
+ vec.PushBack(array_, array_length());
+ vec_ref.PushBack(array_, array_length());
static const int kNewLength = 5;
int insert_position = 5;
vec.InsertZerosAt(kNewLength, insert_position);
- TypeParam new_array[kNewLength] = {0}; // All zero elements.
+ int16_t new_array[kNewLength] = {0}; // All zero elements.
vec_ref.InsertAt(new_array, kNewLength, insert_position);
// Verify that the vectors are identical.
ASSERT_EQ(vec_ref.Size(), vec.Size());
@@ -240,11 +226,11 @@
}
// Test the InsertAt method with an insert position at the start of the vector.
-TYPED_TEST(AudioVectorTest, InsertAtBeginning) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, InsertAtBeginning) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
static const int kNewLength = 5;
- TypeParam new_array[kNewLength];
+ int16_t new_array[kNewLength];
// Set array elements to {100, 101, 102, ... }.
for (int i = 0; i < kNewLength; ++i) {
new_array[i] = 100 + i;
@@ -259,29 +245,29 @@
EXPECT_EQ(new_array[i], vec[pos]);
++pos;
}
- for (size_t i = insert_position; i < this->array_length(); ++i) {
- EXPECT_EQ(this->array_[i], vec[pos]);
+ for (size_t i = insert_position; i < array_length(); ++i) {
+ EXPECT_EQ(array_[i], vec[pos]);
++pos;
}
}
// Test the InsertAt method with an insert position at the end of the vector.
-TYPED_TEST(AudioVectorTest, InsertAtEnd) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, InsertAtEnd) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
static const int kNewLength = 5;
- TypeParam new_array[kNewLength];
+ int16_t new_array[kNewLength];
// Set array elements to {100, 101, 102, ... }.
for (int i = 0; i < kNewLength; ++i) {
new_array[i] = 100 + i;
}
- int insert_position = this->array_length();
+ int insert_position = array_length();
vec.InsertAt(new_array, kNewLength, insert_position);
// Verify that the vector looks as follows:
// {0, 1, ..., kLength - 1, 100, 101, ..., 100 + kNewLength - 1 }.
size_t pos = 0;
- for (size_t i = 0; i < this->array_length(); ++i) {
- EXPECT_EQ(this->array_[i], vec[pos]);
+ for (size_t i = 0; i < array_length(); ++i) {
+ EXPECT_EQ(array_[i], vec[pos]);
++pos;
}
for (int i = 0; i < kNewLength; ++i) {
@@ -295,22 +281,22 @@
// an error. The expected outcome is the same as if the vector end was used as
// input position. That is, the input position should be capped at the maximum
// allowed value.
-TYPED_TEST(AudioVectorTest, InsertBeyondEnd) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, InsertBeyondEnd) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
static const int kNewLength = 5;
- TypeParam new_array[kNewLength];
+ int16_t new_array[kNewLength];
// Set array elements to {100, 101, 102, ... }.
for (int i = 0; i < kNewLength; ++i) {
new_array[i] = 100 + i;
}
- int insert_position = this->array_length() + 10; // Too large.
+ int insert_position = array_length() + 10; // Too large.
vec.InsertAt(new_array, kNewLength, insert_position);
// Verify that the vector looks as follows:
// {0, 1, ..., kLength - 1, 100, 101, ..., 100 + kNewLength - 1 }.
size_t pos = 0;
- for (size_t i = 0; i < this->array_length(); ++i) {
- EXPECT_EQ(this->array_[i], vec[pos]);
+ for (size_t i = 0; i < array_length(); ++i) {
+ EXPECT_EQ(array_[i], vec[pos]);
++pos;
}
for (int i = 0; i < kNewLength; ++i) {
@@ -321,11 +307,11 @@
// Test the OverwriteAt method with a position such that all of the new values
// fit within the old vector.
-TYPED_TEST(AudioVectorTest, OverwriteAt) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, OverwriteAt) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
static const int kNewLength = 5;
- TypeParam new_array[kNewLength];
+ int16_t new_array[kNewLength];
// Set array elements to {100, 101, 102, ... }.
for (int i = 0; i < kNewLength; ++i) {
new_array[i] = 100 + i;
@@ -337,38 +323,38 @@
// |insert_position|, |insert_position| + 1, ..., kLength - 1}.
size_t pos = 0;
for (pos = 0; pos < insert_position; ++pos) {
- EXPECT_EQ(this->array_[pos], vec[pos]);
+ EXPECT_EQ(array_[pos], vec[pos]);
}
for (int i = 0; i < kNewLength; ++i) {
EXPECT_EQ(new_array[i], vec[pos]);
++pos;
}
- for (; pos < this->array_length(); ++pos) {
- EXPECT_EQ(this->array_[pos], vec[pos]);
+ for (; pos < array_length(); ++pos) {
+ EXPECT_EQ(array_[pos], vec[pos]);
}
}
// Test the OverwriteAt method with a position such that some of the new values
// extend beyond the end of the current vector. This is valid, and the vector is
// expected to expand to accommodate the new values.
-TYPED_TEST(AudioVectorTest, OverwriteBeyondEnd) {
- AudioVector<TypeParam> vec;
- vec.PushBack(this->array_, this->array_length());
+TEST_F(AudioVectorTest, OverwriteBeyondEnd) {
+ AudioVector<int16_t> vec;
+ vec.PushBack(array_, array_length());
static const int kNewLength = 5;
- TypeParam new_array[kNewLength];
+ int16_t new_array[kNewLength];
// Set array elements to {100, 101, 102, ... }.
for (int i = 0; i < kNewLength; ++i) {
new_array[i] = 100 + i;
}
- int insert_position = this->array_length() - 2;
+ int insert_position = array_length() - 2;
vec.OverwriteAt(new_array, kNewLength, insert_position);
- ASSERT_EQ(this->array_length() - 2u + kNewLength, vec.Size());
+ ASSERT_EQ(array_length() - 2u + kNewLength, vec.Size());
// Verify that the vector looks as follows:
// {0, ..., |insert_position| - 1, 100, 101, ..., 100 + kNewLength - 1,
// |insert_position|, |insert_position| + 1, ..., kLength - 1}.
int pos = 0;
for (pos = 0; pos < insert_position; ++pos) {
- EXPECT_EQ(this->array_[pos], vec[pos]);
+ EXPECT_EQ(array_[pos], vec[pos]);
}
for (int i = 0; i < kNewLength; ++i) {
EXPECT_EQ(new_array[i], vec[pos]);
@@ -378,11 +364,11 @@
EXPECT_EQ(vec.Size(), static_cast<size_t>(pos));
}
-TYPED_TEST(AudioVectorTest, CrossFade) {
+TEST_F(AudioVectorTest, CrossFade) {
static const size_t kLength = 100;
static const size_t kFadeLength = 10;
- AudioVector<TypeParam> vec1(kLength);
- AudioVector<TypeParam> vec2(kLength);
+ AudioVector<int16_t> vec1(kLength);
+ AudioVector<int16_t> vec2(kLength);
// Set all vector elements to 0 in |vec1| and 100 in |vec2|.
for (size_t i = 0; i < kLength; ++i) {
vec1[i] = 0;