Get tests working

davidsklar · davidsklar · commit 6696c54867c0 · 2015-05-07T11:56:31.000-04:00
diff --git a/run-test b/run-test
diff --git a/tests/001.php b/tests/001.php
@@ -1,8 +1,3 @@
---TEST--
-Check for boxwood presence
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 echo "boxwood extension is available";
 /*
@@ -17,5 +12,3 @@
   writing regression tests
 */
 ?>
---EXPECT--
-boxwood extension is available
diff --git a/tests/001.php.expect b/tests/001.php.expect
@@ -0,0 +1 @@
+boxwood extension is available
diff --git a/tests/001.php.skipif b/tests/001.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/002.php b/tests/002.php
@@ -0,0 +1,4 @@
+<?php 
+$r = boxwood_new();
+var_dump($r);
+?>
diff --git a/tests/002.php.expectf b/tests/002.php.expectf
@@ -0,0 +1 @@
+resource(%d) of type (Boxwood)
diff --git a/tests/002.php.skipif b/tests/002.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/002.phpt b/tests/002.phpt
diff --git a/tests/003.php b/tests/003.php
@@ -1,13 +1,6 @@
---TEST--
-Add a word
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new();
 $a = boxwood_add_text($r, "monkey");
 $b = boxwood_add_text($r, "salad");
 print "$a,$b";
 ?>
---EXPECT--
-6,5
diff --git a/tests/003.php.expect b/tests/003.php.expect
@@ -0,0 +1 @@
+6,5
diff --git a/tests/003.php.skipif b/tests/003.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/004.php b/tests/004.php
@@ -1,14 +1,7 @@
---TEST--
-Do replacement
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new();
 $a = boxwood_add_text($r, "monkey");
 $b = boxwood_add_text($r, "salad");
 $c = boxwood_replace_text($r, "My monkey ate some salad today.","*");
 print $c;
 ?>
---EXPECT--
-My m***** ate some s**** today.
diff --git a/tests/004.php.expect b/tests/004.php.expect
@@ -0,0 +1 @@
+My m***** ate some s**** today.
diff --git a/tests/004.php.skipif b/tests/004.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/005.php b/tests/005.php
@@ -1,14 +1,7 @@
---TEST--
-Do case-insensitive replacement
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new(false);
 $a = boxwood_add_text($r, "Monkey");
 $b = boxwood_add_text($r, "salad");
 $c = boxwood_replace_text($r, "My monkey ate some Salad today.","!");
 print $c;
 ?>
---EXPECT--
-My m!!!!! ate some S!!!! today.
diff --git a/tests/005.php.expect b/tests/005.php.expect
@@ -0,0 +1 @@
+My m!!!!! ate some S!!!! today.
diff --git a/tests/005.php.skipif b/tests/005.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/006.php b/tests/006.php
@@ -1,14 +1,7 @@
---TEST--
-Do replacement with explicit no-case-insensitivity argument
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new(false);
 $a = boxwood_add_text($r, "monkey");
 $b = boxwood_add_text($r, "salad");
 $c = boxwood_replace_text($r, "My monkey ate some salad today.","~");
 print $c;
 ?>
---EXPECT--
-My m~~~~~ ate some s~~~~ today.
diff --git a/tests/006.php.expect b/tests/006.php.expect
@@ -0,0 +1 @@
+My m~~~~~ ate some s~~~~ today.
diff --git a/tests/006.php.skipif b/tests/006.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/007.php b/tests/007.php
@@ -1,8 +1,3 @@
---TEST--
-Replacement, UTF-8, case-sensitive
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new(true);
 boxwood_add_text($r, "monkey");
@@ -11,5 +6,3 @@
 $c = boxwood_replace_text($r, "My monkey ate some salad today and also some ŚÄłäđ and śäłäđ.","^");
 print $c;
 ?>
