From fa6335ddf55329c1ba1c50c68080a559461151cc Mon Sep 17 00:00:00 2001
From: Timothy Manning <tfhmanning@gmail.com>
Date: Thu, 4 Nov 2010 11:08:52 +1300
Subject: [PATCH] yaffs Adding more error code test programs to quick tests.
 note the bugs are still present. Signed-off-by: Timothy Manning
 <tfhmanning@gmail.com>

---
 direct/timothy_tests/quick_tests/Makefile     | 15 +++++++-
 .../timothy_tests/quick_tests/quick_tests.c   |  7 +++-
 .../timothy_tests/quick_tests/quick_tests.h   |  7 +++-
 .../quick_tests/test_yaffs_access.h           |  2 +-
 .../quick_tests/test_yaffs_ftruncate.c        |  2 +-
 .../quick_tests/test_yaffs_ftruncate.h        |  2 +-
 .../quick_tests/test_yaffs_lseek.c            |  2 +-
 .../quick_tests/test_yaffs_lseek.h            |  2 +-
 .../quick_tests/test_yaffs_open.c             | 20 ++++++++++
 .../quick_tests/test_yaffs_open.h             |  9 +++++
 .../quick_tests/test_yaffs_open_EEXIST.c      | 35 ++++++++++++++++++
 .../quick_tests/test_yaffs_open_EEXIST.h      |  9 +++++
 .../quick_tests/test_yaffs_open_EISDIR.c      | 37 +++++++++++++++++++
 .../quick_tests/test_yaffs_open_EISDIR.h      |  9 +++++
 .../quick_tests/test_yaffs_open_ENOENT.c      | 33 +++++++++++++++++
 .../quick_tests/test_yaffs_open_ENOENT.h      |  9 +++++
 .../quick_tests/test_yaffs_open_ENOTDIR.c     | 33 +++++++++++++++++
 .../quick_tests/test_yaffs_open_ENOTDIR.h     |  9 +++++
 .../quick_tests/test_yaffs_open_file.c        | 16 --------
 .../quick_tests/test_yaffs_open_file.h        |  9 -----
 .../quick_tests/test_yaffs_open_file_ENOENT.c | 24 ------------
 .../quick_tests/test_yaffs_open_file_ENOENT.h |  9 -----
 .../quick_tests/test_yaffs_read.c             |  2 +-
 .../quick_tests/test_yaffs_read.h             |  2 +-
 .../quick_tests/test_yaffs_stat.h             |  2 +-
 .../quick_tests/test_yaffs_truncate.c         |  4 +-
 .../quick_tests/test_yaffs_truncate.h         |  2 +-
 .../quick_tests/test_yaffs_unlinking.c        |  2 +-
 .../quick_tests/test_yaffs_unlinking.h        |  2 +-
 .../quick_tests/test_yaffs_write.c            |  2 +-
 .../quick_tests/test_yaffs_write.h            |  2 +-
 31 files changed, 241 insertions(+), 79 deletions(-)
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open.c
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open.h
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.h
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.h
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.h
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c
 create mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.h
 delete mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_file.c
 delete mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_file.h
 delete mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_file_ENOENT.c
 delete mode 100644 direct/timothy_tests/quick_tests/test_yaffs_open_file_ENOENT.h

