little refactoring to work easier on other servers

jesstelford · Dec 11, 2008 · c0700b5 · c0700b5
1 parent b207c99
commit c0700b5
Show file tree

Hide file tree

Showing 23 changed files with 482 additions and 22 deletions.
diff --git a/JsonSchema.php b/JsonSchema.php
diff --git a/JsonSchemaUndefined.php b/JsonSchemaUndefined.php
@@ -0,0 +1,3 @@
+<?php
+class JsonSchemaUndefined {}
+?>
diff --git a/seleniumTests/SUITEPhpJsJsonSchemaValidator b/seleniumTests/SUITEPhpJsJsonSchemaValidator
@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <link rel="selenium.base" href="http://jsonschemaphpvalidator" />
   <title>Test Suite</title>
 </head>
 <body>

diff --git a/seleniumTests/additionalProperties b/seleniumTests/additionalProperties
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/arrays b/seleniumTests/arrays
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/basicTypes b/seleniumTests/basicTypes
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://essaylibrary/" />
+<link rel="selenium.base" href="http://jsonschemaphpv" />
 <title>basicTypes</title>
 </head>
 <body>
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/disallow b/seleniumTests/disallow
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/enum b/seleniumTests/enum
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/extends b/seleniumTests/extends
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/maxDecimal b/seleniumTests/maxDecimal
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/minItemsMaxItems b/seleniumTests/minItemsMaxItems
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/minLengthMaxLength b/seleniumTests/minLengthMaxLength
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/minimumMaximum b/seleniumTests/minimumMaximum
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/numberAndIntegerTypes b/seleniumTests/numberAndIntegerTypes
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/optionalProperty b/seleniumTests/optionalProperty
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/pattern b/seleniumTests/pattern
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/require b/seleniumTests/require
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/selfDefinedSchema b/seleniumTests/selfDefinedSchema
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/tupleTyping b/seleniumTests/tupleTyping
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/unionTypes b/seleniumTests/unionTypes
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/unionWithNullValue b/seleniumTests/unionWithNullValue
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/seleniumTests/wrongMessagesFailingTestCase b/seleniumTests/wrongMessagesFailingTestCase
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/jsonValidator/validator.html</td>
+	<td>/validator.html</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/validate.php b/validate.php
@@ -1,5 +1,6 @@
 <?php
-require_once('../../plugins/JsSchema/lib/JsSchema.php');
+require_once('JsonSchema.php');
+require_once('JsonSchemaUndefined.php');
 Dbg::$quietMode = true;
 
 if($_REQUEST['schema']) {
@@ -17,7 +18,7 @@
   trigger_error('Could not parse the JSON object.',E_USER_ERROR);
 }
 
-$result = JsSchema::validate(
+$result = JsonSchema::validate(
   $json,
   $schema
 );