Move working tests up a folder (#503)

Tests in the experimental/ folder were not executed on CI. The ones that work move up, the few
that remain in experimental/ need further investigation to get working or remove.

Author: xPaw

tests/experimental/add_bykey.phpt renamed to tests/add_bykey.phpt

@@ -1,10 +1,10 @@
 --TEST--
 Memcached::addByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->delete('foo');
@@ -15,7 +15,7 @@ echo $m->getResultMessage(), "\n";
 var_dump($m->addByKey('foo', '', 1, 10));
 echo $m->getResultMessage(), "\n";
 // This is OK for the binary protocol
-$rv = $m->addByKey('foo', ' asd åäö', 1, 1);
+$rv = $m->addByKey('foo', ' asd åäö', 1, 1);
 if ($m->getOption(Memcached::OPT_BINARY_PROTOCOL)) {
 	if ($rv !== true and $m->getResultCode() !== Memcached::RES_SUCCESS) {
 		var_dump($rv);

tests/experimental/addserver_unixdomain.phpt renamed to tests/addserver_unixdomain.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Memcached::addServer() unix doamin socket
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --CLEAN--
 <?php
 unlink('/tmp/memc_test_unix_socket');

tests/experimental/append_bykey.phpt renamed to tests/append_bykey.phpt

@@ -1,10 +1,10 @@
 --TEST--
 Memcached::appendByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 $m->setOption(Memcached::OPT_COMPRESSION, false);
 

tests/experimental/cas_bykey.phpt renamed to tests/cas_bykey.phpt

@@ -1,10 +1,10 @@
 --TEST--
 Memcached::casByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->delete('cas_test');

tests/experimental/cas_invalid_key.phpt renamed to tests/cas_invalid_key.phpt

@@ -1,17 +1,17 @@
 --TEST--
 Memcached::cas() with strange key
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 error_reporting(0);
 var_dump($m->cas(0, '', true, 10));
 echo $m->getResultMessage(), "\n";
 
-var_dump($m->cas(0, ' äö jas kjjhask d ', true, 10)); # no spaces allowed
+var_dump($m->cas(0, ' äö jas kjjhask d ', true, 10)); # no spaces allowed
 echo $m->getResultMessage(), "\n";
 
 --EXPECTF--

tests/experimental/delete_bykey.phpt renamed to tests/delete_bykey.phpt

@@ -1,10 +1,10 @@
 --TEST--
 Memcached::deleteByKey()
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $m->setByKey('keffe', 'eisaleeoo', "foo");
@@ -21,7 +21,7 @@ var_dump($m->deleteByKey('keffe', ''));
 echo $m->getResultMessage(), "\n";
 var_dump($m->deleteByKey('', 'keffe'));
 echo $m->getResultMessage(), "\n";
-var_dump($m->deleteByKey('keffe', 'äöåasäö åaösdäf asdf')); # no spaces allowed
+var_dump($m->deleteByKey('keffe', 'äöåasäö åaösdäf asdf')); # no spaces allowed
 echo $m->getResultMessage(), "\n";
 --EXPECTF--
 string(3) "foo"

tests/experimental/deletemulti_nonstringkeys.phpt renamed to tests/deletemulti_nonstringkeys.phpt

@@ -1,10 +1,10 @@
 --TEST--
 Delete multi with integer keys
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $data = array(

tests/experimental/get_bykey_cas.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Memcached getDelayed() and fetch() with and without cas
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
 
@@ -33,7 +33,7 @@ function simple_compare(array $data, array $actual, $has_cas) {
 }
 
 
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 $data = array(

tests/experimental/fetch.phpt renamed to tests/fetch.phpt

@@ -1,10 +1,10 @@
 --TEST--
 Memcached::fetch() with bad unserialize
 --SKIPIF--
-<?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
+<?php include "skipif.inc";?>
 --FILE--
 <?php
-include dirname(dirname(__FILE__)) . '/config.inc';
+include dirname(__FILE__) . '/config.inc';
 $m = memc_get_instance ();
 
 class Foo implements Serializable {
@@ -31,6 +31,17 @@ class Foo implements Serializable {
 	public function unserialize($str) {
 		throw new Exception("123456");
 	}
+
+	public function __serialize() {
+		if ($this->serialize_throws) {
+			throw new Exception("1234");
+		}
+		return ["1234"];
+	}
+
+	public function __unserialize($str) {
+		throw new Exception("123456");
+	}
 }
 
 $data = new Foo();