Removed simpletest and moved all tests in the unit tree

Tests are executed now, but a lot of them need fixing.

2 files changed, 0 insertions, 245 deletions

diff --git a/tests/simple_unit/Soap/ContactManager.php b/tests/simple_unit/Soap/ContactManager.php
deleted file mode 100644
index 2fbeec48..00000000
--- a/tests/simple_unit/Soap/ContactManager.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
-  * Keeps track of the people in our Contact list.
-  *
-  * Starts with a standard Contact list and can add
-  * new people to our list or change existing Contacts.
-  * This class is for example purposes only, just to
-  * show how to create a webservice
-  */
-class ContactManager{
-
-	/**
-	 * Gets the current Contact list.
-	 * @return Contact[]
-	 * @soapmethod
-	 */
-	public function	getContacts() {
-		$Contact = new Contact();
-		$Contact->address = new Address();
-		$Contact->address->city ="sesamcity";
-		$Contact->address->street ="sesamstreet";
-		$Contact->email = "me@you.com";
-		$Contact->id = 1;
-		$Contact->name ="me";
-
-		$ret[] = $Contact;
-		//debugObject("Contacten: ",$ret);
-		return $ret;
-	}
-
-	/**
-	  * Gets the Contact with the given id.
-	  * @param int $id The id
-	  * @return Contact
-	  * @soapmethod
-	  */
-	public function	getContact($id) {
-		//get Contact from db
-		//might wanna throw an exception when it does not exists
-		throw new Exception("Contact '$id' not found");
-	}
-	/**
-	  * Generates an new, empty Contact template
-	  * @return Contact
-	  * @soapmethod
-	  */
-	public function newContact() {
-		return new Contact();
-	}
-
-	/**
-	  * Saves a given Contact
-	  * @param Contact $Contact
-	  * @return boolean
-	  * @soapmethod
-	  */
-	public function saveContact(Contact $Contact) {
-		//error_log(var_export($Contact,true));
-		//$Contact->save();
-		return true;
-	}
-
-	/**
-	 * @return mixed
-	 * @soapmethod
-	 */
-	public function getList()
-	{
-		return array(array(1,2), array("12", 1.2));
-	}
-
-	/**
-	 * @return array
-	 * @soapmethod
-	 */
-	public function getEmptyArray()
-	{
-		return array();
-	}
-
-}
-
-
-/**
-  * The Contact details for a person
-  *
-  * Stores the person's name, address and e-mail
-  * This class is for example purposes only, just to
-  * show how to create a webservice
-  *
-  */
-class Contact{
-
-	/**
-	 * @var int $id
-	 * @soapproperty
-	 */
-	public $id;
-
-	/**
-	* @var string $name
-	 * @soapproperty
-	*/
-	public $name;
-
-	/** @var Address $address
-	 * @soapproperty
-	*/
-	public $address;
-
-	/** @var string $email
-	 * @soapproperty
-	*/
-	public $email;
-
-	/**
-	  * saves a Contact
-	  *
-	  * @return void
-	  */
-	public function save() {
-		//save Contact 2 db
-	}
-}
-
-/**
-  * Stores an address
-  *
-  * An address consists of a street, number, zipcode and city.
-  * This class is for example purposes only, just to
-  * show how to create a webservice
-  *
-  */
-class Address{
-	/** @var string $street
-	 * @soapproperty
-	*/
-	public $street;
-
-	/** @var string $nr
-	 * @soapproperty
-	*/
-	public $nr;
-
-	/** @var string $zipcode
-	 * @soapproperty
-	*/
-	public $zipcode;
-
-	/** @var string $city
-	 * @soapproperty
-	*/
-	public $city;
-}
diff --git a/tests/simple_unit/Soap/SoapTestCase.php b/tests/simple_unit/Soap/SoapTestCase.php
deleted file mode 100644
index 3aaa60d3..00000000
--- a/tests/simple_unit/Soap/SoapTestCase.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-ini_set("soap.wsdl_cache_enabled",0);
-
-require_once(dirname(__FILE__).'/ContactManager.php');
-
-class SoapTestCase extends UnitTestCase
-{
-	function getWsdlUri()
-	{
-		$script = str_replace('unit.php', 'ws.php',$_SERVER['SCRIPT_NAME']);
-		return "http://".$_SERVER['HTTP_HOST'].$script.'?soap=contacts.wsdl';
-	}
-
-	function getClient()
-	{
-		return new SoapClient($this->getWsdlUri());
-	}
-
-	function testContactArray()
-	{
-		$result = $this->getClient()->getContacts();
-		$this->assertEqual(count($result), 1);
-		$obj = $result->Contact;
-		$this->assertEqual($obj->name, "me");
-		$this->assertEqual($obj->id, 1);
-		$this->assertEqual($obj->address->street, "sesamstreet");
-		$this->assertNull($obj->address->nr);
-		$this->assertNull($obj->address->zipcode);
-		$this->assertEqual($obj->address->city, "sesamcity");
-		$this->assertEqual($obj->email, "me@you.com");
-	}
-
-	function testGetContactThrowsException()
-	{
-		try
-		{
-			$result = $this->getClient()->getContact(1);
-			$this->fail();
-		}
-		catch (SoapFault $f)
-		{
-			$this->pass();
-		}
-	}
-
-	function testGetNewContact()
-	{
-		$obj = $this->getClient()->newContact();
-		$this->assertNull($obj->name);
-		$this->assertNull($obj->id);
-		$this->assertNull($obj->address);
-		$this->assertNull($obj->email);
-	}
-
-	function testSaveContactReturnsTrue()
-	{
-		$c = new Contact;
-		$result = $this->getClient()->saveContact($c);
-		$this->assertTrue($result);
-	}
-
-	function getMixedArray()
-	{
-		$result = $this->getClient()>getList();
-		$expected = array(array(1,2), array("12", 1.2));
-		$this->assertEqual($result, $expected);
-	}
-
-	function testEmptyArray()
-	{
-		$result = $this->getClient()->getEmptyArray();
-		$this->assertTrue(is_array($result));
-		$this->assertEqual(count($result), 0);
-	}
-
-	function testUnknownFunctionThrowsException()
-	{
-		try
-		{
-			$this->getClient()->test();
-			$this->fail();
-		}
-		catch (SoapFault $f)
-		{
-			$this->pass();
-		}
-	}
-}
-