blob: 3fa70d739f4a06ef58c93cd1210a649a3a580569 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
https://github.com/Exiv2/exiv2/commit/82adcb1f86def0555b25713a8b84dba84944b275 (1)
https://github.com/Exiv2/exiv2/commit/7d8cd00778c3eee9f32af04b009d8a5651eb53e7 (2)
This is basically just commit (1). Though it wasn't directly applicable so I just merged it with (2).
Easier and it makes the file same as upstream.
diff -u b/unitTests/test_futils.cpp b/unitTests/test_futils.cpp
--- b/unitTests/test_futils.cpp
+++ b/unitTests/test_futils.cpp
@@ -42,21 +42,8 @@
std::string tmpFile("tmp.dat");
std::ofstream auxFile(tmpFile.c_str());
auxFile.close();
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(__MSYS__)
- const char * expectedString = "No error (errno = 0)";
-#elif defined(__APPLE__)
- const char * expectedString = "Undefined error: 0 (errno = 0)";
-#elif defined(__sun__)
- const char * expectedString = "Error 0 (errno = 0)";
-#elif defined(__FreeBSD__)
- const char * expectedString = "No error: 0 (errno = 0)";
-#elif defined(__NetBSD__)
- const char * expectedString = "Undefined error: 0 (errno = 0)";
-#else
- const char * expectedString = "Success (errno = 0)";
-#endif
std::remove(tmpFile.c_str());
- ASSERT_STREQ(expectedString, strError().c_str());
+ ASSERT_TRUE(strError().find("(errno = 0)") != std::string::npos);
}
TEST(strError, returnNoSuchFileOrDirectoryWhenTryingToOpenNonExistingFile)
@@ -68,22 +55,7 @@
TEST(strError, doNotRecognizeUnknownError)
{
errno = 9999;
-#if defined(__MINGW__) || defined(__MSYS__) || defined(__CYGWIN__)
- const char * expectedString = "Unknown error 9999 (errno = 9999)";
-#elif defined(_WIN32)
- const char * expectedString = "Unknown error (errno = 9999)";
-#elif defined(__APPLE__)
- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
-#elif defined(__sun__)
- const char * expectedString = "Unknown error (errno = 9999)";
-#elif defined(__FreeBSD__)
- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
-#elif defined(__NetBSD__)
- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
-#else
- const char * expectedString = "Unknown error 9999 (errno = 9999)";
-#endif
- ASSERT_STREQ(expectedString, strError().c_str());
+ ASSERT_TRUE(strError().find("(errno = 9999)") != std::string::npos);
}
TEST(getEnv, getsDefaultValueWhenExpectedEnvVariableDoesNotExist)
|
