[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testSuperStress testMacFileHandling,1.1.2.1,1.1.2.2,fUnit_Suite-branch

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testSuperStress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26893/testSuperStress

Modified Files:
      Tag: fUnit_Suite-branch
	testMacFileHandling 
Log Message:
Fixed typo that caused this test script to erroneously abort on OS X.

Index: testMacFileHandling
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testSuperStress/Attic/testMacFileHandling,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** testMacFileHandling	22 Aug 2005 00:41:20 -0000	1.1.2.1
--- testMacFileHandling	18 Feb 2006 08:02:29 -0000	1.1.2.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:suites.fUnit.testSuperStress.testMacFileHandling
  
! on testMacFileHandling () {
	if sys.os() != osMacCn && sys.os != osMacOS {
		abort("testMacFileHandling can only be run on Macs.")};
	local (sysdisk, sysfolder, f, finder, i);
	sysdisk = file.getSystemDisk ();
	sysfolder = file.getSystemFolderPath ();
	tmpfolder = file.getSpecialFolderPath (sysdisk, "Temporary Items", true);
	finder = sysfolder + "Finder";
	f = tmpfolder + "superstress test file #23";
	
	bundle { Çpath parsing
		x = file.fileFromPath (finder);
		assertEqual(file.fileFromPath (finder), "Finder", "file.fileFromPath is broken.");
		assertEqual(file.fileFromPath (finder), "Finder", "file.folderFromPath is broken.");
		assertEqual(file.volumeFromPath (finder), sysdisk, "file.volumeFromPath is broken.")};
	if sys.os() == osMacOS {
		bundle { Çfile.getPath, file.setPath
			oldpath = file.getPath ();
			file.setPath (sysfolder);
			assert(file.exists("Finder"), "file.setPath is broken");
			assertEqual(file.getPath(), sysfolder, "file.getPath is broken.");
			file.setPath (sysfolder + "Control Panels:");
			assert(file.exists("General Controls"), "file.setPath is broken.");
			file.setPath (oldpath);
			assertEqual(file.getPath, oldpath, "file.getPath is broken.")}};
	bundle { Çfile.exists, fileloop, file.getSystemDisk, file.isVolume
		ctfiles = 0;
		fileloop (fname in file.getSystemDisk ()) {
			assert(file.exists(fname));
			assert(!file.isVolume(fname), "file.isVolume is broken.");
			ctfiles++};
		
		assertEqual(files.filesInFolder(sysdisk, 1), ctfiles, "file.filesInFolder is broken.");
		ctvolumes = 0;
		fileloop (fname in "") { Çtest fileloop at the volume level
			assert(file.exists(fname, "file.exists is broken."));
			assert(file.isVolume(fname), "file.isVolume is broken.");
			ctvolumes++};
		assertEqual(file.countVolumes(), ctvolumes);
		assert(!file.exists("System:this file doesn't exist"), "file.exists is broken");
		assert(file.exists(sysfolder), "file.exists is broken.")};
	bundle { Çfile.getSpecialFolderPath
		assertEqual(file.getSpecialFolderPath ("", "System", false), sysfolder, "file.getSpecialFolderPath is broken.")};
	bundle { Çextended fileloop, file.visitFolder
		local (ctfiles1 = 0, ctfiles2 = 0, path);
		on countFiles (path) {
			if not file.isFolder (path) {
				ctfiles1++};
			return (true)};
		file.visitFolder (sysdisk, 2, @countFiles);
		fileloop (path in sysdisk, 2) {
			ctfiles2++};
		assertEqual(ctfiles1, ctfiles2, "extended fileloop or file.visitFolder is broken")};
	bundle { Çfile.new, file.created, file.modified
		file.new (f);
		assert(file.exists(f), "file.new is broken");
		assert(!file.isFolder(f), "file.new created a folder (!)");
		file.delete (f);
		assert(!file.exists(f), "file.delete is broken");
		file.new (f);
		now = clock.now ();
		assert(now - file.created(f) < 10, "file.created is broken.");
		assert(now - file.modified(f) < 10, "file.modified is broken.")};
	if sys.os() == osMacOS {
		bundle { Çfile.setType, type, setcreator, creator
			file.setType (f, 'TEXT');
			assert(file.type(f) == 'TEXT', "file.type is broken.");
			file.setCreator (f, 'KAHL');
			assert(file.creator(f) == 'KAHL', "file.creator is broken.")};
		bundle { Çfile.setLabel, getLabel
			file.setLabel (f, "Hot");
			assertEqual(file.getLabel(f), "Hot", "file.setLabel is broken.");
			file.setLabel (f, "None");
			assertEqual(file.getLabel(f), "None", "file.setLabel is broken")};
		bundle { Çfile.setBundle, file.hasBundle
			assert(file.hasBundle(Frontier.getProgramPath()), "file.hasBundle is broken.");
			assert(!file.hasBundle(Frontier.getFilePath()), "file.hasBundle is broken.");
			file.setBundle (f, true);
			assert(file.hasBundle(f), "file.setBundle is broken.");
			file.setBundle (f, false);
			assert(!file.hasBundle(f), "file.setBundle is broken.")}};
	bundle { Çfile.isVisible, setVisible
		assert(file.isVisible(Frontier.getProgramPath()), "file.isVisible is broken.");
		file.setVisible (f, false);
		assert(!file.isVisible(f), "file.setVisible is broken.");
		file.setVisible (f, true);
		assert(file.isVisible(f), "file.setVisible is broken.")};
	bundle { Çfile.lock, islocked, unlock
		assert(!file.isLocked(f), "file.new created a locked file.");
		file.lock (f);
		assert(file.isLocked(f), "file.lock is broken");
		file.unlock (f);
		assert(!file.isLocked(f), "file.unlock is broken.")};
	if sys.os() == osMacOS {
		bundle { Çfile.copy, file.size
			fnew = tmpfolder + "superstress test file #24";
			file.copy (finder, fnew);
			assert(file.exists(fnew), "file.copy is broken");
			assertEqual(file.size(fnew), file.size(finder), "file.copy or file.size is broken.");
			assert(file.compare(finder, fnew), "file.copy is broken.");
			file.delete (fnew)};
		bundle { Çfile.newAlias, isAlias, followAlias
			fnew = tmpfolder + "superstress test file #25";
			file.newAlias (f, fnew);
			assert(file.isAlias(fnew), "file.newAlias is broken.");
			assertEqual(file.followAlias(fnew), f, "file.followAlias is broken");
			file.delete (fnew);
			fnew = tmpfolder + "superstress test file #26";
			file.newAlias (sysfolder, fnew);
			assert(file.isAlias(fnew), "file.newAlias is broken.");
			assertEqual(file.followAlias(fnew), sysfolder, "file.followAlias is broken");
			file.delete (fnew)};
		bundle { Çfolders
			y = 2 * file.bytesInFolder (sysfolder + "Control Panels:");
			if file.freeSpaceOnVolume (sysdisk) < y {
				abort ("You need at least " + y + " bytes free on " + sysdisk + " to complete running testMacFileHandling.")};
			newfolder = sysdisk + "superstress test folder #89" + file.getPathChar();
			if file.exists (newfolder) {
				file.deleteFolder (newfolder)};
			file.newFolder (newfolder);
			assert(file.exists(newfolder), "file.newFolder is broken.");
			assert(file.isFolder(newfolder), "file.newFolder is broken.");
			fileloop (fname in sysfolder + "Control Panels:") {
				local (s = file.fileFromPath (fname));
				file.copy (fname, newfolder + s)};
			file.copy (sysfolder + "Control Panels:", newfolder + "Control Panels:");
			x = file.bytesInFolder (newfolder);
			assert(abs(x-y) < 1024, "file.bytesInFolder or file.copy is broken.");
			file.deleteFolder (newfolder);
			assert(!file.exists(newfolder), "file.deleteFolder is broken.")}};
	bundle { Çfile reading/writing
		local (path, i);
		path = sysfolder + "superstress.states.txt";
		if file.exists (path) {
			file.delete (path)};
		file.new (path);
		try {
			file.setType (path, 'TEXT');
			file.setCreator (path, 'KAHL')};
		for i = 1 to 50 {
			file.writeLine (path, states.nthState (i))};
		file.open (path);
		i = 1;
		while (not file.endOfFile (path)) {
			assertEqual(file.readLine(path), states.nthState(i), "File reading/writing is broken.");
			i++};
		bundle { //test 5.0.1 verbs
			local (eol, eof = file.getEndOfFile (path));
			local (x, s = states.nthState (50));
			if sys.os() == osMacOS {
				eol = "\r"}
			else {
				eol = "\r\n"};
			file.setPosition (path, eof - string.length (s + eol));
			x =  file.read (path, string.length (s));
			assertEqual(string(x), s, "File getEndOfFile or file.setPosition is broken. \"" + x + "\" != \"" + s + "\".")};
		file.setEndOfFile (path, 10);
		file.close (path);
		assertEqual(file.size(path), 10, "file.setEndOfFile is broken.");
		file.delete (path)};
	
	assert(file.delete(f), "file.delete is broken.")}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:suites.fUnit.testSuperStress.testMacFileHandling
  
! on testMacFileHandling () {
	if sys.os() != osMacCn && sys.os () != osMacOS {
		abort("testMacFileHandling can only be run on Macs.")};
	local (sysdisk, sysfolder, f, finder, i);
	sysdisk = file.getSystemDisk ();
	sysfolder = file.getSystemFolderPath ();
	tmpfolder = file.getSpecialFolderPath (sysdisk, "Temporary Items", true);
	finder = sysfolder + "Finder";
	f = tmpfolder + "superstress test file #23";
	
	bundle { Çpath parsing
		x = file.fileFromPath (finder);
		assertEqual(file.fileFromPath (finder), "Finder", "file.fileFromPath is broken.");
		assertEqual(file.fileFromPath (finder), "Finder", "file.folderFromPath is broken.");
		assertEqual(file.volumeFromPath (finder), sysdisk, "file.volumeFromPath is broken.")};
	if sys.os() == osMacOS {
		bundle { Çfile.getPath, file.setPath
			oldpath = file.getPath ();
			file.setPath (sysfolder);
			assert(file.exists("Finder"), "file.setPath is broken");
			assertEqual(file.getPath(), sysfolder, "file.getPath is broken.");
			file.setPath (sysfolder + "Control Panels:");
			assert(file.exists("General Controls"), "file.setPath is broken.");
			file.setPath (oldpath);
			assertEqual(file.getPath, oldpath, "file.getPath is broken.")}};
	bundle { Çfile.exists, fileloop, file.getSystemDisk, file.isVolume
		ctfiles = 0;
		fileloop (fname in file.getSystemDisk ()) {
			assert(file.exists(fname));
			assert(!file.isVolume(fname), "file.isVolume is broken.");
			ctfiles++};
		
		assertEqual(files.filesInFolder(sysdisk, 1), ctfiles, "file.filesInFolder is broken.");
		ctvolumes = 0;
		fileloop (fname in "") { Çtest fileloop at the volume level
			assert(file.exists(fname, "file.exists is broken."));
			assert(file.isVolume(fname), "file.isVolume is broken.");
			ctvolumes++};
		assertEqual(file.countVolumes(), ctvolumes);
		assert(!file.exists("System:this file doesn't exist"), "file.exists is broken");
		assert(file.exists(sysfolder), "file.exists is broken.")};
	bundle { Çfile.getSpecialFolderPath
		assertEqual(file.getSpecialFolderPath ("", "System", false), sysfolder, "file.getSpecialFolderPath is broken.")};
	bundle { Çextended fileloop, file.visitFolder
		local (ctfiles1 = 0, ctfiles2 = 0, path);
		on countFiles (path) {
			if not file.isFolder (path) {
				ctfiles1++};
			return (true)};
		file.visitFolder (sysdisk, 2, @countFiles);
		fileloop (path in sysdisk, 2) {
			ctfiles2++};
		assertEqual(ctfiles1, ctfiles2, "extended fileloop or file.visitFolder is broken")};
	bundle { Çfile.new, file.created, file.modified
		file.new (f);
		assert(file.exists(f), "file.new is broken");
		assert(!file.isFolder(f), "file.new created a folder (!)");
		file.delete (f);
		assert(!file.exists(f), "file.delete is broken");
		file.new (f);
		now = clock.now ();
		assert(now - file.created(f) < 10, "file.created is broken.");
		assert(now - file.modified(f) < 10, "file.modified is broken.")};
	if sys.os() == osMacOS {
		bundle { Çfile.setType, type, setcreator, creator
			file.setType (f, 'TEXT');
			assert(file.type(f) == 'TEXT', "file.type is broken.");
			file.setCreator (f, 'KAHL');
			assert(file.creator(f) == 'KAHL', "file.creator is broken.")};
		bundle { Çfile.setLabel, getLabel
			file.setLabel (f, "Hot");
			assertEqual(file.getLabel(f), "Hot", "file.setLabel is broken.");
			file.setLabel (f, "None");
			assertEqual(file.getLabel(f), "None", "file.setLabel is broken")};
		bundle { Çfile.setBundle, file.hasBundle
			assert(file.hasBundle(Frontier.getProgramPath()), "file.hasBundle is broken.");
			assert(!file.hasBundle(Frontier.getFilePath()), "file.hasBundle is broken.");
			file.setBundle (f, true);
			assert(file.hasBundle(f), "file.setBundle is broken.");
			file.setBundle (f, false);
			assert(!file.hasBundle(f), "file.setBundle is broken.")}};
	bundle { Çfile.isVisible, setVisible
		assert(file.isVisible(Frontier.getProgramPath()), "file.isVisible is broken.");
		file.setVisible (f, false);
		assert(!file.isVisible(f), "file.setVisible is broken.");
		file.setVisible (f, true);
		assert(file.isVisible(f), "file.setVisible is broken.")};
	bundle { Çfile.lock, islocked, unlock
		assert(!file.isLocked(f), "file.new created a locked file.");
		file.lock (f);
		assert(file.isLocked(f), "file.lock is broken");
		file.unlock (f);
		assert(!file.isLocked(f), "file.unlock is broken.")};
	if sys.os() == osMacOS {
		bundle { Çfile.copy, file.size
			fnew = tmpfolder + "superstress test file #24";
			file.copy (finder, fnew);
			assert(file.exists(fnew), "file.copy is broken");
			assertEqual(file.size(fnew), file.size(finder), "file.copy or file.size is broken.");
			assert(file.compare(finder, fnew), "file.copy is broken.");
			file.delete (fnew)};
		bundle { Çfile.newAlias, isAlias, followAlias
			fnew = tmpfolder + "superstress test file #25";
			file.newAlias (f, fnew);
			assert(file.isAlias(fnew), "file.newAlias is broken.");
			assertEqual(file.followAlias(fnew), f, "file.followAlias is broken");
			file.delete (fnew);
			fnew = tmpfolder + "superstress test file #26";
			file.newAlias (sysfolder, fnew);
			assert(file.isAlias(fnew), "file.newAlias is broken.");
			assertEqual(file.followAlias(fnew), sysfolder, "file.followAlias is broken");
			file.delete (fnew)};
		bundle { Çfolders
			y = 2 * file.bytesInFolder (sysfolder + "Control Panels:");
			if file.freeSpaceOnVolume (sysdisk) < y {
				abort ("You need at least " + y + " bytes free on " + sysdisk + " to complete running testMacFileHandling.")};
			newfolder = sysdisk + "superstress test folder #89" + file.getPathChar();
			if file.exists (newfolder) {
				file.deleteFolder (newfolder)};
			file.newFolder (newfolder);
			assert(file.exists(newfolder), "file.newFolder is broken.");
			assert(file.isFolder(newfolder), "file.newFolder is broken.");
			fileloop (fname in sysfolder + "Control Panels:") {
				local (s = file.fileFromPath (fname));
				file.copy (fname, newfolder + s)};
			file.copy (sysfolder + "Control Panels:", newfolder + "Control Panels:");
			x = file.bytesInFolder (newfolder);
			assert(abs(x-y) < 1024, "file.bytesInFolder or file.copy is broken.");
			file.deleteFolder (newfolder);
			assert(!file.exists(newfolder), "file.deleteFolder is broken.")}};
	bundle { Çfile reading/writing
		local (path, i);
		path = sysfolder + "superstress.states.txt";
		if file.exists (path) {
			file.delete (path)};
		file.new (path);
		try {
			file.setType (path, 'TEXT');
			file.setCreator (path, 'KAHL')};
		for i = 1 to 50 {
			file.writeLine (path, states.nthState (i))};
		file.open (path);
		i = 1;
		while (not file.endOfFile (path)) {
			assertEqual(file.readLine(path), states.nthState(i), "File reading/writing is broken.");
			i++};
		bundle { //test 5.0.1 verbs
			local (eol, eof = file.getEndOfFile (path));
			local (x, s = states.nthState (50));
			if sys.os() == osMacOS {
				eol = "\r"}
			else {
				eol = "\r\n"};
			file.setPosition (path, eof - string.length (s + eol));
			x =  file.read (path, string.length (s));
			assertEqual(string(x), s, "File getEndOfFile or file.setPosition is broken. \"" + x + "\" != \"" + s + "\".")};
		file.setEndOfFile (path, 10);
		file.close (path);
		assertEqual(file.size(path), 10, "file.setEndOfFile is broken.");
		file.delete (path)};
	
	assert(file.delete(f), "file.delete is broken.")}
\ No newline at end of file