diff --git a/direct/timothy_tests/quick_tests/Makefile b/direct/timothy_tests/quick_tests/Makefile
index 543cdbf..09cdba1 100644
--- a/direct/timothy_tests/quick_tests/Makefile
+++ b/direct/timothy_tests/quick_tests/Makefile
@@ -44,8 +44,19 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsf
 
 #		 yaffs_checkptrwtest.o\
 
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) quick_tests.o lib.o test_mount_yaffs.o   test_yaffs_unlinking.o test_yaffs_open_file.o test_yaffs_ftruncate.o test_yaffs_truncate.o \
-		test_yaffs_write.o test_yaffs_read.o test_yaffs_lseek.o test_yaffs_access.o test_yaffs_stat.o test_yaffs_open_file_ENOENT.o
+TESTFILES = 	quick_tests.o lib.o \
+		test_mount_yaffs.o \
+		test_yaffs_open.o test_yaffs_open_ENOENT.o test_yaffs_open_ENOTDIR.o test_yaffs_open_EEXIST.o test_yaffs_open_EISDIR.o \
+		test_yaffs_unlinking.o  \
+		test_yaffs_ftruncate.o test_yaffs_truncate.o \
+		test_yaffs_write.o \
+		test_yaffs_read.o \
+		test_yaffs_lseek.o \
+		test_yaffs_access.o \
+		test_yaffs_stat.o 
+		  
+
+YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
 
 PYTONOSYMLINKS = yaffs_error_converter.c yaffs_error_converter.h
 PYTHONOBJS = yaffs_error_converter.o
diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c
index 6c548fb..c1e86bc 100644
--- a/direct/timothy_tests/quick_tests/quick_tests.c
+++ b/direct/timothy_tests/quick_tests/quick_tests.c
@@ -31,8 +31,11 @@ test_template test_list[]={
 	//{dummy_test_pass,dummy_test_pass_clean,"dummy_test_pass"},
 	//{dummy_test_fail,dummy_test_fail_clean,"dummy_test_fail"},
 	{mount_yaffs_test,mount_yaffs_test_clean,"mount_yaffs_test"},
-	{test_yaffs_open_file,test_yaffs_open_file_clean,"test_yaffs_open_file"},
-	{test_yaffs_open_file_ENOENT,test_yaffs_open_file_ENOENT_clean,"test_yaffs_open_file_ENOENT"},
+	{test_yaffs_open,test_yaffs_open_clean,"test_yaffs_open"},
+	{test_yaffs_open_EISDIR,test_yaffs_open_EISDIR_clean,"test_yaffs_open_EISDIR"},
+	{test_yaffs_open_EEXIST,test_yaffs_open_EEXIST_clean,"test_yaffs_open_EEXIST"},
+	{test_yaffs_open_ENOTDIR,test_yaffs_open_ENOTDIR_clean,"test_yaffs_open_ENOTDIR"},
+	{test_yaffs_open_ENOENT,test_yaffs_open_ENOENT_clean,"test_yaffs_open_ENOENT"},
 	
 	{test_yaffs_access,test_yaffs_access_clean,"test_yaffs_access"},
 	{test_yaffs_unlinking, test_yaffs_unlinking_clean,"test_yaffs_unlinking"},
diff --git a/direct/timothy_tests/quick_tests/quick_tests.h b/direct/timothy_tests/quick_tests/quick_tests.h
index 18b0876..8172345 100644
--- a/direct/timothy_tests/quick_tests/quick_tests.h
+++ b/direct/timothy_tests/quick_tests/quick_tests.h
@@ -3,8 +3,11 @@
 #include <stdio.h>
 
 #include "test_mount_yaffs.h"
-#include "test_yaffs_open_file.h"
-#include "test_yaffs_open_file_ENOENT.h"
+#include "test_yaffs_open.h"
+#include "test_yaffs_open_EISDIR.h"
+#include "test_yaffs_open_EEXIST.h"
+#include "test_yaffs_open_ENOENT.h"
+#include "test_yaffs_open_ENOTDIR.h"
 #include "test_yaffs_unlinking.h"
 #include "test_yaffs_ftruncate.h"
 #include "test_yaffs_truncate.h"
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access.h b/direct/timothy_tests/quick_tests/test_yaffs_access.h
index 23ff33f..18624ea 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_access.h
+++ b/direct/timothy_tests/quick_tests/test_yaffs_access.h
@@ -2,7 +2,7 @@
 #define __test_yaffs_access_h__
 #include "lib.h"
 #include "yaffsfs.h"
-#include "test_yaffs_open_file.h"
+#include "test_yaffs_open.h"
 #include "test_yaffs_lseek.h"
 int test_yaffs_access(void);
 int test_yaffs_access_clean(void);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.c b/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.c
index 02964f7..8e97f32 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.c
@@ -2,7 +2,7 @@
 
 static int handle=0;
 int test_yaffs_ftruncate(void){
-	handle=test_yaffs_open_file();
+	handle=test_yaffs_open();
 	if (handle>0){
 		return yaffs_ftruncate(handle,FILE_SIZE_TRUNCATED );
 	}
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.h b/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.h
index cc2423b..e555809 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.h
+++ b/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.h
@@ -2,7 +2,7 @@
 #define __test_yaffs_ftruncate_h__
 #include "lib.h"
 #include "yaffsfs.h"
-#include "test_yaffs_open_file.h"
+#include "test_yaffs_open.h"
 int test_yaffs_ftruncate(void);
 int test_yaffs_ftruncate_clean(void); 
 #endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek.c b/direct/timothy_tests/quick_tests/test_yaffs_lseek.c
index a6afa51..422f6db 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_lseek.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_lseek.c
@@ -2,7 +2,7 @@
 
 static int handle=0;
 int test_yaffs_lseek(void){
-	handle=test_yaffs_open_file();
+	handle=test_yaffs_open();
 	char text[20]="\0";
 	int output=0;
 	if (handle>0){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek.h b/direct/timothy_tests/quick_tests/test_yaffs_lseek.h
index 0902b92..d300734 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_lseek.h
+++ b/direct/timothy_tests/quick_tests/test_yaffs_lseek.h
@@ -2,7 +2,7 @@
 #define __test_yaffs_lseek_h__
 #include "lib.h"
 #include "yaffsfs.h"
-#include "test_yaffs_open_file.h"
+#include "test_yaffs_open.h"
 
 int test_yaffs_lseek(void);
 int test_yaffs_lseek_clean(void);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open.c b/direct/timothy_tests/quick_tests/test_yaffs_open.c
new file mode 100644
index 0000000..068ceea
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open.c
@@ -0,0 +1,20 @@
+#include "test_yaffs_open.h"
+
+static int handle=0;
+
+int test_yaffs_open(void){
+
+	handle=yaffs_open(FILE_PATH,O_CREAT | O_TRUNC| O_RDWR, FILE_MODE);
+	return handle;
+}
+
+
+int test_yaffs_open_clean(void){
+	if (handle >=0){
+		return yaffs_close(handle);
+	}
+	else {
+		return 1;	/* the file failed to open so there is no need to close it*/
+	}
+}
+
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open.h b/direct/timothy_tests/quick_tests/test_yaffs_open.h
new file mode 100644
index 0000000..e668267
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open.h
@@ -0,0 +1,9 @@
+#ifndef __test_yaffs_open_h__
+#define __test_yaffs_open_h__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_open(void);
+int test_yaffs_open_clean(void);
+#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c b/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
new file mode 100644
index 0000000..bc4a9d2
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
@@ -0,0 +1,35 @@
+#include "test_yaffs_open_EEXIST.h"
+
+static int handle=0;
+int test_yaffs_open_EEXIST(void){
+	int output=0;
+	int error_code=0;
+	/*printf("path %s\n",path); */
+	handle=yaffs_open(FILE_PATH, O_CREAT | O_EXCL | O_TRUNC| O_RDWR ,FILE_MODE );
+	if (handle==-1){
+		error_code=yaffs_get_error();
+		printf("EEXIST def %d, Error code %d\n",(- EEXIST),error_code);
+		if (abs(error_code)== EEXIST){
+			return 1;
+		}
+		else {
+			printf("different error than expected\n");
+			return -1;
+		}
+	}
+	else if (output >=0){
+		printf("non existant file opened.(which is a bad thing)\n");
+		return -1;
+	}
+	/* the program should not get here but the compiler is complaining */
+	return -1;
+}
+int test_yaffs_open_EEXIST_clean(void){
+	if (handle >=0){
+		return yaffs_close(handle);
+	}
+	else {
+		return 1;	/* the file failed to open so there is no need to close it*/
+	}
+}
+
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.h b/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.h
new file mode 100644
index 0000000..364fed9
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.h
@@ -0,0 +1,9 @@
+#ifndef __test_yaffs_open_EEXIST_h__
+#define __test_yaffs_open_EEXIST_h__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_open_EEXIST(void);
+int test_yaffs_open_EEXIST_clean(void);
+#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c b/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c
new file mode 100644
index 0000000..3c5bdae
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c
@@ -0,0 +1,37 @@
+#include "test_yaffs_open_EISDIR.h"
+
+/*EISDIR is caused by trying to open a directory */
+
+static int handle=0;
+int test_yaffs_open_EISDIR(void){
+	int output=0;
+	int error_code=0;
+	/*printf("path %s\n",path); */
+	handle=yaffs_open(YAFFS_MOUNT_POINT, O_CREAT | O_TRUNC| O_RDWR ,FILE_MODE );
+	if (handle==-1){
+		error_code=yaffs_get_error();
+		printf("EISDIR def %d, Error code %d\n", EISDIR,error_code);
+		if (abs(error_code)== EISDIR){
+			return 1;
+		}
+		else {
+			printf("different error than expected\n");
+			return -1;
+		}
+	}
+	else if (output >=0){
+		printf("non existant directory opened.(which is a bad thing)\n");
+		return -1;
+	}
+	/* the program should not get here but the compiler is complaining */
+	return -1;
+}
+int test_yaffs_open_EISDIR_clean(void){
+	if (handle >=0){
+		return yaffs_close(handle);
+	}
+	else {
+		return 1;	/* the file failed to open so there is no need to close it*/
+	}
+}
+
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.h b/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.h
new file mode 100644
index 0000000..539f2cf
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.h
@@ -0,0 +1,9 @@
+#ifndef __test_yaffs_open_EISDIR_h__
+#define __test_yaffs_open_EISDIR_h__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_open_EISDIR(void);
+int test_yaffs_open_EISDIR_clean(void);
+#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c
new file mode 100644
index 0000000..8ad4f74
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c
@@ -0,0 +1,33 @@
+#include "test_yaffs_open_ENOENT.h"
+
+static int handle=0;
+int test_yaffs_open_ENOENT(void){
+	int output=0;
+	int error_code=0;
+	/*printf("path %s\n",path); */
+	handle=yaffs_open("/yaffs2/non_existant_file", O_TRUNC| O_RDWR,FILE_MODE );
+	if (handle==-1){
+		error_code=yaffs_get_error();
+		if (abs(error_code)==ENOENT){
+			return 1;
+		}
+		else {
+			printf("different error than expected\n");
+			return -1;
+		}
+	}
+	else if (output >=0){
+		printf("non existant file opened.(which is a bad thing)\n");
+		return -1;
+	}
+
+}
+int test_yaffs_open_ENOENT_clean(void){
+	if (handle >=0){
+		return yaffs_close(handle);
+	}
+	else {
+		return 1;	/* the file failed to open so there is no need to close it*/
+	}
+}
+
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.h b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.h
new file mode 100644
index 0000000..160a3db
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.h
@@ -0,0 +1,9 @@
+#ifndef __test_yaffs_open_ENOENT_h__
+#define __test_yaffs_open_ENOENT_h__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_open_ENOENT(void);
+int test_yaffs_open_ENOENT_clean(void);
+#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c
new file mode 100644
index 0000000..18081a7
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c
@@ -0,0 +1,33 @@
+#include "test_yaffs_open_ENOTDIR.h"
+
+static int handle=0;
+int test_yaffs_open_ENOTDIR(void){
+	int output=0;
+	int error_code=0;
+	/*printf("path %s\n",path); */
+	handle=yaffs_open("/nonexisting_dir/foo", O_TRUNC| O_RDWR,FILE_MODE );
+	if (handle==-1){
+		error_code=yaffs_get_error();
+		if (abs(error_code)==ENOTDIR){
+			return 1;
+		}
+		else {
+			printf("different error than expected\n");
+			return -1;
+		}
+	}
+	else if (output >=0){
+		printf("non existant directory opened.(which is a bad thing)\n");
+		return -1;
+	}
+
+}
+int test_yaffs_open_ENOTDIR_clean(void){
+	if (handle >=0){
+		return yaffs_close(handle);
+	}
+	else {
+		return 1;	/* the file failed to open so there is no need to close it*/
+	}
+}
+
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.h b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.h
new file mode 100644
index 0000000..c38ea21
--- /dev/null
+++ b/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.h
@@ -0,0 +1,9 @@
+#ifndef __test_yaffs_open_ENOTDIR_h__
+#define __test_yaffs_open_ENOTDIR_h__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_open_ENOTDIR(void);
+int test_yaffs_open_ENOTDIR_clean(void);
+#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_file.c b/direct/timothy_tests/quick_tests/test_yaffs_open_file.c
deleted file mode 100644
index ec750e7..0000000
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_file.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "test_yaffs_open_file.h"
-
-
-int test_yaffs_open_file(void){
-	
-	int output=0;
-
-	/*printf("path %s\n",path); */
-	output=yaffs_open(FILE_PATH,O_CREAT | O_TRUNC| O_RDWR, FILE_MODE);
-
-	return output;
-}
-int test_yaffs_open_file_clean(void){
-	return 1;
-}
-
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_file.h b/direct/timothy_tests/quick_tests/test_yaffs_open_file.h
deleted file mode 100644
index 1f1bb91..0000000
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_file.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __test_yaffs_open_file_h__
-#define __test_yaffs_open_file_h__
-
-#include "lib.h"
-#include "yaffsfs.h"
-
-int test_yaffs_open_file(void);
-int test_yaffs_open_file_clean(void);
-#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_file_ENOENT.c b/direct/timothy_tests/quick_tests/test_yaffs_open_file_ENOENT.c
deleted file mode 100644
index ed57e2d..0000000
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_file_ENOENT.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "test_yaffs_open_file_ENOENT.h"
-
-static int handle=0;
-int test_yaffs_open_file_ENOENT(void){
-	int output=0;
-	int error_code=0;
-	/*printf("path %s\n",path); */
-	handle=yaffs_open("/yaffs2/non_existant_file", O_TRUNC| O_RDWR,FILE_MODE );
-	if (handle==-1){
-		error_code=yaffs_get_error();
-		if (error_code==ENOENT){
-			return 1;
-		}
-	}
-	else if (output >=0){
-		printf("non existant file opened.(which is a bad thing)\n");
-		return -1;
-	}
-
-}
-int test_yaffs_open_file_ENOENT_clean(void){
-	return 1;
-}
-
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_file_ENOENT.h b/direct/timothy_tests/quick_tests/test_yaffs_open_file_ENOENT.h
deleted file mode 100644
index 2aecff2..0000000
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_file_ENOENT.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __test_yaffs_open_file_ENOENT_h__
-#define __test_yaffs_open_file_ENOENT_h__
-
-#include "lib.h"
-#include "yaffsfs.h"
-
-int test_yaffs_open_file_ENOENT(void);
-int test_yaffs_open_file_ENOENT_clean(void);
-#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read.c b/direct/timothy_tests/quick_tests/test_yaffs_read.c
index 22a9d3d..bdd58cf 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_read.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_read.c
@@ -3,7 +3,7 @@
 static int handle=0;
 
 int test_yaffs_read(void){
-	handle=test_yaffs_open_file();
+	handle=test_yaffs_open();
 	char text[20]="\0";
 	int output=0;
 	printf("handle %d\n",handle);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read.h b/direct/timothy_tests/quick_tests/test_yaffs_read.h
index f21ca96..ce9f5a2 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_read.h
+++ b/direct/timothy_tests/quick_tests/test_yaffs_read.h
@@ -2,7 +2,7 @@
 #define __test_yaffs_read_h__
 #include "lib.h"
 #include "yaffsfs.h"
-#include "test_yaffs_open_file.h"
+#include "test_yaffs_open.h"
 
 
 int test_yaffs_read(void);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat.h b/direct/timothy_tests/quick_tests/test_yaffs_stat.h
index 21e12f3..bf87ccb 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_stat.h
+++ b/direct/timothy_tests/quick_tests/test_yaffs_stat.h
@@ -2,7 +2,7 @@
 #define __test_yaffs_stat_h__
 #include "lib.h"
 #include "yaffsfs.h"
-#include "test_yaffs_open_file.h"
+#include "test_yaffs_open.h"
 #include "test_yaffs_lseek.h"
 int test_yaffs_stat(void);
 int test_yaffs_stat_clean(void);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate.c b/direct/timothy_tests/quick_tests/test_yaffs_truncate.c
index 57511ed..2f509bb 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_truncate.c
@@ -2,7 +2,7 @@
 static int handle=0;
 
 int test_yaffs_truncate(void){
-	handle=test_yaffs_open_file();
+	handle=test_yaffs_open();
 	if (handle>0){
 		return yaffs_truncate(FILE_PATH,FILE_SIZE_TRUNCATED );
 	}
@@ -14,7 +14,7 @@ int test_yaffs_truncate(void){
 
 int test_yaffs_truncate_clean(void){
 	/* change file size back to orignal size */
-	int handle=test_yaffs_open_file();
+	int handle=test_yaffs_open();
 	int output=0;
 	if (handle>0){
 		output= yaffs_truncate(FILE_PATH,FILE_SIZE );
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate.h b/direct/timothy_tests/quick_tests/test_yaffs_truncate.h
index f73d9bc..bfd738c 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate.h
+++ b/direct/timothy_tests/quick_tests/test_yaffs_truncate.h
@@ -2,7 +2,7 @@
 #define __test_yaffs_truncate_h__
 #include "lib.h"
 #include "yaffsfs.h"
-#include "test_yaffs_open_file.h"
+#include "test_yaffs_open.h"
 int test_yaffs_truncate(void);
 int test_yaffs_truncate_clean(void); 
 #endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlinking.c b/direct/timothy_tests/quick_tests/test_yaffs_unlinking.c
index d5f2787..ce06543 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlinking.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_unlinking.c
@@ -12,5 +12,5 @@ int test_yaffs_unlinking(void){
 }
 
 int test_yaffs_unlinking_clean(void){
-	return test_yaffs_open_file();
+	return test_yaffs_open();
 }
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlinking.h b/direct/timothy_tests/quick_tests/test_yaffs_unlinking.h
index 286cb45..604ae24 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlinking.h
+++ b/direct/timothy_tests/quick_tests/test_yaffs_unlinking.h
@@ -3,7 +3,7 @@
 
 #include "lib.h"
 #include "yaffsfs.h"
-#include "test_yaffs_open_file.h"
+#include "test_yaffs_open.h"
 #include "test_yaffs_access.h"
 
 int test_yaffs_unlinking(void);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write.c b/direct/timothy_tests/quick_tests/test_yaffs_write.c
index 602afd5..adfd2bf 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_write.c
+++ b/direct/timothy_tests/quick_tests/test_yaffs_write.c
@@ -2,7 +2,7 @@
 
 static int handle=0;
 int test_yaffs_write(void){
-	handle=test_yaffs_open_file();
+	handle=test_yaffs_open();
 	if (handle>0){
 		return yaffs_write(handle, FILE_TEXT, FILE_TEXT_NBYTES);
 	}
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write.h b/direct/timothy_tests/quick_tests/test_yaffs_write.h
index 8004123..dfed860 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_write.h
+++ b/direct/timothy_tests/quick_tests/test_yaffs_write.h
@@ -2,7 +2,7 @@
 #define __test_yaffs_write_h__
 #include "lib.h"
 #include "yaffsfs.h"
-#include "test_yaffs_open_file.h"
+#include "test_yaffs_open.h"
 int test_yaffs_write(void);
 int test_yaffs_write_clean(void);
 #endif
-- 
2.30.2