diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-12 10:32:05 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-12 10:32:05 +0200 |
| commit | ea50fdfe2fc21757412baf448b2d41b3ce34b626 (patch) | |
| tree | 8910d5504be3cb1952ce33bbabbc0c02a832c735 /test | |
| parent | 851d681d0af7f3346d77738e4708b21ed6e2cc98 (diff) | |
| parent | f5a34606b4a910e7b7b984940fb2d12681a2dd3b (diff) | |
lots of cppcheck fixes
Diffstat (limited to 'test')
| -rw-r--r-- | test/libapt/assert.h | 8 | ||||
| -rw-r--r-- | test/libapt/getarchitectures_test.cc | 7 | ||||
| -rw-r--r-- | test/libapt/getlanguages_test.cc | 7 | ||||
| -rw-r--r-- | test/libapt/getlistoffilesindir_test.cc | 7 | ||||
| -rw-r--r-- | test/test_udevcdrom.cc | 2 |
5 files changed, 9 insertions, 22 deletions
diff --git a/test/libapt/assert.h b/test/libapt/assert.h index 92b662dfa..fae9b6c64 100644 --- a/test/libapt/assert.h +++ b/test/libapt/assert.h @@ -53,3 +53,11 @@ void assertEqualsOr2(int const &expect1, int const &expect2, unsigned int const assertEqualsOr2<unsigned int const&, unsigned int const&>(expect1, expect2, get, line); } + +// simple helper to quickly output a vectors +template < typename X > +void dumpVector(X vec) { + for (typename X::const_iterator v = vec.begin(); + v != vec.end(); ++v) + std::cout << *v << std::endl; +} diff --git a/test/libapt/getarchitectures_test.cc b/test/libapt/getarchitectures_test.cc index e3ca7bbc2..807469263 100644 --- a/test/libapt/getarchitectures_test.cc +++ b/test/libapt/getarchitectures_test.cc @@ -7,13 +7,6 @@ #include <iostream> -// simple helper to quickly output a vector of strings -void dumpVector(std::vector<std::string> vec) { - for (std::vector<std::string>::const_iterator v = vec.begin(); - v != vec.end(); v++) - std::cout << *v << std::endl; -} - int main(int argc,char *argv[]) { std::vector<std::string> vec; diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index 3d63e0e74..f6aa7a697 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -7,13 +7,6 @@ #include <iostream> -// simple helper to quickly output a vector of strings -void dumpVector(std::vector<std::string> vec) { - for (std::vector<std::string>::const_iterator v = vec.begin(); - v != vec.end(); v++) - std::cout << *v << std::endl; -} - int main(int argc,char *argv[]) { if (argc != 2) { diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc index ed8d2dad6..5ee014cca 100644 --- a/test/libapt/getlistoffilesindir_test.cc +++ b/test/libapt/getlistoffilesindir_test.cc @@ -7,13 +7,6 @@ #include <stdio.h> #include <iostream> -// simple helper to quickly output a vector of strings -void dumpVector(std::vector<std::string> vec) { - for (std::vector<std::string>::const_iterator v = vec.begin(); - v != vec.end(); v++) - std::cout << *v << std::endl; -} - #define P(x) string(argv[1]).append("/").append(x) int main(int argc,char *argv[]) diff --git a/test/test_udevcdrom.cc b/test/test_udevcdrom.cc index e65c7a297..577e2d013 100644 --- a/test/test_udevcdrom.cc +++ b/test/test_udevcdrom.cc @@ -10,7 +10,7 @@ int main() vector<CdromDevice> l; l = c.Scan(); - assert(l.size() > 0); + assert(l.empty() == false); for (i=0;i<l.size();i++) std::cerr << l[i].DeviceName << " " << l[i].Mounted << " " |