FileLister: don't assume that all files have nonzero size in test case

ghewgill · ghewgill · commit b0ed595e249d · 2011-04-27T07:38:53.000+12:00
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -289,13 +289,11 @@ void FileLister::recursiveAddFiles2(std::vector<std::string> &relative,
                 relative.push_back(filename);
                 absolute.push_back(fname);
                 struct stat sb;
-                off_t size = 0;
                 if (stat(fname, &sb) == 0)
                 {
-                    size = sb.st_size;
+                    // Limitation: file sizes are assumed to fit in a 'long'
+                    filesizes[filename] = static_cast<long>(sb.st_size);
                 }
-                // Limitation: file sizes are assumed to fit in a 'long'
-                filesizes[filename] = static_cast<long>(size);
             }
 
 #ifndef PATH_MAX
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
@@ -55,11 +55,10 @@ class TestFileLister: public TestFixture
         std::map<std::string, long> filesizes;
         FileLister::recursiveAddFiles(filenames, filesizes, ".");
 
-        // Ensure a nonzero size is present for each listed file
+        // Ensure a size entry is present for each listed file
         for (std::vector<std::string>::const_iterator i = filenames.begin(); i != filenames.end(); ++i)
         {
             ASSERT(filesizes.find(*i) != filesizes.end());
-            ASSERT(filesizes[*i] > 0);
         }
 
         // In case there are leading "./"..

Original file line number	Diff line number	Diff line change
`@@ -289,13 +289,11 @@ void FileLister::recursiveAddFiles2(std::vector<std::string> &relative,`
`289`	`289`	`relative.push_back(filename);`
`290`	`290`	`absolute.push_back(fname);`
`291`	`291`	`struct stat sb;`
`292`		`- off_t size = 0;`
`293`	`292`	`if (stat(fname, &sb) == 0)`
`294`	`293`	`{`
`295`		`- size = sb.st_size;`
	`294`	`+ // Limitation: file sizes are assumed to fit in a 'long'`
	`295`	`+ filesizes[filename] = static_cast<long>(sb.st_size);`
`296`	`296`	`}`
`297`		`- // Limitation: file sizes are assumed to fit in a 'long'`
`298`		`- filesizes[filename] = static_cast<long>(size);`
`299`	`297`	`}`
`300`	`298`
`301`	`299`	`#ifndef PATH_MAX`
Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,10 @@ class TestFileLister: public TestFixture`
`55`	`55`	`std::map<std::string, long> filesizes;`
`56`	`56`	`FileLister::recursiveAddFiles(filenames, filesizes, ".");`
`57`	`57`
`58`		`- // Ensure a nonzero size is present for each listed file`
	`58`	`+ // Ensure a size entry is present for each listed file`
`59`	`59`	`for (std::vector<std::string>::const_iterator i = filenames.begin(); i != filenames.end(); ++i)`
`60`	`60`	`{`
`61`	`61`	`ASSERT(filesizes.find(*i) != filesizes.end());`
`62`		`- ASSERT(filesizes[*i] > 0);`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`// In case there are leading "./"..`