From d599c0de231424e62d48013f84c241a998fbe564 Mon Sep 17 00:00:00 2001 From: Paul Nasrat Date: Thu, 20 Jul 2006 21:02:38 +0000 Subject: [PATCH] More consistent naming Relative and parallel dir testing --- test/testMetaDataGenerator.py | 93 +++++++++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 14 deletions(-) diff --git a/test/testMetaDataGenerator.py b/test/testMetaDataGenerator.py index 85ff375..0957fb4 100644 --- a/test/testMetaDataGenerator.py +++ b/test/testMetaDataGenerator.py @@ -31,24 +31,32 @@ class MetaDataGeneratorTestCase(unittest.TestCase): if self.tempdir: shutil.rmtree(self.tempdir) - def testEmptyFileList(self): + def testNoFiles(self): """Test when target directory empty of files""" results = self.mdgen.getFileList(self.basepath, self.directory, ".test") self.assertEquals(results, [], msg="Expected no files") - def testSingleMatchingFile(self): + def testMatch(self): """Test single file matching extension""" self.__addFile(self.tempdir, ".test") results = self.mdgen.getFileList(self.basepath, self.directory, ".test") self.assertEquals(len(results), 1, msg="Expected one file") - def testSingleNonMatchingFile(self): + def testMatches(self): + """Test right number of files returned with both matches and non""" + self.__addFile(self.tempdir, ".test") + self.__addFile(self.tempdir, ".test") + self.__addFile(self.tempdir, ".notme") + results = self.mdgen.getFileList(self.basepath, self.directory, ".test") + self.assertEquals(len(results), 2, msg="Expected one file") + + def testNoMatches(self): """Test single file not matching extension""" self.__addFile(self.tempdir, ".notme") results = self.mdgen.getFileList(self.basepath, self.directory, ".test") self.assertEquals(results, [], msg="Expected no matching files") - def testReturnMatchedDirectory(self): + def testReturnPath(self): """Test matching file referenced by directory passed in""" self.__addFile(self.tempdir, ".test") results = self.mdgen.getFileList(self.basepath, self.directory, ".test") @@ -56,21 +64,78 @@ class MetaDataGeneratorTestCase(unittest.TestCase): self.assertEquals(filedir, self.directory, msg="Returned directory " "should be passed in directory") - def testMultipleMixedFiles(self): - """Test right number of files returned with both matches and non""" + def testCurrentDirectoryNoMatches(self): + """Test when target directory child of cwd no matches""" + oldwd = os.getcwd() + os.chdir(self.basepath) + results = self.mdgen.getFileList(".", self.directory, ".test") + os.chdir(oldwd) + self.assertEquals(results, [], msg="Expected no files") + + def testCurrentDirectoryMatches(self): + """Test when target directory child of cwd matches""" self.__addFile(self.tempdir, ".test") + oldwd = os.getcwd() + os.chdir(self.basepath) + results = self.mdgen.getFileList(".", self.directory, ".test") + os.chdir(oldwd) + self.assertEquals(len(results), 1, msg="Expected one file") + + def testCurrentDirectoryReturnPath(self): self.__addFile(self.tempdir, ".test") - self.__addFile(self.tempdir, ".notme") - results = self.mdgen.getFileList(self.basepath, self.directory, ".test") - self.assertEquals(len(results), 2, msg="Expected one file") + oldwd = os.getcwd() + os.chdir(self.basepath) + results = self.mdgen.getFileList(".", self.directory, ".test") + filedir = os.path.dirname(results[0]) + os.chdir(oldwd) + self.assertEquals(filedir, self.directory, msg="Returned directory " + "should be passed in directory") + + def testParallelDirectoryNoMatches(self): + """Test when target directory parallel to cwd no matches""" + oldwd = os.getcwd() + paralleldir = tempfile.mkdtemp(prefix="parallel") + os.chdir(paralleldir) + results = self.mdgen.getFileList("..", self.directory, ".test") + os.chdir(oldwd) + self.assertEquals(results, [], msg="Expected no files") + + def testParallelDirectoryMatches(self): + """Test when target directory parallel to cwd matches""" + self.__addFile(self.tempdir, ".test") + oldwd = os.getcwd() + paralleldir = tempfile.mkdtemp(prefix="parallel") + os.chdir(paralleldir) + results = self.mdgen.getFileList("..", self.directory, ".test") + os.chdir(oldwd) + self.assertEquals(len(results), 1, msg="Expected no files") + + def testParallelDirectoryReturnPath(self): + self.__addFile(self.tempdir, ".test") + oldwd = os.getcwd() + paralleldir = tempfile.mkdtemp(prefix="parallel") + os.chdir(paralleldir) + results = self.mdgen.getFileList("..", self.directory, ".test") + filedir = os.path.dirname(results[0]) + os.chdir(oldwd) + self.assertEquals(filedir, self.directory, msg="Returned directory " + "should be passed in directory") + + def suite(): suite = unittest.TestSuite() - suite.addTest(MetaDataGeneratorTestCase("testEmptyFileList")) - suite.addTest(MetaDataGeneratorTestCase("testSingleMatchingFile")) - suite.addTest(MetaDataGeneratorTestCase("testSingleNonMatchingFile")) - suite.addTest(MetaDataGeneratorTestCase("testReturnMatchedDirectory")) - suite.addTest(MetaDataGeneratorTestCase("testMultipleMixedFiles")) + suite.addTest(MetaDataGeneratorTestCase("testNoFiles")) + suite.addTest(MetaDataGeneratorTestCase("testMatch")) + suite.addTest(MetaDataGeneratorTestCase("testNoMatches")) + suite.addTest(MetaDataGeneratorTestCase("testMatches")) + suite.addTest(MetaDataGeneratorTestCase("testReturnPath")) + suite.addTest(MetaDataGeneratorTestCase("testCurrentDirectoryNoMatches")) + suite.addTest(MetaDataGeneratorTestCase("testCurrentDirectoryMatches")) + suite.addTest(MetaDataGeneratorTestCase("testCurrentDirectoryReturnPath")) + suite.addTest(MetaDataGeneratorTestCase("testParallelDirectoryNoMatches")) + suite.addTest(MetaDataGeneratorTestCase("testParallelDirectoryMatches")) + suite.addTest(MetaDataGeneratorTestCase("testParallelDirectoryReturnPath")) return suite if __name__ == "__main__": -- 2.34.1