Changeset 2049

Timestamp:

Sep 4, 2009, 10:58:29 PM (14 years ago)

Author:

Peter

Message:

using strerror in error msg from OptionFile? (fixes #559)

Location:

trunk

Files:

• test/commandline_test.cc (modified) (9 diffs)
• yat/utility/OptionFile.cc (modified) (2 diffs)

trunk/test/commandline_test.cc

@@ -42 +42 @@
 bool test_file(yat::test::Suite& error);
 bool test_file2(yat::test::Suite& error);
+bool test_file3(yat::test::Suite& error);
+bool test_file3_(yat::test::Suite& error, const std::string&);
+bool test_file4(yat::test::Suite& error);
+bool test_file4_(yat::test::Suite& error, const std::string&);
 bool test_failures(yat::test::Suite& error);
 bool test_option_name_clash(yat::test::Suite& suite);
@@ -52 +56 @@
 
   suite.err() << "testing commandline" << std::endl;
+
+  // Peter, creation of this directory should perhaps be in a more central place
+  FileUtil dir("testSubDir");
+  if (!dir.exists())
+    if (mkdir(dir.path().c_str(), 0755)) {
+      suite.err() << "mkdir " << dir.path() << " failed\n";
+      return 1;
+    }
+  FileUtil subdir("testSubDir/commandline_test.dir");
+  if (!subdir.exists()) {
+    if (mkdir(subdir.path().c_str(), 0755)) {
+      suite.err() << "mkdir " << subdir.path() << " failed\n";
+      return 1;
+    }
+  }
+  if (subdir.permissions("w")) {
+    chmod(subdir.path().c_str(), S_IREAD | S_IWRITE | S_IEXEC);
+  }
 
   try {
@@ -59 +81 @@
     suite.add(test_file(suite));
     suite.add(test_file2(suite));
+    suite.add(test_file3(suite));
+    suite.add(test_file4(suite));
     suite.add(test_failures(suite));
     suite.add(test_option_name_clash(suite));
@@ -498 +522 @@
 }
 
+
 bool test_file2(yat::test::Suite& suite)
 {
@@ -508 +533 @@
   }
 
-  // Peter, creation of this directory should perhaps be in a more central place
-  FileUtil dir("testSubDir");
-  if (!dir.exists())
-    mkdir(dir.path().c_str(), 0755);
-
-  FileUtil subdir("testSubDir/commandline_test.dir");
+  FileUtil subdir("testSubDir/commandline_test.dir/write-protected");
   if (!subdir.exists()) {
     if (mkdir(subdir.path().c_str(), 0555)) {
@@ -526 +546 @@
     }
 
-  FileUtil file("testSubDir/commandline_test.dir/out.txt");
+  FileUtil file("testSubDir/commandline_test.dir/write-protected/out.txt");
   if (file.exists()) {
     suite.err() << "FileUtil::exists returns true unexpectedly\n";
@@ -545 +565 @@
     int ac = 3;
     char* av[] = { "test_prog", "--out", 
-                   "testSubDir/commandline_test.dir/out.txt"};
+                   "testSubDir/commandline_test.dir/write-protected/out.txt"};
     try {
       cmd.parse(ac,av);
@@ -558 +578 @@
   return ok;
 }
+
+
+bool test_file3(yat::test::Suite& suite)
+{
+  suite.err() << "Testing OptionFile in non-existing tree\n";
+  // testing error message from OptionFile when tree is not existing
+  bool ok=true;
+  ok &= test_file3_(suite, "r");
+  ok &= test_file3_(suite, "w");
+  ok &= test_file3_(suite, "x");
+  ok &= test_file3_(suite, "d");
+  return ok;
+}
+
+
+bool test_file3_(yat::test::Suite& suite, const std::string& perm)
+{
+  CommandLine cmd;
+  OptionFile file(cmd, "file", "", true, false, perm);
+
+  suite.err() << "Testing OptionFile '" << perm << "' ... "; 
+  try {
+    int ac = 3;
+    char* av[] = { "test_prog", "--file", "sjhgaw/jmegb/tmp.tmpx"};
+    cmd.parse(ac,av);
+    suite.err() << "no\n";
+    return false;
+  }
+  catch (cmd_error& e) {
+    suite.err() << "ok\n";
+    suite.err() << "catch expected error: " << e.what() << "\n";
+  }
+  return true;
+}
+
+
+bool test_file4(yat::test::Suite& suite)
+{
+  FileUtil file("testSubDir/commandline_test.dir/test_file4.txt");
+  if (!file.exists()) {
+    std::ofstream os(file.path().c_str());
+  } 
+  chmod(file.path().c_str(), 0);
+
+  suite.err() << "Testing OptionFile with no permssions\n";
+  bool ok=true;
+  ok &= test_file4_(suite, "r");
+  ok &= test_file4_(suite, "w");
+  ok &= test_file4_(suite, "x");
+  ok &= test_file4_(suite, "d");
+  return ok;
+}
+
+
+bool test_file4_(yat::test::Suite& suite, const std::string& perm)
+{
+  CommandLine cmd;
+  OptionFile file(cmd, "file", "", true, false, perm);
+
+  suite.err() << "Testing OptionFile '" << perm << "' ... "; 
+  try {
+    int ac = 3;
+    char* av[] = { "test_prog", "--file", 
+                   "testSubDir/commandline_test.dir/test_file4.txt"};
+    cmd.parse(ac,av);
+    suite.err() << "no\n";
+    return false;
+  }
+  catch (cmd_error& e) {
+    suite.err() << "ok\n";
+    suite.err() << "catch expected error: " << e.what() << "\n";
+  }
+  return true;
+}
+
 
 bool test_option_name_clash(yat::test::Suite& suite)
@@ -587 +682 @@
   return ok;
 }
+
 
 bool test_free_arg(yat::test::Suite& suite)

trunk/yat/utility/OptionFile.cc

@@ -69 +69 @@
         if (*iter=='r' && fu.permissions("r")){
           std::stringstream ss;
-          ss << "cannot open `" << value() << "' for reading: Permission denied";
+          ss << "cannot open `" << value() << "' for reading: " 
+             << strerror(errno);
           throw cmd_error(ss.str());
         }
@@ -75 +76 @@
           std::stringstream ss;
           ss << "cannot create file `" << value() 
-             << "': Permission denied";
-          throw cmd_error(ss.str());
-        }
-        else if (*iter=='d' && fu.permissions("d")){
-          std::stringstream ss;
-          ss << value() 
-             << "': Not a directory";
+             << "': " << strerror(errno);
           throw cmd_error(ss.str());
         }
       }
       std::stringstream ss;
-      ss << value() << ": Permission denied";
+      ss << "`" << value() << "': " << strerror(errno);
       throw cmd_error(ss.str());
     }