# HG changeset patch # User Sebastien Jodogne # Date 1347780835 -7200 # Node ID f1d0470ff3349c53ce909d00b82b84e87a2ad593 # Parent a70bb32802aeb721549298e651f2d238988ba6c0 renaming unittests diff -r a70bb32802ae -r f1d0470ff334 UnitTests/SQLite.cpp --- a/UnitTests/SQLite.cpp Sun Sep 16 09:33:19 2012 +0200 +++ b/UnitTests/SQLite.cpp Sun Sep 16 09:33:55 2012 +0200 @@ -6,7 +6,7 @@ #include -using namespace Palanthir; +using namespace Orthanc; TEST(SQLite, Configuration) diff -r a70bb32802ae -r f1d0470ff334 UnitTests/SQLiteChromium.cpp --- a/UnitTests/SQLiteChromium.cpp Sun Sep 16 09:33:19 2012 +0200 +++ b/UnitTests/SQLiteChromium.cpp Sun Sep 16 09:33:55 2012 +0200 @@ -7,7 +7,7 @@ #include -using namespace Palanthir; +using namespace Orthanc; @@ -192,7 +192,7 @@ // handler to be called with SQLITE_MISMATCH as error code. SQLite::Statement s(db(), "INSERT INTO foo (a) VALUES (?)"); s.BindCString(0, "bad bad"); - EXPECT_THROW(s.Run(), PalanthirException); + EXPECT_THROW(s.Run(), OrthancException); } TEST_F(SQLStatementTest, Reset) { @@ -330,7 +330,7 @@ EXPECT_EQ(1, db().GetTransactionNesting()); { SQLite::Transaction inner3(db()); - EXPECT_THROW(inner3.Begin(), PalanthirException); + EXPECT_THROW(inner3.Begin(), OrthancException); EXPECT_EQ(1, db().GetTransactionNesting()); } } diff -r a70bb32802ae -r f1d0470ff334 UnitTests/Versions.cpp --- a/UnitTests/Versions.cpp Sun Sep 16 09:33:19 2012 +0200 +++ b/UnitTests/Versions.cpp Sun Sep 16 09:33:55 2012 +0200 @@ -27,7 +27,7 @@ } -#if PALANTHIR_STATIC == 1 +#if ORTHANC_STATIC == 1 TEST(Versions, ZlibStatic) { ASSERT_STREQ("1.2.7", zlibVersion()); @@ -57,7 +57,7 @@ // Check that SSL support is enabled when required bool curlSupportsSsl = vinfo->features & CURL_VERSION_SSL; -#if PALANTHIR_SSL_ENABLED == 0 +#if ORTHANC_SSL_ENABLED == 0 ASSERT_FALSE(curlSupportsSsl); #else ASSERT_TRUE(curlSupportsSsl); diff -r a70bb32802ae -r f1d0470ff334 UnitTests/main.cpp --- a/UnitTests/main.cpp Sun Sep 16 09:33:19 2012 +0200 +++ b/UnitTests/main.cpp Sun Sep 16 09:33:55 2012 +0200 @@ -5,15 +5,15 @@ #include "../Core/Compression/ZlibCompressor.h" #include "../Core/DicomFormat/DicomTag.h" #include "../Core/FileStorage.h" -#include "../PalanthirCppClient/HttpClient.h" +#include "../OrthancCppClient/HttpClient.h" #include "../Core/HttpServer/HttpHandler.h" -#include "../Core/PalanthirException.h" +#include "../Core/OrthancException.h" #include "../Core/Toolbox.h" #include "../Core/Uuid.h" -#include "../PalanthirServer/FromDcmtkBridge.h" -#include "../PalanthirServer/PalanthirInitialization.h" +#include "../OrthancServer/FromDcmtkBridge.h" +#include "../OrthancServer/OrthancInitialization.h" -using namespace Palanthir; +using namespace Orthanc; TEST(Uuid, Generation) @@ -186,8 +186,8 @@ ASSERT_EQ(1u, c.size()); ASSERT_EQ("hello", c[0]); - ASSERT_THROW(Toolbox::SplitUriComponents(c, ""), PalanthirException); - ASSERT_THROW(Toolbox::SplitUriComponents(c, "a"), PalanthirException); + ASSERT_THROW(Toolbox::SplitUriComponents(c, ""), OrthancException); + ASSERT_THROW(Toolbox::SplitUriComponents(c, "a"), OrthancException); } @@ -275,9 +275,9 @@ int main(int argc, char **argv) { - PalanthirInitialize(); + OrthancInitialize(); ::testing::InitGoogleTest(&argc, argv); int result = RUN_ALL_TESTS(); - PalanthirFinalize(); + OrthancFinalize(); return result; }