From 180cc9d9c4d89a9ae8f4ac8ddf52205fa1817b20 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Sat, 5 May 2007 21:43:41 +0000
Subject: [PATCH] fix tests, add more

---
 Zend/tests/compare_001.phpt           |  2 ++
 Zend/tests/compare_002.phpt           |  2 ++
 Zend/tests/compare_003.phpt           |  2 ++
 Zend/tests/compare_004.phpt           |  2 ++
 Zend/tests/compare_005.phpt           |  2 ++
 Zend/tests/compare_006.phpt           |  2 ++
 Zend/tests/decrement_001.phpt         |  2 ++
 Zend/tests/exception_handler_001.phpt | 22 ++++++++++++++++++++++
 Zend/tests/exception_handler_002.phpt | 27 +++++++++++++++++++++++++++
 Zend/tests/exception_handler_003.phpt | 26 ++++++++++++++++++++++++++
 Zend/tests/exception_handler_004.phpt | 21 +++++++++++++++++++++
 Zend/tests/exception_handler_005.phpt | 25 +++++++++++++++++++++++++
 Zend/tests/exception_handler_006.phpt | 27 +++++++++++++++++++++++++++
 13 files changed, 162 insertions(+)
 create mode 100644 Zend/tests/exception_handler_001.phpt
 create mode 100644 Zend/tests/exception_handler_002.phpt
 create mode 100644 Zend/tests/exception_handler_003.phpt
 create mode 100644 Zend/tests/exception_handler_004.phpt
 create mode 100644 Zend/tests/exception_handler_005.phpt
 create mode 100644 Zend/tests/exception_handler_006.phpt

