From 1ceb297a6a835845eeb649550591c6545d8b8d02 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <info@steffenvogel.de>
Date: Thu, 24 Mar 2011 22:42:39 +0100
Subject: [PATCH] updated tests and added hint

---
 misc/tests/README            |  3 +++
 misc/tests/ajax.php          |  2 +-
 misc/tests/configuration.php |  2 +-
 misc/tests/json.php          |  2 +-
 misc/tests/properties.php    |  8 ++++----
 misc/tests/random.php        | 13 ++-----------
 6 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 misc/tests/README

diff --git a/misc/tests/README b/misc/tests/README
new file mode 100644
index 0000000..fd3b33d
--- /dev/null
+++ b/misc/tests/README
@@ -0,0 +1,3 @@
+This directory contains some small scripts to test middleware components.
+
+WARNING: some of these scripts may be outdated!
diff --git a/misc/tests/ajax.php b/misc/tests/ajax.php
index 0eb796e..95b172a 100644
--- a/misc/tests/ajax.php
+++ b/misc/tests/ajax.php
@@ -36,7 +36,7 @@
 
 <script type="text/javascript">
 $(document).ready(function() {
-	$.getJSON('../../backend/group.json?operation=get&recursive=1', function(data) {
+	$.getJSON('../htdocs/middleware.php/group.json', function(data) {
 		$('#tree').jstree({
 			'plugins' : [ 'themes', 'ui', ],
 			'types' : {
diff --git a/misc/tests/configuration.php b/misc/tests/configuration.php
index a96ee03..e2f74c8 100644
--- a/misc/tests/configuration.php
+++ b/misc/tests/configuration.php
@@ -26,7 +26,7 @@
 
 use Volkszaehler\Util;
 
-include '../../backend/lib/Util/Configuration.php';
+include '../lib/Util/Configuration.php';
 echo '<pre>';
 
 Util\Configuration::load('test.conf');
diff --git a/misc/tests/json.php b/misc/tests/json.php
index 47396bd..9499b78 100644
--- a/misc/tests/json.php
+++ b/misc/tests/json.php
@@ -25,7 +25,7 @@
  */
 
 use Volkszaehler\Util;
-include '../../backend/lib/Util/JSON.php';
+include '../lib/Util/JSON.php';
 echo '<pre>';
 
 $data = '{
diff --git a/misc/tests/properties.php b/misc/tests/properties.php
index 5d0d7b1..0d562b7 100644
--- a/misc/tests/properties.php
+++ b/misc/tests/properties.php
@@ -27,11 +27,11 @@
 use Volkszaehler\Util;
 use Volkszaehler\Model;
 
-define('VZ_DIR', '/home/steffen/workspace/volkszaehler.org');	// TODO realpath(__DIR__)
+define('VZ_DIR', realpath(__DIR__ . '/..'));
 
-include '../../backend/lib/Util/JSONDefinition.php';
-include '../../backend/lib/Model/Property.php';
-include '../../backend/lib/Util/JSON.php';
+include '../lib/Util/JSONDefinition.php';
+include '../lib/Model/Property.php';
+include '../lib/Util/JSON.php';
 
 echo '<pre>';
 
diff --git a/misc/tests/random.php b/misc/tests/random.php
index 0354e6a..17aa8d6 100644
--- a/misc/tests/random.php
+++ b/misc/tests/random.php
@@ -24,9 +24,8 @@
  * along with volkszaehler.org. If not, see <http://www.gnu.org/licenses/>.
  */
 
-include '../../backend/lib/Util/Random.php';
-include '../../backend/lib/Util/UUID.php';
-include '../../backend/lib/Model/Token.php';
+include '../lib/Util/Random.php';
+include '../lib/Util/UUID.php';
 
 use Volkszaehler\Model;
 use Volkszaehler\Util;
@@ -50,14 +49,6 @@ echo 'String: ' . Util\Random::getString($chars, 100) . PHP_EOL;
 echo 'Bytes: ' . Util\Random::getBytes(100) . PHP_EOL;
 ?>
 </pre>
-<h4>Token tests</h4>
-<pre>
-<?php
-for ($i = 0; $i < 100; $i++) {
-	echo new Model\Token() . PHP_EOL;
-}
-?>
-</pre>
 <h4>UUId tests</h4>
 <pre>
 <?php