added automatic scanning of tests folder for tests + some some simple tests for c funcs

git-svn-id: https://svn.codehaus.org/groovy/trunk/groovy/modules/native_launcher@20331 a5544e8c-8a19-0410-ba12-f9af4593a198

Author: akaranta

nativelaunchertester.py

@@ -19,6 +19,7 @@
 
 import os
 import sys
+import re
 
 class NativeLauncherTester :
 
@@ -46,16 +47,29 @@ def runLauncherTests ( self, target , source , env ) :
 
             if testModuleName in alreadyExecuted : continue
 
-            try :
-                module = __import__ ( testModuleName )
-            except ImportError , ie :
-                print 'Error loading tests for ' , root, ' :: ' , ie 
+            if self.runSingleTest( testModuleName, env, item ) :
                 testsFailed = True
-            else :
-                print 'Running test ' , testModuleName
-                if not module.runTests ( item.path , env[ 'PLATFORM' ] ) :
-                    print '  Tests failed.'
-                    testsFailed = True
 
             alreadyExecuted.append( testModuleName )
             print
+
+        for testfile in os.listdir( 'tests' ) :
+            testModuleName = re.sub( '\.py\Z', '', testfile )
+            if testModuleName in alreadyExecuted or not re.search( 'Test\Z', testModuleName ) : continue
+            if self.runSingleTest( testModuleName, env ) :
+                testsFailed = True
+            
+    def runSingleTest( self, testModuleName, env, item = None ) :
+        testFailed = False
+        try :
+            module = __import__ ( testModuleName )
+        except ImportError , ie :
+            print 'Error loading test file ' , testModuleName, ' :: ' , ie 
+            testFailed = True
+        else :
+            print 'Running test ' , testModuleName
+            if not module.runTests ( item.path if item else None, env[ 'PLATFORM' ] ) :
+                print '  Tests failed.'
+                testsFailed = True
+        return testFailed
+    

source/jst_fileutils.c

@@ -224,15 +224,14 @@ static void changeEmptyPrefixAndSuffixToNULL( char** fileNamePrefix, char** file
 
 }
 
-#else
+#endif
 
-extern int matchPrefixAndSuffixToFileName( char* fileName, char* prefix, char* suffix ) {
+extern int matchPrefixAndSuffixToFileName( const char* fileName, const char* prefix, const char* suffix ) {
 
   return jst_startsWith( fileName, prefix ) && jst_endsWith( fileName, suffix ) ;
 
 }
 
-#endif
 
 
 #if defined( _WIN32 )

source/jst_fileutils.h

@@ -105,7 +105,7 @@ jboolean jst_dirNameEndsWithSeparator( const char* dirName ) ;
 
 /** Checks that the given file name has the given prefix and suffix. Give NULL to match anything. fileName may not be NULL.
  * Returns true if the given prefix and suffix match. */
-int matchPrefixAndSuffixToFileName( char* fileName, char* prefix, char* suffix ) ;
+int matchPrefixAndSuffixToFileName( const char* fileName, const char* prefix, const char* suffix ) ;
 
 /** a simple validator func that can be used as an argument to some other funcs that take a corresponding
  * function pointer as a parameter */

source/nativelauncher.i

@@ -35,10 +35,14 @@
 %{
 #include "jvmstarter.h"
 #include "groovyutils.h"
+#include "jst_stringutils.h"
+#include "jst_fileutils.h"
 %}
 
 %include "jvmstarter.h"
 %include "groovyutils.h"
+%include "jst_stringutils.h"
+%include "jst_fileutils.h"
 
 
 

tests/FileUtilsTest.py

@@ -0,0 +1,37 @@
+# -*- mode:python; coding:utf-8; -*-
+# jedit: :mode=python:
+
+#  Copyright � 2010 Antti Karanta
+#
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+#  compliance with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software distributed under the License is
+#  distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+#  implied. See the License for the specific language governing permissions and limitations under the
+#  License.
+
+import unittest
+
+import supportModule
+import nativelauncher
+
+
+class FileUtilsTestCase ( unittest.TestCase ) :
+
+    def testFileExists( self ) :
+        self.assertTrue( nativelauncher.jst_fileExists( __file__ ) )
+        self.assertFalse( nativelauncher.jst_fileExists( __file__ + '.not' ) )
+        
+    def testMatchPrefixAndSuffixToFileName( self ) :
+        self.assertTrue( nativelauncher.matchPrefixAndSuffixToFileName( 'hello.txt', 'hel', '.txt' ) )
+        self.assertTrue( nativelauncher.matchPrefixAndSuffixToFileName( 'hello.txt', '', '.txt' ) )
+        self.assertTrue( nativelauncher.matchPrefixAndSuffixToFileName( 'hello.txt', 'hel', '' ) )
+
+def runTests ( path , architecture ) :
+    return supportModule.runTests ( path , architecture , FileUtilsTestCase )
+
+if __name__ == '__main__' :
+    print 'Run tests using command "scons test".'

tests/StringUtilsTest.py

@@ -0,0 +1,39 @@
+# -*- mode:python; coding:utf-8; -*-
+# jedit: :mode=python:
+
+#  Copyright � 2010 Antti Karanta
+#
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+#  compliance with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software distributed under the License is
+#  distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+#  implied. See the License for the specific language governing permissions and limitations under the
+#  License.
+
+import unittest
+
+import supportModule
+import nativelauncher
+
+
+class StringUtilsTestCase ( unittest.TestCase ) :
+
+    def testStartsWith( self ) :
+        self.assertTrue( nativelauncher.jst_startsWith( 'foobar', 'foo' ) )
+        self.assertTrue( nativelauncher.jst_startsWith( 'foobar', '' ) )
+        self.assertFalse( nativelauncher.jst_startsWith( 'foobar', 'bar' ) )
+        
+    def testEndsWith( self ) :
+        self.assertFalse( nativelauncher.jst_endsWith( 'foobar', 'foo' ) )
+        self.assertTrue( nativelauncher.jst_endsWith( 'foobar', '' ) )
+        self.assertTrue( nativelauncher.jst_endsWith( 'foobar', 'bar' ) )
+
+
+def runTests ( path , architecture ) :
+    return supportModule.runTests ( path , architecture , StringUtilsTestCase )
+
+if __name__ == '__main__' :
+    print 'Run tests using command "scons test".'

tests/supportModule.py

@@ -54,6 +54,9 @@ def runTests ( path , architecture , testClass ) :
     executablePath = path
     global platform
     platform = architecture
+    return runTestsInClass( testClass )
+    
+def runTestsInClass( testClass ) :
     if os.environ['xmlOutputRequired'] == 'True' :
         resultsDirectory = os.environ['xmlTestOutputDirectory']
         if not os.path.exists ( resultsDirectory ) : os.mkdir ( resultsDirectory )