# 
# patch "ChangeLog"
#  from [69955d161199f61a262d1d4c050f8d151b5352e7]
#    to [78ac18407ca101a18ae1c849237449cbb40708c3]
# 
# patch "paths.cc"
#  from [5459f9585f202f921b133f0b1d6aba09c61a5c4e]
#    to [4047d856b080f6c771000eb85d6a199d8016a0c6]
# 
========================================================================
--- ChangeLog	69955d161199f61a262d1d4c050f8d151b5352e7
+++ ChangeLog	78ac18407ca101a18ae1c849237449cbb40708c3
@@ -1,4 +1,9 @@
 2005-08-24  Nathaniel Smith  <address@hidden>
+	
+	* paths.cc: Update tests to use path_state_* and pass utf8
+	objects.
+	
+2005-08-24  Nathaniel Smith  <address@hidden>
 
 	* paths.hh (file_path_external): Take a utf8() object, always.
 
========================================================================
--- paths.cc	5459f9585f202f921b133f0b1d6aba09c61a5c4e
+++ paths.cc	4047d856b080f6c771000eb85d6a199d8016a0c6
@@ -274,10 +274,10 @@
                             0 };
   path_prefix = "";
   for (char const ** c = baddies; *c; ++c)
-    BOOST_CHECK_THROW(file_path(internal, *c), logic_error);
+    BOOST_CHECK_THROW(file_path_internal(*c), logic_error);
   path_prefix = "blah/blah/blah";
   for (char const ** c = baddies; *c; ++c)
-    BOOST_CHECK_THROW(file_path(internal, *c), logic_error);
+    BOOST_CHECK_THROW(file_path_internal(*c), logic_error);
 
   char const * goodies[] = {"",
                             "foo",
@@ -295,7 +295,7 @@
       path_prefix = (i ? "" : "blah/blah/blah");
       for (char const ** c = baddies; *c; ++c)
         {
-          file_path fp(file_path::internal, *c);
+          file_path fp = file_path_internal(*c);
           BOOST_CHECK(fp.as_internal() == *c);
           BOOST_CHECK(file_path(fp.as_internal()) == fp);
           std::vector<path_component> split_test;
@@ -315,7 +315,7 @@
 {
   file_path fp(file_path::external, before);
   BOOST_CHECK(fp.as_internal() == after);
-  BOOST_CHECK(file_path(internal, fp.as_internal()) == after);
+  BOOST_CHECK(file_path_internal(fp.as_internal()) == after);
   // we compare after to the external form too, since as far as we know
   // relative normalized posix paths are always good win32 paths too
   BOOST_CHECK(fp.as_external() == after);
@@ -343,7 +343,7 @@
                             "c:/foo",
                             0 };
   for (char const ** c = baddies; *c; ++c)
-    BOOST_CHECK_THROW(file_path(external, *c), informative_failure);
+    BOOST_CHECK_THROW(file_path_external(utf8(*c)), informative_failure);
   
   check_fp_normalizes_to("", "");
   check_fp_normalizes_to("foo", "foo");
@@ -381,7 +381,7 @@
                             "",
                             0 };
   for (char const ** c = baddies; *c; ++c)
-    BOOST_CHECK_THROW(file_path(external, *c), informative_failure);
+    BOOST_CHECK_THROW(file_path_external(utf8(*c)), informative_failure);
   
   check_fp_normalizes_to("foo", "a/b/foo");
   check_fp_normalizes_to("foo/bar", "a/b/foo/bar");
@@ -409,8 +409,8 @@
 
 static void test_split_join()
 {
-  file_path fp1(file_path::internal, "foo/bar/baz");
-  file_path fp2(file_path::internal, "bar/baz/foo");
+  file_path fp1 = file_path_internal("foo/bar/baz");
+  file_path fp2 = file_path_internal("bar/baz/foo");
   typedef std::vector<path_component> pcv;
   pcv split1, split2;
   fp1.split(split1);