Ported rwops test suite.

7 files changed, 222 insertions, 14 deletions

diff --git a/test/test-automation/include/SDL_test.h b/test/test-automation/include/SDL_test.h
index 920d9e8f..d5f208ad 100644
--- a/test/test-automation/include/SDL_test.h
+++ b/test/test-automation/include/SDL_test.h
@@ -44,6 +44,8 @@
 
 //! Definitions for test requirements
 #define TEST_REQUIRES_AUDIO 1
+//! Defines that the a test requires STDIO
+#define TEST_REQUIRES_STDIO 1
 
 /*!
  * Holds information about a test case
diff --git a/test/test-automation/src/runner/runner.c b/test/test-automation/src/runner/runner.c
index 1ef933c0..eabd2b9c 100644
--- a/test/test-automation/src/runner/runner.c
+++ b/test/test-automation/src/runner/runner.c
@@ -761,6 +761,11 @@ CheckTestRequirements(TestCase *testCase)
 		retVal = PlatformSupportsAudio();
 	}
 
+	if(testCase->requirements & TEST_REQUIRES_STDIO) {
+		retVal = PlatformSupportsStdio();
+	}
+
+
 	return retVal;
 }
 
diff --git a/test/test-automation/src/runner/support.c b/test/test-automation/src/runner/support.c
index be857d74..0f8e89d3 100644
--- a/test/test-automation/src/runner/support.c
+++ b/test/test-automation/src/runner/support.c
@@ -37,6 +37,18 @@ PlatformSupportsAudio()
 	return retValue;
 }
 
+int
+PlatformSupportsStdio()
+{
+	int retValue = 0;
+
+#ifdef HAVE_STDIO_H
+	retValue = 1;
+#endif
+
+	return retValue;
+}
+
 
 /*
 
diff --git a/test/test-automation/src/runner/support.h b/test/test-automation/src/runner/support.h
index 2218ccaa..03a0faf9 100644
--- a/test/test-automation/src/runner/support.h
+++ b/test/test-automation/src/runner/support.h
@@ -28,4 +28,12 @@
  */
 int PlatformSupportsAudio();
 
+/*!
+ * Checks if platform supports stdio.
+ *
+ * \return 1 if audio is supported, otherwise 0
+ */
+int PlatformSupportsStdio();
+
+
 #endif
diff --git a/test/test-automation/tests/testdummy/testdummy.c b/test/test-automation/tests/testdummy/testdummy.c
index c4c5cc5d..e2af1ad4 100644
--- a/test/test-automation/tests/testdummy/testdummy.c
+++ b/test/test-automation/tests/testdummy/testdummy.c
@@ -101,7 +101,7 @@ dummycase1(void *arg)
 	//Log(0, "uint8 (same value): %d", RandomUint8BoundaryValue(200, 200, SDL_TRUE));
 
 
