diff options
Diffstat (limited to 'project2/ice/unittests/testClient.cpp')
| -rw-r--r-- | project2/ice/unittests/testClient.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/project2/ice/unittests/testClient.cpp b/project2/ice/unittests/testClient.cpp index 5abedd7..814a4d4 100644 --- a/project2/ice/unittests/testClient.cpp +++ b/project2/ice/unittests/testClient.cpp @@ -1,6 +1,6 @@ #define BOOST_TEST_MODULE Client #include <boost/test/unit_test.hpp> -#include <boost/filesystem/operations.hpp> +#include <filesystem> #include "iceClient.h" #include <Ice/ObjectAdapter.h> #include <Ice/Service.h> @@ -17,8 +17,8 @@ #define XSTR(s) STR(s) #define STR(s) #s -const auto bindir = boost::filesystem::canonical("/proc/self/exe").parent_path(); -const boost::filesystem::path iceroot(XSTR(ROOT)); +const auto bindir = std::filesystem::canonical("/proc/self/exe").parent_path(); +const std::filesystem::path iceroot(XSTR(ROOT)); const auto headers = iceroot.parent_path().parent_path(); BOOST_TEST_DONT_PRINT_LOG_VALUE( ::UnitTestComplex::Date ); @@ -150,24 +150,24 @@ unloadTests() BOOST_REQUIRE_THROW(RowSetFactory::get("UnitTestComplex-ComplexInterface-ComplexRow"), AdHoc::NoSuchPluginException); } -void test_client_run(ExecContext *, const boost::filesystem::path & tmpdir); +void test_client_run(ExecContext *, const std::filesystem::path & tmpdir); BOOST_FIXTURE_TEST_SUITE( Core, TestAppInstance ); BOOST_AUTO_TEST_CASE( test_client ) { - const boost::filesystem::path tmpdir = "/tmp/ut/project2.slice-client"; + const std::filesystem::path tmpdir = "/tmp/ut/project2.slice-client"; BOOST_TEST_CHECKPOINT("Clean up"); - boost::filesystem::remove_all(tmpdir); + std::filesystem::remove_all(tmpdir); test_client_run(this, tmpdir); test_client_run(this, tmpdir); - boost::filesystem::remove_all(tmpdir); + std::filesystem::remove_all(tmpdir); } BOOST_AUTO_TEST_SUITE_END(); -void test_client_run(ExecContext * ec, const boost::filesystem::path & tmpdir) +void test_client_run(ExecContext * ec, const std::filesystem::path & tmpdir) { BOOST_TEST_CHECKPOINT("Configure, compile, link, load"); TestOptionsSource::LoadTestOptions({ @@ -178,16 +178,16 @@ void test_client_run(ExecContext * ec, const boost::filesystem::path & tmpdir) { "ice.client.slicerclient", (iceroot / "unittestTypes.ice").string() }, { "ice.client.slicerclient", (iceroot / "unittest.ice").string() } }); - BOOST_REQUIRE(!boost::filesystem::exists(tmpdir / "unittest.so")); - BOOST_REQUIRE(boost::filesystem::exists(tmpdir / "unittest.client.so")); - BOOST_REQUIRE(!boost::filesystem::exists(tmpdir / "unittestTypes.so")); - BOOST_REQUIRE(!boost::filesystem::exists(tmpdir / "unittestTypes.client.so")); - BOOST_REQUIRE(!boost::filesystem::exists(tmpdir / "unittestComplex.so")); - BOOST_REQUIRE(boost::filesystem::exists(tmpdir / "unittestComplex.client.so")); + BOOST_REQUIRE(!std::filesystem::exists(tmpdir / "unittest.so")); + BOOST_REQUIRE(std::filesystem::exists(tmpdir / "unittest.client.so")); + BOOST_REQUIRE(!std::filesystem::exists(tmpdir / "unittestTypes.so")); + BOOST_REQUIRE(!std::filesystem::exists(tmpdir / "unittestTypes.client.so")); + BOOST_REQUIRE(!std::filesystem::exists(tmpdir / "unittestComplex.so")); + BOOST_REQUIRE(std::filesystem::exists(tmpdir / "unittestComplex.client.so")); commonTests(ec); TestOptionsSource::LoadTestOptions({ }); unloadTests(); - boost::filesystem::remove_all(tmpdir); + std::filesystem::remove_all(tmpdir); } |