Changeset 0fbf13c30976400ed00ccf72ce8d7c84c981d628

Timestamp:

08/19/06 18:19:56 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1156004396 +0000

git-parent:

[23d27c9c9cec127459721c3b9420eb349109b477]

git-author:

Clément Stenac <zorglub@videolan.org> 1156004396 +0000

Message:

* Tests for previous commit
* Improve test output

Files:

• test/NativeAlgoTest.py (added)
• test/native/algo.c (added)
• test/native/gc.c (modified) (1 diff)
• test/native/init.c (modified) (2 diffs)
• test/native/tests.h (modified) (3 diffs)
• test/native/url.c (modified) (1 diff)
• test/pyunit.h (modified) (2 diffs)
• test/setup.py (modified) (1 diff)
• test/test.py (modified) (2 diffs)
• test/test.sh (modified) (1 diff)

test/native/gc.c

@@ -40 +40 @@
-};
-
+asserts = 0;
+
-DECLARE_MODULE( native_gc_test )

test/native/init.c

@@ +1 @@
+#include "../pyunit.h"
-#include "tests.h"
-
+PyObject *init( PyObject *self, PyObject *args )
+{
+    (void)setvbuf (stdout, NULL, _IONBF, 0);
+    Py_INCREF( Py_None );
+    return Py_None;
+}
+
-static PyMethodDef native_libvlc_test_methods[] = {
+   DEF_METHOD( init, "Init some stuff" )
-   DEF_METHOD( create_destroy, "Create and destroy" )
-   DEF_METHOD( exception_test, "Test Exception handling" )
@@ -12 +21 @@
-   DEF_METHOD( gui_chains_test, "Test interactions between chains and GUI" )
-   DEF_METHOD( psz_chains_test, "Test building of chain strings" )
+   DEF_METHOD( bsearch_direct_test, "Test Bsearch without structure" )
+   DEF_METHOD( bsearch_member_test, "Test Bsearch with structure" )
+   DEF_METHOD( dict_test, "Test dictionnaries" )
-   { NULL, NULL, 0, NULL }
-};
-
+asserts =0;
+
-DECLARE_MODULE( native_libvlc_test )

test/native/tests.h

@@ -1 +1 @@
-#include "../pyunit.h"
-
+/* Libvlc */
-PyObject *exception_test( PyObject *self, PyObject *args );
-PyObject *create_destroy( PyObject *self, PyObject *args );
@@ -6 +7 @@
-PyObject *vlm_test( PyObject *self, PyObject *args );
-
+/* Stats */
-PyObject *timers_test( PyObject *self, PyObject *args );
-
@@ -12 +14 @@
-PyObject *i18n_atof_test( PyObject *self, PyObject *args );
-
+/* Profiles */
-PyObject *chains_test( PyObject *self, PyObject *args );
-PyObject *gui_chains_test( PyObject *self, PyObject *args );
-PyObject *psz_chains_test( PyObject *self, PyObject *args );
+
+/* Algo */
+PyObject *bsearch_direct_test( PyObject *self, PyObject *args );
+PyObject *bsearch_member_test( PyObject *self, PyObject *args );
+PyObject *dict_test( PyObject *self, PyObject *args );
+

test/native/url.c

@@ -43 +43 @@
-{
-    printf( "\n" );
-    (void)setvbuf (stdout, NULL, _IONBF, 0);
-    if( !test_decode ("this_should_not_be_modified_1234",
-                     "this_should_not_be_modified_1234") ) return NULL;

test/pyunit.h

@@ -1 +1 @@
-#include <Python.h>
-
-
+
+
+
-
-#define DECLARE_MODULE( module ) PyMODINIT_FUNC init##module( void ) {  \
@@ -7 +9 @@
-}
-
-
+asserts++; 
-         if( libvlc_exception_get_message( &exception ) )  PyErr_SetString( PyExc_AssertionError, libvlc_exception_get_message( &exception ) ); \
-         else PyErr_SetString( PyExc_AssertionError, "Exception raised" ); return NULL; }
-
-
+asserts ++; 
-         if( libvlc_exception_get_message( &exception ) )  PyErr_SetString( PyExc_AssertionError, libvlc_exception_get_message( &exception ) ); \
-         else PyErr_SetString( PyExc_AssertionError, "Exception not raised" ); return NULL; }

test/setup.py

@@ -42 +42 @@
-native_libvlc_test = Extension( 'native_libvlc_test',
-                sources = ['native/init.c', 'native/url.c', 'native/i18n.c',
-
+
+
-                include_dirs = ['../include', '../', '/usr/win32/include' ],
-                extra_objects = [ '../src/.libs/libvlc.so' ],

test/test.py

@@ -9 +9 @@
-
-import sys, os, re, unittest
+import native_libvlc_test
+
-
-def printAndRun( module ):
-
+#
-    return unittest.defaultTestLoader.loadTestsFromModule( module )
-
@@ -22 +24 @@
-    moduleNames = map(filenameToModuleName, files)         
-    modules = map(__import__, moduleNames)                 
+    
+    native_libvlc_test.init()
+
-#    load = unittest.defaultTestLoader.loadTestsFromModule
-    load = printAndRun

test/test.sh

@@ -1 +1 @@
-#! /bin/sh
-
+set -e
+python setup.py build 
-
-cd ..
+# TODO: FIXME !!
-export PYTHONPATH=$PYTHONPATH:bindings/mediacontrol-python/build/lib.linux-i686-2.3:test/build/lib.linux-i686-2.3:test/build/lib.linux-x86_64-2.3
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+