selftest: Re-enable strings.py from source3/stf as a python subunit test

5 files changed, 76 insertions, 86 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/source3/stf/strings.py b/source4/scripting/python/samba/tests/strings.py
index 4e00021525..5f3e5c5bb7 100755..100644
--- a/source3/stf/strings.py
+++ b/source4/scripting/python/samba/tests/strings.py
@@ -1,19 +1,20 @@
-#! /usr/bin/python     
+#!/usr/bin/env python
 
-# Comfychair test cases for Samba string functions.
+# 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/>.
 
@@ -21,19 +22,15 @@
 # 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.
-# 
-# Note that this is NOT the case in C code until the loadparm table is
-# intialized -- the default seems to be ASCII, which rather lets Samba
-# off the hook. :-) The best way seems to be to put this in the test
-# harnesses:
-#
-#       lp_load("/dev/null", True, False, False);
 #
 # -- mbp
 
-import sys, re, comfychair
+import sys, re
 from unicodenames import *
 
+import samba.tests
+from samba import strcasecmp_m, strstr_m
+
 def signum(a):
     if a < 0:
         return -1
@@ -43,35 +40,9 @@ def signum(a):
         return 0
 
 
-class PushUCS2_Tests(comfychair.TestCase):
-    """Conversion to/from UCS2"""
-    def runtest(self):
-        OE = LATIN_CAPITAL_LETTER_O_WITH_DIARESIS
-        oe = LATIN_CAPITAL_LETTER_O_WITH_DIARESIS
-        cases = ['hello',
-                 'hello world',
-                 'g' + OE + OE + 'gomobile', 
-                 'g' + OE + oe + 'gomobile', 
-                 u'foo\u0100',
-                 KATAKANA_LETTER_A * 20,
-                 ]
-        for u8str in cases:
-            out, err = self.runcmd("t_push_ucs2 \"%s\"" % u8str.encode('utf-8'))
-            self.assert_equal(out, "0\n")
-    
-
-class StrCaseCmp(comfychair.TestCase):
-    """String comparisons in simple ASCII""" 
-    def run_strcmp(self, a, b, expect):
-        out, err = self.runcmd('t_strcmp \"%s\" \"%s\"' % (a.encode('utf-8'), b.encode('utf-8')))
-        if signum(int(out)) != expect:
-            self.fail("comparison failed:\n"
-                      "  a=%s\n"
-                      "  b=%s\n"
-                      "  expected=%s\n"
-                      "  result=%s\n" % (`a`, `b`, `expect`, `out`))
-
-    def runtest(self):
+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),
@@ -90,60 +61,44 @@ class StrCaseCmp(comfychair.TestCase):
                  (KATAKANA_LETTER_A, 'a', 1),
                  ]
         for a, b, expect in cases:
-            self.run_strcmp(a, b, expect)
-        
-class strstr_m(comfychair.TestCase):
-    """String comparisons in simple ASCII""" 
-    def run_strstr(self, a, b, expect):
-        out, err = self.runcmd('t_strstr \"%s\" \"%s\"' % (a.encode('utf-8'), b.encode('utf-8')))
-        if (out != (expect + '\n').encode('utf-8')):
-            self.fail("comparison failed:\n"
-                      "  a=%s\n"
-                      "  b=%s\n"
-                      "  expected=%s\n"
-                      "  result=%s\n" % (`a`, `b`, `expect+'\n'`, `out`))
+            self.assertEquals(signum(strcasecmp_m(a.encode('utf-8'),
+                                                  b.encode('utf-8'))),
+                              expect)
 
-    def runtest(self):
+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', '(null)'),
-                 ('goodbye', 'hello', '(null)'),
-                 ('hell', 'hello', '(null)'),
+                 ('hello', 'goodbye', None),
+                 ('goodbye', 'hello', None),
+                 ('hell', 'hello', None),
                  ('hello', 'hell', 'hello'),
                  ('', '', ''),
                  ('a', '', 'a'),
-                 ('', 'a', '(null)'),
-                 ('a', 'A', '(null)'),
-                 ('aa', 'aA', '(null)'),
-                 ('Aa', 'aa', '(null)'),
+                 ('', '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, '(null)'),
-                 ('longstring a' * 99, 'longstring ' * 100 + 'a', '(null)'),
+                 ('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', '(null)'),
+                 (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', '(null)'),
-                 
+                 ('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', '(null)'),
-                 (KATAKANA_LETTER_A*3, 'a', '(null)'),
+                 (KATAKANA_LETTER_A, KATAKANA_LETTER_A + 'bcd', None),
+                 (KATAKANA_LETTER_A*3, 'a', None),
                  ]
         for a, b, expect in cases:
-            self.run_strstr(a, b, expect)
-        
-# Define the tests exported by this module
-tests = [StrCaseCmp,
-         strstr_m,
-         PushUCS2_Tests]
-
-# Handle execution of this file as a main program
-if __name__ == '__main__':
-    comfychair.main(tests)
-
-# Local variables:
-# coding: utf-8
-# End:
+            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/source3/stf/unicodenames.py b/source4/scripting/python/samba/tests/unicodenames.py
index 34d0a19238..fa5d0efc8c 100644
--- a/source3/stf/unicodenames.py
+++ b/source4/scripting/python/samba/tests/unicodenames.py
@@ -1,17 +1,17 @@
 #! /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/>.
 
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index fab62d61a3..adb38bbf70 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -369,6 +369,7 @@ planpythontestsuite("none", "samba.tests.upgrade")
 planpythontestsuite("none", "samba.tests.core")
 planpythontestsuite("none", "samba.tests.provision")
 planpythontestsuite("none", "samba.tests.samba3")
+planpythontestsuite("none", "samba.tests.strings")
 planpythontestsuite("dc:local", "samba.tests.dcerpc.sam")
 planpythontestsuite("dc:local", "samba.tests.dsdb")
 planpythontestsuite("none", "samba.tests.netcmd")