third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtest - remove wrapper which is not needed anymore

Browse Source
This commit is contained in:
Luis Díaz Más 2021-04-22 21:33:20 +02:00
parent f601d23d5e
commit db4ece70cc
17 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
unitTests/CMakeLists.txt
View File

@ -34,7 +34,6 @@ add_executable(unit_tests
test_tiffheader.cpp test_tiffheader.cpp
test_types.cpp test_types.cpp
test_LangAltValueRead.cpp test_LangAltValueRead.cpp
gtestwrapper.h
${unit_tests_exiv2lib_SOURCES} ${unit_tests_exiv2lib_SOURCES}
) )

15
unitTests/gtestwrapper.h
View File

@ -1,15 +0,0 @@
#ifndef GTESTWRAPPER_H_
#define GTESTWRAPPER_H_
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4251)
#pragma warning(disable : 4275)
#pragma warning(disable : 4996)
#endif
#include <gtest/gtest.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif // #ifndef GTESTWRAPPER_H_

2
unitTests/mainTestRunner.cpp
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/ */
#include "gtestwrapper.h" #include <gtest/gtest.h>
#include <iostream> #include <iostream>
int main(int argc, char** argv) int main(int argc, char** argv)

3
unitTests/test_DateValue.cpp
View File

@ -19,7 +19,8 @@
*/ */
#include "value.hpp" #include "value.hpp"
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;
TEST(ADateValue, isDefaultConstructed) TEST(ADateValue, isDefaultConstructed)

2
unitTests/test_LangAltValueRead.cpp
View File

@ -20,7 +20,7 @@
#include <exiv2/exiv2.hpp> #include <exiv2/exiv2.hpp>
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;

2
unitTests/test_TimeValue.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include "value.hpp" #include "value.hpp"
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;
TEST(ATimeValue, isDefaultConstructed) TEST(ATimeValue, isDefaultConstructed)

3
unitTests/test_XmpKey.cpp
View File

@ -20,7 +20,8 @@
#include <exiv2/error.hpp> #include <exiv2/error.hpp>
#include <exiv2/properties.hpp> #include <exiv2/properties.hpp>
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;
namespace namespace

3
unitTests/test_basicio.cpp
View File

@ -19,7 +19,8 @@
*/ */
#include <exiv2/basicio.hpp> #include <exiv2/basicio.hpp>
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;
TEST(MemIo, seek_out_of_bounds_00) TEST(MemIo, seek_out_of_bounds_00)

5
unitTests/test_cr2header_int.cpp
View File

@ -19,7 +19,8 @@
*/ */
#include "cr2header_int.hpp" #include "cr2header_int.hpp"
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;
static const byte cr2LittleEndian[] = {0x49, 0x49, 0x2a, 0x00, 0x10, 0x00, 0x00, 0x00, static const byte cr2LittleEndian[] = {0x49, 0x49, 0x2a, 0x00, 0x10, 0x00, 0x00, 0x00,
@ -75,4 +76,4 @@ TEST(ACr2Header, failToReadDataFromBufferWithInvalidTag)
0x43, 0x52, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}; 0x43, 0x52, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00};
Internal::Cr2Header header; Internal::Cr2Header header;
ASSERT_FALSE(header.read(bufferInvalidTag, 16)); ASSERT_FALSE(header.read(bufferInvalidTag, 16));
} }

2
unitTests/test_enforce.cpp
View File

@ -21,7 +21,7 @@
#include <exiv2/exiv2.hpp> #include <exiv2/exiv2.hpp>
#include <enforce.hpp> #include <enforce.hpp>
#include "gtestwrapper.h" #include <gtest/gtest.h>
#include <stdexcept> #include <stdexcept>

2
unitTests/test_futils.cpp
View File

@ -28,7 +28,7 @@
#include <cerrno> #include <cerrno>
#include <stdexcept> #include <stdexcept>
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;

2
unitTests/test_helper_functions.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include "helper_functions.hpp" #include "helper_functions.hpp"
#include "gtestwrapper.h" #include <gtest/gtest.h>
TEST(string_from_unterminated, terminatedArray) TEST(string_from_unterminated, terminatedArray)
{ {

2
unitTests/test_image_int.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include <exiv2/exiv2.hpp> #include <exiv2/exiv2.hpp>
#include "gtestwrapper.h" #include <gtest/gtest.h>
#include <image_int.hpp> #include <image_int.hpp>
using namespace Exiv2::Internal; using namespace Exiv2::Internal;

3
unitTests/test_safe_op.cpp
View File

@ -19,7 +19,8 @@
*/ */
#include <safe_op.hpp> #include <safe_op.hpp>
#include "gtestwrapper.h" #include <gtest/gtest.h>
namespace si = Safe::Internal; namespace si = Safe::Internal;
/*! /*!

3
unitTests/test_slice.cpp
View File

@ -22,7 +22,8 @@
#include <stdint.h> #include <stdint.h>
#include "slice.hpp" #include "slice.hpp"
#include "types.hpp" #include "types.hpp"
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;
template <typename T> template <typename T>

4
unitTests/test_tiffheader.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include <tiffimage_int.hpp> #include <tiffimage_int.hpp>
#include "gtestwrapper.h" #include <gtest/gtest.h>
#include <sstream> #include <sstream>
using namespace Exiv2; using namespace Exiv2;
@ -80,4 +80,4 @@ TEST_F(ATiffHeader, printsDefaultValues)
std::ostringstream str; std::ostringstream str;
header.print(str, ""); header.print(str, "");
ASSERT_STREQ("TIFF header, offset = 0x00000008, little endian encoded\n", str.str().c_str()); ASSERT_STREQ("TIFF header, offset = 0x00000008, little endian encoded\n", str.str().c_str());
} }

2
unitTests/test_types.cpp
View File

@ -21,7 +21,7 @@
#include <exiv2/types.hpp> #include <exiv2/types.hpp>
#include <cmath> #include <cmath>
#include <limits> #include <limits>
#include "gtestwrapper.h" #include <gtest/gtest.h>
using namespace Exiv2; using namespace Exiv2;
// More info about tm : http://www.cplusplus.com/reference/ctime/tm/ // More info about tm : http://www.cplusplus.com/reference/ctime/tm/