-	for( ; 1 ; ) {
+	for( ; 0 ; ) {
 		//Log(0, "sint8: %d", RandomSint8BoundaryValue(-11, 10, SDL_TRUE));
 		//Log(0, "sint16: %d", RandomSint16BoundaryValue(SHRT_MIN, SHRT_MAX, SDL_FALSE));
 		Log(0, "sint32: %d", RandomSint32BoundaryValue(INT_MIN, 3000, SDL_FALSE));
diff --git a/test/test-automation/tests/testrwops/Makefile.am b/test/test-automation/tests/testrwops/Makefile.am
index d14f98cb..5c35cfdb 100644
--- a/test/test-automation/tests/testrwops/Makefile.am
+++ b/test/test-automation/tests/testrwops/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestrwops.la
-libtestrwops_la_SOURCES = testrwops.c
+libtestrwops_la_SOURCES = testrwops.c TestSupportRWops_Generic.c
 libtestrwops_la_CLAGS = -fPIC -g
 libtestrwops_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
diff --git a/test/test-automation/tests/testrwops/testrwops.c b/test/test-automation/tests/testrwops/testrwops.c
index 54180ab2..d4e36a34 100644
--- a/test/test-automation/tests/testrwops/testrwops.c
+++ b/test/test-automation/tests/testrwops/testrwops.c
@@ -1,6 +1,10 @@
 /**
- * Original code: automated SDL platform test written by Edgar Simo "bobbens"
- * Extended and updated by aschiffler at ferzkopp dot net
+ * Automated SDL_RWops test.
+ *
+ * Original code written by Edgar Simo "bobbens"
+ * Ported by Markus Kauppila (markus.kauppila@gmail.com)
+ *
+ * Released under Public Domain.
  */
 
 #include <stdio.h>
@@ -9,31 +13,208 @@
 
 #include "../../include/SDL_test.h"
 
+#include "TestSupportRWops.h"
 
+const char* RWOPS_READ = "tests/testrwops/read";
+const char* RWOPS_WRITE = "tests/testrwops/write";
 
-/*!
- * Note: Port tests from "/test/automated/rwops" here
- *
- */
+
+static const char hello_world[] = "Hello World!";
+static const char const_mem[] = "Hello World!";
 
 /* Test cases */
 static const TestCaseReference test1 =
-		(TestCaseReference){ "rwops_test", "rwopsy", TEST_DISABLED, 0, 0 };
+		(TestCaseReference){ "rwops_testParam", "test parameters", TEST_ENABLED, 0, 0 };
+
+static const TestCaseReference test2 =
+		(TestCaseReference){ "rwops_testMem", "Tests opening from memory", TEST_ENABLED, 0, 0 };
+
+static const TestCaseReference test3 =
+		(TestCaseReference){ "rwops_testConstMem", "Tests opening from (const) memory", TEST_ENABLED, 0, 0 };
+
+static const TestCaseReference test4 =
+		(TestCaseReference){ "rwops_testFile", "rwop sy", TEST_ENABLED, 0, 0 };
+
+static const TestCaseReference test5 =
+		(TestCaseReference){ "rwops_testFP", "rwop sy", TEST_ENABLED, TEST_REQUIRES_STDIO, 0 };
+
 
 /* Test suite */
 extern const TestCaseReference *testSuite[] =  {
-	&test1, NULL
+	&test1, &test2, &test3, &test4, &test5, NULL
 };
 
 TestCaseReference **QueryTestSuite() {
 	return (TestCaseReference **)testSuite;
 }
 
+
+/**
+ * @brief Makes sure parameters work properly. Helper function
+ */
+int _testGeneric( SDL_RWops *rw, int write )
+{
+   char buf[sizeof(hello_world)];
+   int i;
+
+   /* Set to start. */
+   i = SDL_RWseek( rw, 0, RW_SEEK_SET );
+   AssertEquals(i, 0, "Seeking with SDL_RWseek (RW_SEEK_SET): got %d, expected %d");
+
+   /* Test write. */
+   i = SDL_RWwrite( rw, hello_world, sizeof(hello_world)-1, 1 );
+
+   if (write) {
+	   AssertEquals(i, 1, "Writing with SDL_RWwrite (failed to write)");
+   }
+   else {
+		AssertTrue(i <= 0, "Writing with SDL_RWwrite (wrote when shouldn't have)");
+   }
+
+   /* Test seek. */
+   i = SDL_RWseek( rw, 6, RW_SEEK_SET );
+
+   AssertEquals(i, 6, "Seeking with SDL_RWseek (RW_SEEK_SET): got %d, expected %d", i, 0);
+
+   /* Test seek. */
+   i = SDL_RWseek( rw, 0, RW_SEEK_SET );
+   AssertEquals(i, 0, "Seeking with SDL_RWseek (RW_SEEK_SET): got %d, expected %d", i, 0);
+
+   /* Test read. */
+   i = SDL_RWread( rw, buf, 1, sizeof(hello_world)-1 );
+   AssertTrue(i == sizeof(hello_world)-1, "Reading with SDL_RWread");
+   AssertTrue(SDL_memcmp( buf, hello_world, sizeof(hello_world)-1 ) == 0, "Memory read does not match memory written");
+
+   /* More seek tests. */
+   i = SDL_RWseek( rw, -4, RW_SEEK_CUR );
+   AssertTrue(i == sizeof(hello_world)-5, "Seeking with SDL_RWseek (RW_SEEK_CUR): got %d, expected %d");
+
+   i = SDL_RWseek( rw, -1, RW_SEEK_END );
+   AssertTrue(i == sizeof(hello_world)-2, "Seeking with SDL_RWseek (RW_SEEK_END): got %d, expected %d", i, sizeof(hello_world)-2);
+}
+
+
+void rwops_testParam (void)
+{
+   SDL_RWops *rwops;
+
+   /* These should all fail. */
+   rwops = SDL_RWFromFile(NULL, NULL);
+   AssertTrue(rwops == NULL, "SDL_RWFromFile(NULL, NULL) worked");
+
+   rwops = SDL_RWFromFile(NULL, "ab+");
+   AssertTrue(rwops == NULL, "SDL_RWFromFile(NULL, NULL) worked");
+
+   rwops = SDL_RWFromFile(NULL, "sldfkjsldkfj");
+   AssertTrue(rwops == NULL, "SDL_RWFromFile(NULL, \"sldfkjsldkfj\") worked");
+
+   rwops = SDL_RWFromFile("something", "");
+   AssertTrue(rwops == NULL, "SDL_RWFromFile(\"something\", \"\") worked");
+
+   rwops = SDL_RWFromFile("something", NULL);
+   AssertTrue(rwops == NULL, "SDL_RWFromFile(\"something\", NULL) worked");
+}
+
+
+/**
+ * @brief Does a generic rwops test.
+ *
+ * RWops should have "Hello World!" in it already if write is disabled.
+ *
+ *    @param write Test writing also.
+ *    @return 1 if an assert is failed.
+ */
 /**
- * @brief Document test case here
+ * @brief Tests opening from memory.
  */
-int
-rwops_test(void *arg)
+void rwops_testMem (void)
 {
-	AssertPass("");
+   char mem[sizeof(hello_world)];
+   SDL_RWops *rw;
+
+   /* Open. */
+   rw = SDL_RWFromMem( mem, sizeof(hello_world)-1 );
+   AssertTrue(rw != NULL, "Opening memory with SDL_RWFromMem");
+
+   /* Run generic tests. */
+   _testGeneric( rw, 1 );
+
+   /* Close. */
+   SDL_FreeRW( rw );
+}
+
+
+/**
+ * @brief Tests opening from memory.
+ */
+void rwops_testConstMem (void)
+{
+   SDL_RWops *rw;
+
+   /* Open. */
+   rw = SDL_RWFromConstMem( const_mem, sizeof(const_mem)-1 );
+   AssertTrue(rw != NULL, "Opening memory with SDL_RWFromConstMem");
+
+   /* Run generic tests. */
+   _testGeneric( rw, 0 );
+
+   /* Close. */
+   SDL_FreeRW( rw );
+}
+
+
+/**
+ * @brief Tests opening from memory.
+ */
+void rwops_testFile (void)
+{
+   SDL_RWops *rw;
+
+   /* Read test. */
+   rw = TestSupportRWops_OpenRWopsFromReadDir( RWOPS_READ, "r" );
+   AssertTrue(rw != NULL, "Opening memory with SDL_RWFromFile RWOPS_READ");
+
+   _testGeneric( rw, 0 );
+
+   SDL_FreeRW( rw );
+
+   /* Write test. */
+   rw = TestSupportRWops_OpenRWopsFromWriteDir( RWOPS_WRITE, "w+" );
+   AssertTrue(rw != NULL, "Opening memory with SDL_RWFromFile RWOPS_WRITE");
+
+   _testGeneric( rw, 1 );
+
+   SDL_FreeRW( rw );
+}
+
+
+/**
+ * @brief Tests opening from stdio
+ */
+void rwops_testFP (void)
+{
+   FILE *fp;
+   SDL_RWops *rw;
+
+   /* Run read tests. */
+   fp = TestSupportRWops_OpenFPFromReadDir( RWOPS_READ, "r" );
+   AssertTrue(fp != NULL, "Failed to open file %s,", RWOPS_READ);
+
+   rw = SDL_RWFromFP( fp, 1 );
+   AssertTrue(rw != NULL, "Opening memory with SDL_RWFromFP");
+
+   _testGeneric( rw, 0 );
+
+   SDL_FreeRW( rw );
+
+   /* Run write tests. */
+   fp = TestSupportRWops_OpenFPFromWriteDir( RWOPS_WRITE, "w+" );
+   AssertTrue(fp != NULL, "Failed to open file %s", RWOPS_WRITE);
+
+   rw = SDL_RWFromFP( fp, 1 );
+   AssertTrue( rw != NULL, "Opening memory with SDL_RWFromFP");
+
+   _testGeneric( rw, 1 );
+
+   SDL_FreeRW( rw );
 }