new testcases

5 files changed, 72 insertions, 34 deletions

diff --git a/ext/rpc/tests/test1.php b/ext/rpc/tests/test1.php
index aee876aedb..b61a4aad5f 100644
--- a/ext/rpc/tests/test1.php
+++ b/ext/rpc/tests/test1.php
@@ -1,39 +1,14 @@
 <?php
-print "huhuhdsa";
 
-$rpc = new com("class", true, "huh");
-$rpc2 = new com("class", true, "hehe", 1);
-$rpc->call("blah");
-$rpc->call("heh");
-$rpc->call("blah");
-com_call($rpc, 1, "1");
-com_call($rpc, 1, "1");
-$rpc->call("blah");
-$rpc->call("blah");
-$rpc->call("blah");
-$rpc2->call("hehe");
-$rpc2->call("hehe");
-$rpc2->call("hehe");
-$rpc2->call("hehe");
-$rpc2->call("hehe");
-com_call($rpc, "call", 1);
-com_call($rpc, 1, "1");
-com_call($rpc, "call", 1);
-com_call($rpc2, "call", 1);
-com_call($rpc2, "call", 1);
-//$rpc->addref();
+$rpc = new com("class");
 
-//$clone = $rpc->__clone();
+/* class hirarchy test */
+echo "is class .. " . (get_class($rpc) == "class" ? "passed" : "faiure");
+echo "\n";
+echo "is com   .. " . (is_subclass_of($rpc, "com") ? "passed" : "failure");
+echo "\n";
+echo "is rpc   .. " . (is_subclass_of($rpc, "rpc") ? "passed" : "failure");
 
-//$rpc->prop = 1;
-//$a = $rpc->prop;
-
-//$a = &$rpc->prop;
-
-//delete $rpc;
-//delete $clone;
-
-$heh = com_load("heh", 1);
-$heh->knorp();
-/*delete $heh;*/
+/* uncloneable */
+//$rpc->__clone(); // issues a fatal
 ?>
\ No newline at end of file
diff --git a/ext/rpc/tests/test2.php b/ext/rpc/tests/test2.php
new file mode 100644
index 0000000000..666033da2a
--- /dev/null
+++ b/ext/rpc/tests/test2.php
@@ -0,0 +1,20 @@
+<?php
+
+echo "hash test\n";
+
+/* hash test */
+$rpc1 = new com("hash", true, 1);
+$rpc2 = new com("hash", false, 2);
+$rpc3 = new com("hash", true, 3);
+$rpc4 = com_load("hash", false, 4);
+$rpc5 = com_load("hash", true, 5);
+
+$rpc1->{3} = "hh";
+com_set($rpc2, "hehe", 3);
+
+$rpc1->call("blah");
+$rpc2->call("blah");
+$rpc3->call("blah");
+$rpc4->call("heh");
+$rpc5->call("blah");
+?>
\ No newline at end of file
diff --git a/ext/rpc/tests/test3.php b/ext/rpc/tests/test3.php
new file mode 100644
index 0000000000..8fe522cb37
--- /dev/null
+++ b/ext/rpc/tests/test3.php
@@ -0,0 +1,19 @@
+<?php
+
+echo "singleton test\n";
+
+/* singleton test */
+$rpc1 = new com("singleton", true, 1);
+com_singleton($rpc1);
+
+$rpc2 = new com("singleton", false, 2);
+$rpc3 = new com("singleton", true, 3);
+$rpc4 = new com("singleton", false, 4);
+$rpc5 = new com("singleton", true, 5);
+
+delete $rpc1;
+delete $rpc2;
+delete $rpc3;
+delete $rpc4;
+delete $rpc5;
+?>
diff --git a/ext/rpc/tests/test4.php b/ext/rpc/tests/test4.php
new file mode 100644
index 0000000000..e690273672
--- /dev/null
+++ b/ext/rpc/tests/test4.php
@@ -0,0 +1,18 @@
+<?php
+
+echo "pooling test\n";
+
+/* pooling test */
+$rpc = new com("pooling", true, 1);
+com_poolable($rpc);
+delete $rpc;
+
+$rpc = new com("pooling", true, 1);
+delete $rpc;
+
+$rpc = new com("pooling", true, 1);
+delete $rpc;
+
+$rpc = new com("pooling", true, 1);
+delete $rpc;
+?>
diff --git a/ext/rpc/tests/tests.php b/ext/rpc/tests/tests.php
new file mode 100644
index 0000000000..2ea6a7d019
--- /dev/null
+++ b/ext/rpc/tests/tests.php
@@ -0,0 +1,6 @@
+<?php
+//include_once "test1.php";
+//include_once "test2.php";
+//include_once "test3.php";
+include_once "test4.php";
+?>