Changeset 1432

Timestamp:

Dec 18, 2011, 6:36:40 PM (11 years ago)

Author:

Peter Johansson

Message:

implement file_name and directory_name. fixes #511

Location:

trunk

Files:

• lib/utility.cc (modified) (1 diff)
• lib/utility.h (modified) (1 diff)
• test/utility.cc (modified) (6 diffs)

trunk/lib/utility.cc

@@ -117 +117 @@
 
 
-  std::string directory_name(std::string path)
-  {
-    return dirname(path.c_str());
-  }
-
-
-  std::string file_name(const std::string& full_path)
-  {
-    return basename(full_path.c_str());
+  std::string directory_name(const std::string& path)
+  {
+    if (path.size()==1) {
+      if (path=="/")
+        return path;
+      else
+        return ".";
+    }
+    assert(path.size()>=2);
+    size_t pos = path.find_last_of('/', path.size()-2);
+    if (pos==std::string::npos)
+      return ".";
+    if (pos==0)
+      return "/";
+    return path.substr(0,pos);
+    return "";
+  }
+
+
+  std::string file_name(const std::string& path)
+  {
+    if (path.size()==1)
+      return path;
+    size_t pos = path.find_last_of('/');
+    if (pos==std::string::npos)
+      return path;
+    if (pos==path.size()-1)
+      return file_name(path.substr(0, path.size()-1));
+    return path.substr(pos+1);
   }
 

trunk/lib/utility.h

@@ -89 +89 @@
      \return directory of path.
    */
-  std::string directory_name(std::string path);
+  std::string directory_name(const std::string& path);
 
   ///

trunk/test/utility.cc

@@ -30 +30 @@
 #include <string>
 
+void test_directory_name(theplu::svndigest::test::Suite& suite);
+void test_file_name(theplu::svndigest::test::Suite& suite);
 bool test_hex(int, unsigned int, std::string);
 bool test_fnmatch(bool, std::string, std::string);
-bool test_regexp(bool, std::string, std::string, 
+bool test_regexp(bool, std::string, std::string,
                  const std::vector<std::string>&);
 
@@ -39 +41 @@
   theplu::svndigest::test::Suite suite(argc, argv);
   bool ok=true;
-  
-  ok &= test_hex(15,2, "0f"); 
-  ok &= test_hex(17,1, "1"); 
-  ok &= test_hex(16,2, "10"); 
-
-  ok &= test_fnmatch(true,"peter", "peter"); 
-  ok &= test_fnmatch(false,"peter", "peterj"); 
-
-  ok &= test_fnmatch(true,"*", "peterj"); 
-  ok &= test_fnmatch(true,"p*", "peterj"); 
-  ok &= test_fnmatch(true, "p*", "peter"); 
-  ok &= test_fnmatch(false, "p*j", "peter"); 
-  ok &= test_fnmatch(true, "p*j", "peterj"); 
-  ok &= test_fnmatch(true, "*peter", "peter"); 
-
-  ok &= test_fnmatch(true, "p?ter", "peter"); 
-  ok &= test_fnmatch(false, "p?er", "peter"); 
-  ok &= test_fnmatch(false, "p?eter", "peter"); 
+
+  ok &= test_hex(15,2, "0f");
+  ok &= test_hex(17,1, "1");
+  ok &= test_hex(16,2, "10");
+
+  ok &= test_fnmatch(true,"peter", "peter");
+  ok &= test_fnmatch(false,"peter", "peterj");
+
+  ok &= test_fnmatch(true,"*", "peterj");
+  ok &= test_fnmatch(true,"p*", "peterj");
+  ok &= test_fnmatch(true, "p*", "peter");
+  ok &= test_fnmatch(false, "p*j", "peter");
+  ok &= test_fnmatch(true, "p*j", "peterj");
+  ok &= test_fnmatch(true, "*peter", "peter");
+
+  ok &= test_fnmatch(true, "p?ter", "peter");
+  ok &= test_fnmatch(false, "p?er", "peter");
+  ok &= test_fnmatch(false, "p?eter", "peter");
 
   ok &= test_fnmatch(true, "filename", "filename");
@@ -77 +79 @@
 
   std::vector<std::string> vec;
-  ok &= test_regexp(true,"abcde", "abcde", vec); 
+  ok &= test_regexp(true,"abcde", "abcde", vec);
   vec.push_back("c");
-  ok &= test_regexp(true,"ab?de", "abcde", vec); 
+  ok &= test_regexp(true,"ab?de", "abcde", vec);
   vec[0] = "bcd";
-  ok &= test_regexp(true,"a*e", "abcde", vec); 
+  ok &= test_regexp(true,"a*e", "abcde", vec);
   vec.push_back("");
-  ok &= test_regexp(true,"a*d*f", "abcddf", vec); 
+  ok &= test_regexp(true,"a*d*f", "abcddf", vec);
   vec[0] = "bc";
   vec[1] = "ef";
-  ok &= test_regexp(true,"a*d*g", "abcdefg", vec); 
+  ok &= test_regexp(true,"a*d*g", "abcdefg", vec);
   vec.push_back("");
   vec[1]="e";
   vec[2]="f";
-  ok &= test_regexp(true,"a*d*?g", "abcdefg", vec); 
-  ok &= test_regexp(true,"a*d??g", "abcdefg", vec); 
+  ok &= test_regexp(true,"a*d*?g", "abcdefg", vec);
+  ok &= test_regexp(true,"a*d??g", "abcdefg", vec);
   vec.resize(2);
   vec[0]="f";
@@ -98 +100 @@
 
   suite.add(ok);
+  test_directory_name(suite);
+  test_file_name(suite);
   return suite.exit_status();
 }
+
+
+void test_directory_name(theplu::svndigest::test::Suite& suite)
+{
+  std::vector<std::string> path;
+  path.push_back("/usr/lib");
+  path.push_back("/usr/");
+  path.push_back("usr");
+  path.push_back("/");
+  path.push_back(".");
+  path.push_back("..");
+  std::vector<std::string> dir;
+  dir.push_back("/usr");
+  dir.push_back("/");
+  dir.push_back(".");
+  dir.push_back("/");
+  dir.push_back(".");
+  dir.push_back(".");
+  assert(dir.size()==path.size());
+  using theplu::svndigest::directory_name;
+  for (size_t i=0; i<dir.size(); ++i) {
+    if (dir[i] != directory_name(path[i])) {
+      suite.add(false);
+      suite.out() << "error:\n";
+      suite.out() << "path:           " << path[i] << "\n";
+      suite.out() << "directory_name: " << directory_name(path[i]) << "\n";
+      suite.out() << "expected:       " << dir[i] << "\n";
+    }
+  }
+}
+
+
+void test_file_name(theplu::svndigest::test::Suite& suite)
+{
+  std::vector<std::string> path;
+  path.push_back("/usr/lib");
+  path.push_back("/usr/");
+  path.push_back("usr");
+  path.push_back("/");
+  path.push_back(".");
+  path.push_back("..");
+  std::vector<std::string> file;
+  file.push_back("lib");
+  file.push_back("usr");
+  file.push_back("usr");
+  file.push_back("/");
+  file.push_back(".");
+  file.push_back("..");
+  assert(file.size()==path.size());
+  using theplu::svndigest::file_name;
+  for (size_t i=0; i<file.size(); ++i) {
+    if (file[i] != file_name(path[i])) {
+      suite.add(false);
+      suite.out() << "error:\n";
+      suite.out() << "path:           " << path[i] << "\n";
+      suite.out() << "file_name:      " << file_name(path[i]) << "\n";
+      suite.out() << "expected:       " << file[i] << "\n";
+    }
+  }
+}
+
 
 bool test_fnmatch(bool answ, std::string a, std::string b)
@@ -126 +191 @@
     return true;
   std::cerr << "hex(" << x << ", " << w << ") results "
-            << theplu::svndigest::hex(x,w) << ". Expects " << facit 
+            << theplu::svndigest::hex(x,w) << ". Expects " << facit
             << std::endl;
   return false;
 }
 
-bool test_regexp(bool ans, std::string a, std::string b, 
+bool test_regexp(bool ans, std::string a, std::string b,
                  const std::vector<std::string>& vec)
 {
@@ -141 +206 @@
               << res << ". Expected " << ans << "\n"
               << "resulting vector:\n";
-    std::copy(v.begin(), v.end(), 
+    std::copy(v.begin(), v.end(),
               std::ostream_iterator<std::string>(std::cerr, "\n"));
     std::cerr << "expected:\n";
-    std::copy(vec.begin(), vec.end(), 
+    std::copy(vec.begin(), vec.end(),
               std::ostream_iterator<std::string>(std::cerr, "\n"));
     return false;