---EXPECT--
-My m^^^^^ ate some s^^^^ today and also some Ś^^^^ and śäłäđ.
diff --git a/tests/007.php.expect b/tests/007.php.expect
@@ -0,0 +1 @@
+My m^^^^^ ate some s^^^^ today and also some Ś^^^^ and śäłäđ.
diff --git a/tests/007.php.skipif b/tests/007.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/008.php b/tests/008.php
@@ -1,8 +1,3 @@
---TEST--
-Replacement, UTF-8, case-insensitive
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new(false);
 boxwood_add_text($r, "monkey");
@@ -11,5 +6,3 @@
 $c = boxwood_replace_text($r, "My monkey ate some salad today and also some ŚÄłäđ and śäłäđ.","*");
 print $c;
 ?>
---EXPECT--
-My m***** ate some s**** today and also some Ś**** and ś****.
diff --git a/tests/008.php.expect b/tests/008.php.expect
@@ -0,0 +1 @@
+My m***** ate some s**** today and also some Ś**** and ś****.
diff --git a/tests/008.php.skipif b/tests/008.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/009.php b/tests/009.php
@@ -1,8 +1,3 @@
---TEST--
-Prefix on word list
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new();
 boxwood_add_text($r, "mon");
@@ -19,6 +14,3 @@
 $c = boxwood_replace_text($r, "a mont monkeys mono eat monotremes",'*');
 print $c;
 ?>
---EXPECT--
-a m**t m*****s m**o eat m********s
-a m**t m*****s m**o eat m********s
diff --git a/tests/009.php.expect b/tests/009.php.expect
@@ -0,0 +1,2 @@
+a m**t m*****s m**o eat m********s
+a m**t m*****s m**o eat m********s
diff --git a/tests/009.php.skipif b/tests/009.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/010.php b/tests/010.php
@@ -1,8 +1,3 @@
---TEST--
-Array of words to replace
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) print "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new();
 boxwood_add_text($r, "mon");
@@ -12,6 +7,3 @@
 $c = boxwood_replace_text($r, $a,'*');
 print implode('-', $a) . "\n";
 print implode('-', $c) . "\n";
---EXPECT--
-a-mont-monkeys-mono-eat-monotremes
-a-m**t-m*****s-m**o-eat-m********s
diff --git a/tests/010.php.expect b/tests/010.php.expect
@@ -0,0 +1,2 @@
+a-mont-monkeys-mono-eat-monotremes
+a-m**t-m*****s-m**o-eat-m********s
diff --git a/tests/010.php.skipif b/tests/010.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) print "skip"; ?>
diff --git a/tests/011.php b/tests/011.php
@@ -1,8 +1,3 @@
---TEST--
-Word boundary tests
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) echo "skip"; ?>
---FILE--
 <?php 
 $r = boxwood_new();
 boxwood_add_text($r, "xxx");
@@ -31,48 +26,3 @@
     echo "\n";
 }
 ?>
---EXPECTF--
-aaa x** bbb
-aaa x** bbb
-
-aaax**
-aaaxxx
-
-x**bbb
-xxxbbb
-
-aaax**bbb
-aaaxxxbbb
-
-aaa(x**)bbb
-aaa(x**)bbb
-
-x** bbb
-x** bbb
-
-aaa x**
-aaa x**
-
-aaa?x**!bbb
-aaa?x**!bbb
-
-ax**
-axxx
-
-x**b
-xxxb
-
-x**
-x**
-
-(x**
-(x**
-
-x**)
-x**)
-
-aaa%ax**
-aaa%ax**
-
-aaa%ax**
-aaa%axxx
diff --git a/tests/011.php.expectf b/tests/011.php.expectf
@@ -0,0 +1,44 @@
+aaa x** bbb
+aaa x** bbb
+
+aaax**
+aaaxxx
+
+x**bbb
+xxxbbb
+
+aaax**bbb
+aaaxxxbbb
+
+aaa(x**)bbb
+aaa(x**)bbb
+
+x** bbb
+x** bbb
+
+aaa x**
+aaa x**
+
+aaa?x**!bbb
+aaa?x**!bbb
+
+ax**
+axxx
+
+x**b
+xxxb
+
+x**
+x**
+
+(x**
+(x**
+
+x**)
+x**)
+
+aaa%ax**
+aaa%ax**
+
+aaa%ax**
+aaa%axxx
diff --git a/tests/011.php.skipif b/tests/011.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) echo "skip"; ?>
diff --git a/tests/012.php b/tests/012.php
@@ -1,8 +1,3 @@
---TEST--
-Word boundary tests with alternate boundary set
---SKIPIF--
-<?php if (!extension_loaded("boxwood")) echo "skip"; ?>
---FILE--
 <?php 
 $def = boxwood_new();
 $alt = boxwood_new();
