Revert "Organizes the php scripts used for testing better, so that the whole logic of a unit, server-side and client-side, is contained within the unit itself. Nearly all ajax unit tests take advantage of the new 'framework'. Lots of files got deleted because they became redundant or weren't used anymore."

jaubourg · jaubourg · commit b7ece8c6206d · 2012-12-05T14:54:14.000+01:00
This reverts commit 228ab3d.
diff --git a/test/.jshintrc b/test/.jshintrc
@@ -41,15 +41,11 @@
     "ajaxTest": true,
     "testIframe": true,
     "testIframeWithCallback": true,
-	"createComplexHTML": true,
     "createDashboardXML": true,
-	"createWithFriesXML": true,
     "createXMLFragment": true,
     "moduleTeardown": true,
-    "testBar": true,
     "testFoo": true,
-	"url": true,
-	"service": true,
+    "url": true,
     "t": true,
     "q": true,
     "amdDefined": true,
diff --git a/test/data/ajax/echo/index.php b/test/data/ajax/echo/index.php
diff --git a/test/data/ajax/headers/cache/index.php b/test/data/ajax/headers/cache/index.php
diff --git a/test/data/ajax/headers/request/index.php b/test/data/ajax/headers/request/index.php
diff --git a/test/data/ajax/headers/response/index.php b/test/data/ajax/headers/response/index.php
diff --git a/test/data/atom+xml.php b/test/data/atom+xml.php
@@ -0,0 +1,4 @@
+<?php header("Content-type: atom+xml") ?>
+<root>
+	<element />
+</root>
diff --git a/test/data/badcall.js b/test/data/badcall.js
@@ -0,0 +1 @@
+undefined();
diff --git a/test/data/badjson.js b/test/data/badjson.js
@@ -0,0 +1 @@
+{bad: toTheBone}
diff --git a/test/data/cleanScript.html b/test/data/cleanScript.html
@@ -0,0 +1,10 @@
+<script>
+<!--
+ok( true, "script within html comments executed" );
+-->
+</script>
+<script>
+<![CDATA[
+ok( true, "script within CDATA executed" );
+]]>
+</script>
diff --git a/test/data/dashboard.xml b/test/data/dashboard.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dashboard>
+	<locations class="foo">
+		<location for="bar" checked="different">
+			<infowindowtab>
+				<tab title="Location"><![CDATA[blabla]]></tab>
+				<tab title="Users"><![CDATA[blublu]]></tab>
+			</infowindowtab>
+		</location>
+	</locations>
+</dashboard>
diff --git a/test/data/echoData.php b/test/data/echoData.php
@@ -0,0 +1 @@
+<?php echo file_get_contents('php://input'); ?>
diff --git a/test/data/echoQuery.php b/test/data/echoQuery.php
@@ -0,0 +1 @@
+<?php echo $_SERVER['QUERY_STRING']; ?>
diff --git a/test/data/errorWithText.php b/test/data/errorWithText.php
@@ -0,0 +1,5 @@
+<?php
+
+header("HTTP/1.0 400 Bad Request");
+
+echo "plain text message";
diff --git a/test/data/etag.php b/test/data/etag.php
@@ -0,0 +1,21 @@
+<?php
+error_reporting(0);
+
+$ts = $_REQUEST['ts'];
+$etag = md5($ts);
+
+$ifNoneMatch = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : false;
+if ($ifNoneMatch == $etag) {
+	header('HTTP/1.0 304 Not Modified');
+	die; // stop processing
+}
+
+header("Etag: " . $etag);
+
+if ( $ifNoneMatch ) {
+	echo "OK: " . $etag;
+} else {
+	echo "FAIL";
+}
+
+?>
diff --git a/test/data/evalScript.php b/test/data/evalScript.php
@@ -0,0 +1 @@
+ok( "<?php echo $_SERVER['REQUEST_METHOD'] ?>" === "GET", "request method is <?php echo $_SERVER['REQUEST_METHOD'] ?>" );
diff --git a/test/data/headers.php b/test/data/headers.php
@@ -0,0 +1,18 @@
+<?php
+
+header( "Sample-Header: Hello World" );
+header( "Empty-Header: " );
+header( "Sample-Header2: Hello World 2" );
+
+$headers = array();
+
+foreach( $_SERVER as $key => $value ) {
+
+	$key = str_replace( "_" , "-" , substr( $key , 0 , 5 ) == "HTTP_" ? substr( $key , 5 ) : $key );
+	$headers[ $key ] = $value;
+
+}
+
+foreach( explode( "_" , $_GET[ "keys" ] ) as $key ) {
+	echo "$key: " . @$headers[ strtoupper( $key ) ] . "\n";
+}
diff --git a/test/data/if_modified_since.php b/test/data/if_modified_since.php
@@ -0,0 +1,20 @@
+<?php
+error_reporting(0);
+
+$ts = $_REQUEST['ts'];
+
+$ifModifiedSince = isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE']) : false;
+if ($ifModifiedSince == $ts) {
+	header('HTTP/1.0 304 Not Modified');
+	die; // stop processing
+}
+
+header("Last-Modified: " . $ts);
+
+if ( $ifModifiedSince ) {
+	echo "OK: " . $ts;
+} else {
+	echo "FAIL";
+}
+
+?>
diff --git a/test/data/json.php b/test/data/json.php
@@ -0,0 +1,13 @@
+<?php
+error_reporting(0);
+if ( $_REQUEST['header'] ) {
+	header("Content-type: application/json");
+}
+
+$json = $_REQUEST['json'];
+if($json) {
+	echo '[ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ]';
+} else {
+	echo '{ "data": {"lang": "en", "length": 25} }';
+}
+?>
diff --git a/test/data/json_obj.js b/test/data/json_obj.js
@@ -0,0 +1 @@
+{ "data": {"lang": "en", "length": 25} }
diff --git a/test/data/jsonp.php b/test/data/jsonp.php
@@ -0,0 +1,14 @@
+<?php
+error_reporting(0);
+$callback = $_REQUEST['callback'];
+if ( ! $callback ) {
+	$callback = explode("?",end(explode("/",$_SERVER['REQUEST_URI'])));
+	$callback = $callback[0];
+}
+$json = $_REQUEST['json'];
+if($json) {
+	echo $callback . '([ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ])';
+} else {
+	echo $callback . '({ "data": {"lang": "en", "length": 25} })';
+}
+?>
diff --git a/test/data/name.html b/test/data/name.html
@@ -0,0 +1 @@
+ERROR <script type="text/javascript">ok( true, "name.html retrieved" );</script>
diff --git a/test/data/name.php b/test/data/name.php
@@ -0,0 +1,24 @@
+<?php
+error_reporting(0);
+$wait = $_REQUEST['wait'];
+if($wait) {
+	sleep($wait);
+}
+$xml = $_REQUEST['xml'];
+if($xml) {
+	header("Content-type: text/xml");
+	$result = ($xml == "5-2") ? "3" : "?";
+	echo "<math><calculation>$xml</calculation><result>$result</result></math>";
+	die();
+}
+$name = $_REQUEST['name'];
+if($name == 'foo') {
+	echo "bar";
+	die();
+} else if($name == 'peter') {
+	echo "pan";
+	die();
+}
+
+echo 'ERROR <script type="text/javascript">ok( true, "name.php executed" );</script>';
+?>
diff --git a/test/data/params_html.php b/test/data/params_html.php
@@ -0,0 +1,12 @@
+<div id="post">
+<?php
+	foreach( $_POST as $key=>$value )
+		echo "<b id='$key'>$value</b>";
+?>
+</div>
+<div id="get">
+<?php
+	foreach( $_GET as $key=>$value )
+		echo "<b id='$key'>$value</b>";
+?>
+</div>
diff --git a/test/data/script.php b/test/data/script.php
@@ -0,0 +1,11 @@
+<?php
+error_reporting(0);
+if ( $_REQUEST['header'] ) {
+	if ( $_REQUEST['header'] == "ecma" ) {
+		header("Content-type: application/ecmascript");
+	} else {
+		header("Content-type: text/javascript");
+	}
+}
+?>
+ok( true, "Script executed correctly." );
diff --git a/test/data/statusText.php b/test/data/statusText.php
@@ -0,0 +1,5 @@
+<?php
+
+header( "HTTP/1.0 $_GET[status] $_GET[text]" );
+
+?>
diff --git a/test/data/test.html b/test/data/test.html
@@ -0,0 +1,7 @@
+html text<br/>
+<script type="text/javascript">/* <![CDATA[ */
+testFoo = "foo"; jQuery('#foo').html('foo');
+ok( true, "test.html executed" );
+/* ]]> */</script>
+<script src="data/test.js"></script>
+blabla
diff --git a/test/data/test.js b/test/data/test.js
@@ -0,0 +1,3 @@
+var testBar = "bar";
+jQuery('#ap').html('bar');
+ok( true, "test.js executed");
diff --git a/test/data/test.php b/test/data/test.php
@@ -0,0 +1,7 @@
+html text<br/>
+<script type="text/javascript">/* <![CDATA[ */
+testFoo = "foo"; jQuery('#foo').html('foo');
+ok( true, "test.php executed" );
+/* ]]> */</script>
+<script src="data/test.js?<?php srand(); echo time() . '' . rand(); ?>"></script>
+blabla
diff --git a/test/data/test2.html b/test/data/test2.html
@@ -0,0 +1,5 @@
+<script type="text/javascript">
+var testFoo = "foo";
+jQuery('#foo').html('foo');
+ok( true, "test2.html executed" );
+</script>
diff --git a/test/data/test3.html b/test/data/test3.html
@@ -0,0 +1,3 @@
+<div class="user">This is a user</div>
+<div class="user">This is a user</div>
+<div class="teacher">This is a teacher</div>
diff --git a/test/data/testinit.js b/test/data/testinit.js
diff --git a/test/data/text.php b/test/data/text.php
diff --git a/test/data/ua.txt b/test/data/ua.txt
diff --git a/test/data/with_fries.xml b/test/data/with_fries.xml
diff --git a/test/data/with_fries_over_jsonp.php b/test/data/with_fries_over_jsonp.php
diff --git a/test/localfile.html b/test/localfile.html
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<?php header("Content-type: atom+xml") ?>
 +<root>
 +	<element />
 +</root>