diff --git a/Zend/tests/compare_001.phpt b/Zend/tests/compare_001.phpt
index 1ab64f0a10..059ed4a465 100644
--- a/Zend/tests/compare_001.phpt
+++ b/Zend/tests/compare_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables for equality
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_002.phpt b/Zend/tests/compare_002.phpt
index de7e06a2e7..889f700c49 100644
--- a/Zend/tests/compare_002.phpt
+++ b/Zend/tests/compare_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables for identity
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_003.phpt b/Zend/tests/compare_003.phpt
index 9889181b8c..6bd4f5d8bd 100644
--- a/Zend/tests/compare_003.phpt
+++ b/Zend/tests/compare_003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables (greater than)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_004.phpt b/Zend/tests/compare_004.phpt
index eb41937445..bcf80653bb 100644
--- a/Zend/tests/compare_004.phpt
+++ b/Zend/tests/compare_004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables (less than)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_005.phpt b/Zend/tests/compare_005.phpt
index 4001444b76..1fa6749e47 100644
--- a/Zend/tests/compare_005.phpt
+++ b/Zend/tests/compare_005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables (greater or equal than)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_006.phpt b/Zend/tests/compare_006.phpt
index f8be0f92bd..7107fd8bc0 100644
--- a/Zend/tests/compare_006.phpt
+++ b/Zend/tests/compare_006.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables (smaller or equal than)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/decrement_001.phpt b/Zend/tests/decrement_001.phpt
index 558f92eecd..027e68f2b6 100644
--- a/Zend/tests/decrement_001.phpt
+++ b/Zend/tests/decrement_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 decrementing different variables
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/exception_handler_001.phpt b/Zend/tests/exception_handler_001.phpt
new file mode 100644
index 0000000000..085abb001b
--- /dev/null
+++ b/Zend/tests/exception_handler_001.phpt
@@ -0,0 +1,22 @@
+--TEST--
+exception handler tests - 1
+--FILE--
+<?php
+
+set_exception_handler("foo");
+
+function foo($e) {
+	var_dump(get_class($e)." thrown!");
+}
+
+class test extends Exception {
+}
+
+throw new test();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(12) "test thrown!"
+--UEXPECTF--
+unicode(12) "test thrown!"
diff --git a/Zend/tests/exception_handler_002.phpt b/Zend/tests/exception_handler_002.phpt
new file mode 100644
index 0000000000..6003efec47
--- /dev/null
+++ b/Zend/tests/exception_handler_002.phpt
@@ -0,0 +1,27 @@
+--TEST--
+exception handler tests - 2
+--FILE--
+<?php
+
+set_exception_handler("foo");
+
+function foo($e) {
+	var_dump(get_class($e)." thrown!");
+	throw new Exception();
+}
+
+class test extends Exception {
+}
+
+throw new test();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(12) "test thrown!"
+
+Fatal error: Exception thrown without a stack frame in Unknown on line 0
+--UEXPECTF--
+unicode(12) "test thrown!"
+
+Fatal error: Exception thrown without a stack frame in Unknown on line 0
diff --git a/Zend/tests/exception_handler_003.phpt b/Zend/tests/exception_handler_003.phpt
new file mode 100644
index 0000000000..b980b9c894
--- /dev/null
+++ b/Zend/tests/exception_handler_003.phpt
@@ -0,0 +1,26 @@
+--TEST--
+exception handler tests - 3
+--FILE--
+<?php
+
+class test {
+
+	function foo () {
+		set_exception_handler(array($this, "bar"));
+	}
+
+	function bar($e) {
+		var_dump(get_class($e)." thrown!");
+	}
+}
+
+$a = new test;
+$a->foo();
+throw new Exception();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(17) "Exception thrown!"
+--UEXPECTF--
+unicode(17) "Exception thrown!"
diff --git a/Zend/tests/exception_handler_004.phpt b/Zend/tests/exception_handler_004.phpt
new file mode 100644
index 0000000000..2f367817e3
--- /dev/null
+++ b/Zend/tests/exception_handler_004.phpt
@@ -0,0 +1,21 @@
+--TEST--
+exception handler tests - 4
+--FILE--
+<?php
+
+set_exception_handler("fo");
+set_exception_handler(array("", ""));
+set_exception_handler();
+set_exception_handler("foo", "bar");
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: set_exception_handler() expects the argument (fo) to be a valid callback in %s on line %d
+
+Warning: set_exception_handler() expects the argument (::) to be a valid callback in %s on line %d
+
+Warning: Wrong parameter count for set_exception_handler() in %s on line %d
+
+Warning: Wrong parameter count for set_exception_handler() in %s on line %d
+Done
diff --git a/Zend/tests/exception_handler_005.phpt b/Zend/tests/exception_handler_005.phpt
new file mode 100644
index 0000000000..11ac0ba402
--- /dev/null
+++ b/Zend/tests/exception_handler_005.phpt
@@ -0,0 +1,25 @@
+--TEST--
+exception handler tests - 5
+--FILE--
+<?php
+
+set_exception_handler("foo");
+set_exception_handler("foo1");
+
+function foo($e) {
+	var_dump(__FUNCTION__."(): ".get_class($e)." thrown!");
+}
+
+function foo1($e) {
+	var_dump(__FUNCTION__."(): ".get_class($e)." thrown!");
+}
+
+
+throw new excEption();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(25) "foo1(): Exception thrown!"
+--UEXPECTF--
+unicode(25) "foo1(): Exception thrown!"
diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exception_handler_006.phpt
new file mode 100644
index 0000000000..63b4eff451
--- /dev/null
+++ b/Zend/tests/exception_handler_006.phpt
@@ -0,0 +1,27 @@
+--TEST--
+exception handler tests - 6
+--FILE--
+<?php
+
+set_exception_handler("foo");
+set_exception_handler("foo1");
+
+restore_exception_handler();
+
+function foo($e) {
+	var_dump(__FUNCTION__."(): ".get_class($e)." thrown!");
+}
+
+function foo1($e) {
+	var_dump(__FUNCTION__."(): ".get_class($e)." thrown!");
+}
+
+
+throw new excEption();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(24) "foo(): Exception thrown!"
+--UEXPECTF--
+unicode(24) "foo(): Exception thrown!"
-- 
2.50.1