cvs: pear /Net_LDAP/tests Net_LDAP_LDIFTest.php /Net_LDAP2/tests Net_LDAP2_LDIFTest.php

cweiske		Thu May  8 09:09:17 2008 UTC

  Modified files:              
    /pear/Net_LDAP/tests	Net_LDAP_LDIFTest.php 
    /pear/Net_LDAP2/tests	Net_LDAP2_LDIFTest.php 
  Log:
  check if conv function exists in unit tests (happens in pear test suite when
  both are included)
  
  
http://cvs.php.net/viewvc.cgi/pear/Net_LDAP/tests/Net_LDAP_LDIFTest.php?r1=1.16&r2=1.17&diff_format=u
Index: pear/Net_LDAP/tests/Net_LDAP_LDIFTest.php
diff -u pear/Net_LDAP/tests/Net_LDAP_LDIFTest.php:1.16 pear/Net_LDAP/tests/Net_LDAP_LDIFTest.php:1.17
--- pear/Net_LDAP/tests/Net_LDAP_LDIFTest.php:1.16	Wed Mar  5 10:10:12 2008
+++ pear/Net_LDAP/tests/Net_LDAP_LDIFTest.php	Thu May  8 09:09:17 2008
@@ -52,16 +52,16 @@
             'cn'    => 'test blabla',
             'attr3' => array('foo', 'bar'),
             'attr1' => 12345,
-            'attr4' => 'blablaöäü',
+            'attr4' => 'blabla���',
             'objectclass' => 'oc2',
             'attr2' => array('1234', 'baz'),
             'verylong' => 'fhu08rhvt7b478vt5hv78h45nfgt45h78t34hhhhhhhhhv5bg8h6ttttttttt3489t57nhvgh4788trhg8999vnhtgthgui65hgb5789thvngwr789cghm738'),
 
-        'cn=test öäü,ou=example,dc=cno' => array(
-            'cn'    => 'test öäü',
+        'cn=test ���,ou=example,dc=cno' => array(
+            'cn'    => 'test ���',
             'attr3' => array('foo', 'bar'),
             'attr1' => 12345,
-            'attr4' => 'blablaöäü',
+            'attr4' => 'blabla���',
             'objectclass' => 'oc3',
             'attr2' => array('1234', 'baz'),
             'attr5' => 'endspace ',
@@ -639,15 +639,17 @@
     Net_LDAP_LDIFTest::main();
 }
 
-/**
-* Function transfers line endings to current OS
-*
-* This is neccessary to make write tests platform indendent.
-*
-* @param string $line Line
-* @return string
-*/
-function conv_lineend($line) {
-    return rtrim($line).PHP_EOL;
+if (!function_exists('conv_lineend')) {
+    /**
+    * Function transfers line endings to current OS
+    *
+    * This is neccessary to make write tests platform indendent.
+    *
+    * @param string $line Line
+    * @return string
+    */
+    function conv_lineend($line) {
+        return rtrim($line).PHP_EOL;
+    }
 }
 ?>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/pear/Net_LDAP2/tests/Net_LDAP2_LDIFTest.php?r1=1.1&r2=1.2&diff_format=u
Index: pear/Net_LDAP2/tests/Net_LDAP2_LDIFTest.php
diff -u pear/Net_LDAP2/tests/Net_LDAP2_LDIFTest.php:1.1 pear/Net_LDAP2/tests/Net_LDAP2_LDIFTest.php:1.2
--- pear/Net_LDAP2/tests/Net_LDAP2_LDIFTest.php:1.1	Tue Mar 18 16:10:12 2008
+++ pear/Net_LDAP2/tests/Net_LDAP2_LDIFTest.php	Thu May  8 09:09:17 2008
@@ -52,16 +52,16 @@
             'cn'    => 'test blabla',
             'attr3' => array('foo', 'bar'),
             'attr1' => 12345,
-            'attr4' => 'blablaöäü',
+            'attr4' => 'blabla���',
             'objectclass' => 'oc2',
             'attr2' => array('1234', 'baz'),
             'verylong' => 'fhu08rhvt7b478vt5hv78h45nfgt45h78t34hhhhhhhhhv5bg8h6ttttttttt3489t57nhvgh4788trhg8999vnhtgthgui65hgb5789thvngwr789cghm738'),
 
-        'cn=test öäü,ou=example,dc=cno' => array(
-            'cn'    => 'test öäü',
+        'cn=test ���,ou=example,dc=cno' => array(
+            'cn'    => 'test ���',
             'attr3' => array('foo', 'bar'),
             'attr1' => 12345,
-            'attr4' => 'blablaöäü',
+            'attr4' => 'blabla���',
             'objectclass' => 'oc3',
             'attr2' => array('1234', 'baz'),
             'attr5' => 'endspace ',
@@ -639,15 +639,17 @@
     Net_LDAP2_LDIFTest::main();
 }
 
-/**
-* Function transfers line endings to current OS
-*
-* This is neccessary to make write tests platform indendent.
-*
-* @param string $line Line
-* @return string
-*/
-function conv_lineend($line) {
-    return rtrim($line).PHP_EOL;
+if (!function_exists('conv_lineend')) {
+    /**
+    * Function transfers line endings to current OS
+    *
+    * This is neccessary to make write tests platform indendent.
+    *
+    * @param string $line Line
+    * @return string
+    */
+    function conv_lineend($line) {
+        return rtrim($line).PHP_EOL;
+    }
 }
 ?>
\ No newline at end of file