aboutsummaryrefslogtreecommitdiff
path: root/paludis/util/safe_ifstream_TEST.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-24 13:28:45 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-24 15:47:41 +0100
commit49750cc61904ba17060521bd345c6ae526fb1bf8 (patch)
tree8aa8c06a7d6ec58c62dd0741011e8357a19c8b8d /paludis/util/safe_ifstream_TEST.cc
parent75f48bbb1ae368febe984c10c2db2d0b5cbd7cec (diff)
downloadpaludis-49750cc61904ba17060521bd345c6ae526fb1bf8.tar.gz
paludis-49750cc61904ba17060521bd345c6ae526fb1bf8.tar.xz
FSEntry -> FSPath, FSStat
Fixes: ticket:967
Diffstat (limited to 'paludis/util/safe_ifstream_TEST.cc')
-rw-r--r--paludis/util/safe_ifstream_TEST.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/paludis/util/safe_ifstream_TEST.cc b/paludis/util/safe_ifstream_TEST.cc
index 8456b51..c22b1fd 100644
--- a/paludis/util/safe_ifstream_TEST.cc
+++ b/paludis/util/safe_ifstream_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009 Ciaran McCreesh
+ * Copyright (c) 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -18,7 +18,7 @@
*/
#include <paludis/util/safe_ifstream.hh>
-#include <paludis/util/fs_entry.hh>
+#include <paludis/util/fs_path.hh>
#include <test/test_runner.hh>
#include <test/test_framework.hh>
#include <unistd.h>
@@ -35,7 +35,7 @@ namespace test_cases
void run()
{
- SafeIFStream s(FSEntry::cwd() / "safe_ifstream_TEST_dir" / "existing");
+ SafeIFStream s(FSPath::cwd() / "safe_ifstream_TEST_dir" / "existing");
TEST_CHECK(s);
std::string t;
s >> t;
@@ -62,7 +62,7 @@ namespace test_cases
void run()
{
- SafeIFStream s(FSEntry::cwd() / "safe_ifstream_TEST_dir" / "existing");
+ SafeIFStream s(FSPath::cwd() / "safe_ifstream_TEST_dir" / "existing");
TEST_CHECK(s);
std::string t;
s >> t;
@@ -79,7 +79,7 @@ namespace test_cases
void run()
{
- TEST_CHECK_THROWS(SafeIFStream(FSEntry::cwd() / "safe_ifstream_TEST_dir" / "existing_dir"), SafeIFStreamError);
+ TEST_CHECK_THROWS(SafeIFStream(FSPath::cwd() / "safe_ifstream_TEST_dir" / "existing_dir"), SafeIFStreamError);
}
} test_existing_dir;
@@ -94,7 +94,7 @@ namespace test_cases
void run()
{
- TEST_CHECK_THROWS(SafeIFStream(FSEntry::cwd() / "safe_ifstream_TEST_dir" / "existing_perm"), SafeIFStreamError);
+ TEST_CHECK_THROWS(SafeIFStream(FSPath::cwd() / "safe_ifstream_TEST_dir" / "existing_perm"), SafeIFStreamError);
}
} test_existing_perm;
@@ -104,7 +104,7 @@ namespace test_cases
void run()
{
- TEST_CHECK_THROWS(SafeIFStream(FSEntry::cwd() / "safe_ofstream_TEST_dir" / "noent"), SafeIFStreamError);
+ TEST_CHECK_THROWS(SafeIFStream(FSPath::cwd() / "safe_ofstream_TEST_dir" / "noent"), SafeIFStreamError);
}
} test_existing_noent;
}