From ecf3d2ac63c39304a7ba2c8b4860cb142a9409cb Mon Sep 17 00:00:00 2001
From: "Igor V. Gulyaev" <igulyaev@setevisor.tv>
Date: Fri, 28 Oct 2011 12:46:03 +0400
Subject: [PATCH 1/3] + add simple view render test

---
 test/main/ViewTest.class.php                  | 35 +++++++++++++++++++
 test/main/data/views/testPartView.tpl.html    |  1 +
 test/main/data/views/testView.tpl.html        |  3 ++
 .../main/data/views/testViewToString.tpl.html |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 test/main/ViewTest.class.php
 create mode 100644 test/main/data/views/testPartView.tpl.html
 create mode 100644 test/main/data/views/testView.tpl.html
 create mode 100644 test/main/data/views/testViewToString.tpl.html

diff --git a/test/main/ViewTest.class.php b/test/main/ViewTest.class.php
new file mode 100644
index 0000000000..bbef325881
--- /dev/null
+++ b/test/main/ViewTest.class.php
@@ -0,0 +1,35 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2011 by Igor V. Gulyaev                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	final class ViewTest extends TestCase
+	{
+		private $resolver = null;
+
+		public function __construct($name = NULL, array $data = array(), $dataName = '')
+		{
+			parent::__construct($name, $data, $dataName);
+
+			$this->resolver = new PhpViewResolver(ONPHP_TEST_PATH.'main/data/views/', EXT_TPL);
+		}
+
+		public function testToString()
+		{
+			$renderView = $this->resolver->resolveViewName('testView');
+			$toStringView = $this->resolver->resolveViewName('testViewToString');
+
+			$model = Model::create();
+
+			$this->assertTrue(
+				$toStringView->toString($model) == $renderView->toString($model)
+			);
+		}
+	}
+?>
\ No newline at end of file
diff --git a/test/main/data/views/testPartView.tpl.html b/test/main/data/views/testPartView.tpl.html
new file mode 100644
index 0000000000..327ba4bb10
--- /dev/null
+++ b/test/main/data/views/testPartView.tpl.html
@@ -0,0 +1 @@
+PartView
\ No newline at end of file
diff --git a/test/main/data/views/testView.tpl.html b/test/main/data/views/testView.tpl.html
new file mode 100644
index 0000000000..86284a597f
--- /dev/null
+++ b/test/main/data/views/testView.tpl.html
@@ -0,0 +1,3 @@
+TestView Begin <?php
+	$partViewer->view('testPartView')
+?> TestViewEnd
\ No newline at end of file
diff --git a/test/main/data/views/testViewToString.tpl.html b/test/main/data/views/testViewToString.tpl.html
new file mode 100644
index 0000000000..a8e0d8ad56
--- /dev/null
+++ b/test/main/data/views/testViewToString.tpl.html
@@ -0,0 +1 @@
+TestView Begin <?=$partViewer->toString('testPartView')?> TestViewEnd
\ No newline at end of file

From 86913b20afce74ed5014a4adb3a2ac40ee9cd078 Mon Sep 17 00:00:00 2001
From: "Igor V. Gulyaev" <igulyaev@setevisor.tv>
Date: Mon, 7 Nov 2011 10:50:30 +0400
Subject: [PATCH 2/3] * view test initialization fix

---
 test/main/ViewTest.class.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/main/ViewTest.class.php b/test/main/ViewTest.class.php
index bbef325881..80031eb51c 100644
--- a/test/main/ViewTest.class.php
+++ b/test/main/ViewTest.class.php
@@ -11,13 +11,16 @@
 
 	final class ViewTest extends TestCase
 	{
-		private $resolver = null;
+		protected static $resolver;
 
-		public function __construct($name = NULL, array $data = array(), $dataName = '')
+		public static function setUpBeforeClass()
 		{
-			parent::__construct($name, $data, $dataName);
+			self::$resolver = new PhpViewResolver(ONPHP_TEST_PATH.'main/data/views/', EXT_TPL);
+		}
 
-			$this->resolver = new PhpViewResolver(ONPHP_TEST_PATH.'main/data/views/', EXT_TPL);
+		public static function tearDownAfterClass()
+		{
+			self::$resolver = NULL;
 		}
 
 		public function testToString()

From 657b129c59859a65808c9b0322fdc05a9ca286fb Mon Sep 17 00:00:00 2001
From: "Igor V. Gulyaev" <igulyaev@setevisor.tv>
Date: Mon, 7 Nov 2011 10:54:02 +0400
Subject: [PATCH 3/3] * view test tune

---
 test/main/ViewTest.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/main/ViewTest.class.php b/test/main/ViewTest.class.php
index 80031eb51c..052cc0a355 100644
--- a/test/main/ViewTest.class.php
+++ b/test/main/ViewTest.class.php
@@ -25,8 +25,8 @@ public static function tearDownAfterClass()
 
 		public function testToString()
 		{
-			$renderView = $this->resolver->resolveViewName('testView');
-			$toStringView = $this->resolver->resolveViewName('testViewToString');
+			$renderView = self::$resolver->resolveViewName('testView');
+			$toStringView = self::$resolver->resolveViewName('testViewToString');
 
 			$model = Model::create();