@@ -26,28 +21,3 @@
     echo "\n";
 }
 ?>
---EXPECT--
-aaax**
-aaaxxx
-aaax**
-aaaxxx
-
-aaa x** bbb
-aaa x** bbb
-aaa x** bbb
-aaa xxx bbb
-
-aaa(x**)bbb
-aaa(x**)bbb
-aaa(x**)bbb
-aaa(x**)bbb
-
-x**
-x**
-x**
-x**
-
-aaa-x**-bbb
-aaa-x**-bbb
-aaa-x**-bbb
-aaa-xxx-bbb
diff --git a/tests/012.php.expect b/tests/012.php.expect
@@ -0,0 +1,24 @@
+aaax**
+aaaxxx
+aaax**
+aaaxxx
+
+aaa x** bbb
+aaa x** bbb
+aaa x** bbb
+aaa xxx bbb
+
+aaa(x**)bbb
+aaa(x**)bbb
+aaa(x**)bbb
+aaa(x**)bbb
+
+x**
+x**
+x**
+x**
+
+aaa-x**-bbb
+aaa-x**-bbb
+aaa-x**-bbb
+aaa-xxx-bbb
diff --git a/tests/012.php.skipif b/tests/012.php.skipif
@@ -0,0 +1 @@
+<?php if (!extension_loaded("boxwood")) echo "skip"; ?>
diff --git a/tests/013.php b/tests/013.php
@@ -0,0 +1,20 @@
+<?php 
+$r = boxwood_new();
+boxwood_add_text($r, "ɹǝqɯǝɯ");
+
+$tests = array(
+    'ǝɔuǝıɹǝdxǝ ɹǝqɯǝɯ ɐƃǝɯo',
+    'ǝɔuǝıɹǝdxǝɹǝqɯǝɯ ɐƃǝɯo',
+    'ǝɔuǝıɹǝdxǝ ɹǝqɯǝɯɐƃǝɯo',
+    'ǝɔuǝıɹǝdxǝɹǝqɯǝɯɐƃǝɯo',
+    'ǝɔuǝıɹǝdxǝ(ɹǝqɯǝɯ)ɐƃǝɯo',
+    'ɹǝqɯǝɯ ɐƃǝɯo',
+    'ǝɔuǝıɹǝdxǝ ɹǝqɯǝɯ',
+);
+
+foreach ($tests as $test) {
+    echo boxwood_replace_text($r, $test, '*', false), "\n";
+    echo boxwood_replace_text($r, $test, '*', true), "\n";
+    echo "\n";
+}
+?>
diff --git a/tests/013.php.expect b/tests/013.php.expect
diff --git a/tests/013.php.skipif b/tests/013.php.skipif
diff --git a/tests/013.phpt b/tests/013.phpt
diff --git a/tests/baz-23266-2.php b/tests/baz-23266-2.php
diff --git a/tests/baz-23266-2.php.expect b/tests/baz-23266-2.php.expect
diff --git a/tests/baz-23266-2.php.skipif b/tests/baz-23266-2.php.skipif
diff --git a/tests/baz-23266.php b/tests/baz-23266.php
diff --git a/tests/baz-23266.php.expect b/tests/baz-23266.php.expect
diff --git a/tests/baz-23266.php.skipif b/tests/baz-23266.php.skipif

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<?php if (!extension_loaded("boxwood")) print "skip"; ?>`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<?php
 +$r = boxwood_new();
 +var_dump($r);
 +?>