4 files changed, 97 insertions, 59 deletions

diff --git a/tests/unit/Xml/AllTests.php b/tests/unit/Xml/AllTests.php
index 0760474f..10658d42 100644
--- a/tests/unit/Xml/AllTests.php
+++ b/tests/unit/Xml/AllTests.php
@@ -5,9 +5,9 @@ if(!defined('PHPUnit_MAIN_METHOD')) {
   define('PHPUnit_MAIN_METHOD', 'Xml_AllTests::main');
 }
 
-require_once 'Xml/TXmlDocumentTest.php';
-require_once 'Xml/TXmlElementTest.php';
-require_once 'Xml/TXmlElementListTest.php';
+require_once 'TXmlDocumentTest.php';
+require_once 'TXmlElementTest.php';
+require_once 'TXmlElementListTest.php';
 
 class Xml_AllTests {
   public static function main() {
diff --git a/tests/unit/Xml/TXmlDocumentTest.php b/tests/unit/Xml/TXmlDocumentTest.php
index 1e588974..b47f735d 100644
--- a/tests/unit/Xml/TXmlDocumentTest.php
+++ b/tests/unit/Xml/TXmlDocumentTest.php
@@ -8,28 +8,28 @@ Prado::using('System.Xml.TXmlDocument');
  */
 class TXmlDocumentTest extends PHPUnit_Framework_TestCase {
 
-  public function testConstruct() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testConstruct() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 
-  public function testSetVersion() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testSetVersion() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 
-  public function testSetEncoding() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testSetEncoding() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 
-  public function testLoadFromFile() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testLoadFromFile() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 
-  public function testLoadFromString() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testLoadFromString() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 
-  public function testSaveToString() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testSaveToString() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/unit/Xml/TXmlElementListTest.php b/tests/unit/Xml/TXmlElementListTest.php
index eb91c46f..95906c1f 100644
--- a/tests/unit/Xml/TXmlElementListTest.php
+++ b/tests/unit/Xml/TXmlElementListTest.php
@@ -8,16 +8,16 @@ Prado::using('System.Xml.TXmlDocument');
  */
 class TXmlElementListTest extends PHPUnit_Framework_TestCase {
 
-  public function testConstruct() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testConstruct() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 
-  public function testInsertAt() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testInsertAt() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 
-  public function testRemoveAt() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testRemoveAt() {
+		throw new PHPUnit_Framework_IncompleteTestError();
+	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/unit/Xml/TXmlElementTest.php b/tests/unit/Xml/TXmlElementTest.php
index eec22b1f..89baed03 100644
--- a/tests/unit/Xml/TXmlElementTest.php
+++ b/tests/unit/Xml/TXmlElementTest.php
@@ -8,39 +8,77 @@ Prado::using('System.Xml.TXmlDocument');
  */
 class TXmlElementTest extends PHPUnit_Framework_TestCase {
 
-  public function setUp() {
-  }
+	public function setUp() {	
+	}
 
-  public function testConstruct() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testConstruct() {
+		$element = new TXmlElement('tag');
+		self::assertEquals('tag', $element->getTagName());
+	}
 
-  public function testSetParent() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testSetParent() {
+		$parent = new TXmlElement('parent');
+		$child = new TXmlElement('child');
+		$child->setParent($parent);
+		self::assertEquals($parent, $child->getParent());
+	}
 
-  public function testSetTagName() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testSetTagName() {
+		$element = new TXmlElement('tag');
+		$element->setTagName('newtag');
+		self::assertEquals('newtag', $element->getTagName());
+	}
 
-  public function testSetValue() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testSetValue() {
+		$element = new TXmlElement('tag');
+		$element->setValue('value');
+		self::assertEquals('value', $element->getValue());
+	}
 
-  public function testSetAttribute() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testHasElement() {
+		$element = new TXmlElement('first');
+		self::assertEquals(false, $element->getHasElement());
+		$element->Elements[] = new TXmlElement('second');
+		self::assertEquals(true, $element->getHasElement());
+	}
 
-  public function testGetElementByTagName() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testHasAttribute() {
+		$element = new TXmlElement('tag');
+		self::assertEquals(false, $element->getHasAttribute());
+		$element->Attributes[] = new TMap(array('key' => 'value'));
+		self::assertEquals(true, $element->getHasAttribute());
+	}
 
-  public function testGetElementsByTagName() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testSetAttribute() {
+		$element = new TXmlElement('tag');
+		self::assertEquals(null, $element->getAttribute('key'));
+		$element->setAttribute('key', 'value');
+		self::assertEquals('value', $element->getAttribute('key'));
+	}
 
-  public function testToString() {
-    throw new PHPUnit_Framework_IncompleteTestError();
-  }
+	public function testGetElementByTagName() {
+		$element = new TXmlElement('tag');
+		self::assertEquals(null, $element->getElementByTagName('first'));
+		$element->Elements[] = new TXmlElement('first');
+		$first = $element->getElementByTagName('first');
+		self::assertType('TXmlElement', $first);
+		self::assertEquals('first', $first->getTagName());
+	}
+
+	public function testGetElementsByTagName() {
+		$element = new TXmlElement('tag');
+		$element->Elements[] = new TXmlElement('tag');
+		$element->Elements[] = new TXmlElement('tag');
+		self::assertEquals(2, count($element->getElementsByTagName('tag')));
+	}
+
+	public function testToString() {
+		$element = new TXmlElement('tag');
+		self::assertEquals('<tag />', (string)$element);
+		$element->setAttribute('key', 'value');
+		self::assertEquals('<tag key="value" />', (string)$element);
+		$element->setValue('value');
+		self::assertEquals('<tag key="value">value</tag>', (string)$element);
+	}
 }
-?>
\ No newline at end of file
+?>