diff options
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/pyglue.c | 32 | ||||
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/strings.py | 104 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/unicodenames.py | 31 | 
4 files changed, 169 insertions, 0 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index 03460db8ff..0f2048aa89 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -25,6 +25,10 @@  void init_glue(void); +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif +  static PyObject *py_generate_random_str(PyObject *self, PyObject *args)  {  	int len; @@ -173,6 +177,30 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args)  	return pylist;  } +static PyObject *py_strcasecmp_m(PyObject *self, PyObject *args) +{ +	char *s1, *s2; + +	if (!PyArg_ParseTuple(args, "ss", &s1, &s2)) +		return NULL; + +	return PyInt_FromLong(strcasecmp_m(s1, s2)); +} + +static PyObject *py_strstr_m(PyObject *self, PyObject *args) +{ +	char *s1, *s2, *ret; + +	if (!PyArg_ParseTuple(args, "ss", &s1, &s2)) +		return NULL; + +	ret = strstr_m(s1, s2); +	if (!ret) { +		Py_RETURN_NONE; +	} +	return PyString_FromString(ret); +} +  static PyMethodDef py_misc_methods[] = {  	{ "generate_random_str", (PyCFunction)py_generate_random_str, METH_VARARGS,  		"generate_random_str(len) -> string\n" @@ -192,6 +220,10 @@ static PyMethodDef py_misc_methods[] = {  		"get debug level" },  	{ "interface_ips", (PyCFunction)py_interface_ips, METH_VARARGS,  		"get interface IP address list"}, +	{ "strcasecmp_m", (PyCFunction)py_strcasecmp_m, METH_VARARGS, +		"(for testing) compare two strings using Samba's strcasecmp_m()"}, +	{ "strstr_m", (PyCFunction)py_strstr_m, METH_VARARGS, +		"(for testing) find one string in another with Samba's strstr_m()"},  	{ NULL }  }; diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index 2a54f47d2b..dac69e7f62 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -348,3 +348,5 @@ nttime2string = _glue.nttime2string  nttime2unix = _glue.nttime2unix  unix2nttime = _glue.unix2nttime  generate_random_password = _glue.generate_random_password +strcasecmp_m = _glue.strcasecmp_m +strstr_m = _glue.strstr_m diff --git a/source4/scripting/python/samba/tests/strings.py b/source4/scripting/python/samba/tests/strings.py new file mode 100644 index 0000000000..5f3e5c5bb7 --- /dev/null +++ b/source4/scripting/python/samba/tests/strings.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python + +# subunit test cases for Samba string functions. + +# Copyright (C) 2003 by Martin Pool <mbp@samba.org> +# Copyright (C) 2011 Andrew Bartlett +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/>. + +# XXX: All this code assumes that the Unix character set is UTF-8, +# which is the most common setting.  I guess it would be better to +# force it to that value while running the tests.  I'm not sure of the +# best way to do that yet. +# +# -- mbp + +import sys, re +from unicodenames import * + +import samba.tests +from samba import strcasecmp_m, strstr_m + +def signum(a): +    if a < 0: +        return -1 +    elif a > 0: +        return +1 +    else: +        return 0 + + +class strcasecmp_m_Tests(samba.tests.TestCase): +    """String comparisons in simple ASCII and unicode""" +    def test_strcasecmp_m(self): +        # A, B, strcasecmp(A, B) +        cases = [('hello', 'hello', 0), +                 ('hello', 'goodbye', +1), +                 ('goodbye', 'hello', -1), +                 ('hell', 'hello', -1), +                 ('', '', 0), +                 ('a', '', +1), +                 ('', 'a', -1), +                 ('a', 'A', 0), +                 ('aa', 'aA', 0), +                 ('Aa', 'aa', 0), +                 ('longstring ' * 100, 'longstring ' * 100, 0), +                 ('longstring ' * 100, 'longstring ' * 100 + 'a', -1), +                 ('longstring ' * 100 + 'a', 'longstring ' * 100, +1), +                 (KATAKANA_LETTER_A, KATAKANA_LETTER_A, 0), +                 (KATAKANA_LETTER_A, 'a', 1), +                 ] +        for a, b, expect in cases: +            self.assertEquals(signum(strcasecmp_m(a.encode('utf-8'), +                                                  b.encode('utf-8'))), +                              expect) + +class strstr_m_Tests(samba.tests.TestCase): +    """strstr_m tests in simple ASCII and unicode strings""" +    def test_strstr_m(self): +        # A, B, strstr_m(A, B) +        cases = [('hello', 'hello', 'hello'), +                 ('hello', 'goodbye', None), +                 ('goodbye', 'hello', None), +                 ('hell', 'hello', None), +                 ('hello', 'hell', 'hello'), +                 ('', '', ''), +                 ('a', '', 'a'), +                 ('', 'a', None), +                 ('a', 'A', None), +                 ('aa', 'aA', None), +                 ('Aa', 'aa', None), +                 ('%v foo', '%v', '%v foo'), +                 ('foo %v foo', '%v', '%v foo'), +                 ('foo %v', '%v', '%v'), +                 ('longstring ' * 100, 'longstring ' * 99, 'longstring ' * 100), +                 ('longstring ' * 99, 'longstring ' * 100, None), +                 ('longstring a' * 99, 'longstring ' * 100 + 'a', None), +                 ('longstring ' * 100 + 'a', 'longstring ' * 100, 'longstring ' * 100 + 'a'), +                 (KATAKANA_LETTER_A, KATAKANA_LETTER_A + 'bcd', None), +                 (KATAKANA_LETTER_A + 'bcde', KATAKANA_LETTER_A + 'bcd', KATAKANA_LETTER_A + 'bcde'), +                 ('d'+KATAKANA_LETTER_A + 'bcd', KATAKANA_LETTER_A + 'bcd', KATAKANA_LETTER_A + 'bcd'), +                 ('d'+KATAKANA_LETTER_A + 'bd', KATAKANA_LETTER_A + 'bcd', None), + +                 ('e'+KATAKANA_LETTER_A + 'bcdf', KATAKANA_LETTER_A + 'bcd', KATAKANA_LETTER_A + 'bcdf'), +                 (KATAKANA_LETTER_A, KATAKANA_LETTER_A + 'bcd', None), +                 (KATAKANA_LETTER_A*3, 'a', None), +                 ] +        for a, b, expect in cases: +            if expect is not None: +                expect = expect.encode('utf-8') +            self.assertEquals(strstr_m(a.encode('utf-8'), +                                       b.encode('utf-8')), +                              expect) diff --git a/source4/scripting/python/samba/tests/unicodenames.py b/source4/scripting/python/samba/tests/unicodenames.py new file mode 100644 index 0000000000..fa5d0efc8c --- /dev/null +++ b/source4/scripting/python/samba/tests/unicodenames.py @@ -0,0 +1,31 @@ +#! /usr/bin/python + +# Copyright (C) 2003 by Martin Pool <mbp@samba.org> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/>. + + +""" +Defines symbolic names for a few UNICODE characters, to make test +source code more readable on machines that don't have all the +necessary fonts. + +You can do "import *" on this file safely. +""" + +LATIN_CAPITAL_LETTER_N_WITH_TILDE         = u'\u004e' +LATIN_CAPITAL_LETTER_O_WITH_DIARESIS      = u'\u00d6' +LATIN_SMALL_LETTER_O_WITH_DIARESIS        = u'\u00f6' + +KATAKANA_LETTER_A                         = u'\u30a2'  | 
