Skip to content

Commit

Permalink
Merge pull request web-platform-tests#138 from inexorabletash/inexora…
Browse files Browse the repository at this point in the history
…bletash/sample-dir

Move apisamples to examples directory; r=Ms2ger
  • Loading branch information
Ms2ger committed Jul 6, 2015
2 parents 0790087 + 92e4553 commit d1cd614
Show file tree
Hide file tree
Showing 18 changed files with 31 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
importScripts("testharness.js");
importScripts("../testharness.js");

throw new Error("This failure is expected.");
2 changes: 1 addition & 1 deletion apisample-worker.js → examples/apisample-worker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
importScripts("testharness.js");
importScripts("../testharness.js");

test(
function(test) {
Expand Down
4 changes: 2 additions & 2 deletions apisample.htm → examples/apisample.htm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<body onload="load_test_attr.done()">
<h1>Sample HTML5 API Tests</h1>
<div id="log"></div>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
<script>
setup_run = false;
setup(function() {
Expand Down
4 changes: 2 additions & 2 deletions apisample10.html → examples/apisample10.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<h1>Async Tests and Promises</h1>
<p>This test assumes ECMAScript 6 Promise support. Some failures are expected.</p>
<div id="log"></div>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
<script>

test(function() {
Expand Down
4 changes: 2 additions & 2 deletions apisample11.html → examples/apisample11.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<title>Example with iframe that notifies containing document via callbacks</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
</head>
<body onload="start_test_in_iframe()">
<h1>Callbacks From Tests Running In An IFRAME</h1>
Expand Down
4 changes: 2 additions & 2 deletions apisample12.html → examples/apisample12.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<title>Example with iframe that notifies containing document via cross document messaging</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
</head>
<body>
<h1>Notifications From Tests Running In An IFRAME</h1>
Expand Down
4 changes: 2 additions & 2 deletions apisample13.html → examples/apisample13.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ <h1>Promise Tests</h1>
<p>This test demonstrates the use of <tt>promise_test</tt>. Assumes ECMAScript 6
Promise support. Some failures are expected.</p>
<div id="log"></div>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
<script>
test(
function() {
Expand Down
4 changes: 2 additions & 2 deletions apisample14.html → examples/apisample14.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<title>Dedicated Worker Tests</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
</head>
<body>
<h1>Dedicated Web Worker Tests</h1>
Expand Down
4 changes: 2 additions & 2 deletions apisample15.html → examples/apisample15.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<title>Example with a shared worker</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
</head>
<body>
<h1>Shared Web Worker Tests</h1>
Expand Down
4 changes: 2 additions & 2 deletions apisample16.html → examples/apisample16.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<title>Example with a service worker</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
</head>
<body>
<h1>Service Worker Tests</h1>
Expand Down
4 changes: 2 additions & 2 deletions apisample2.htm → examples/apisample2.htm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<h1>Sample HTML5 API Tests</h1>
<p>There should be two results</p>
<div id="log"></div>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
<script>
setup({explicit_done:true})
test(function() {assert_true(true)}, "Test defined before onload");
Expand Down
2 changes: 1 addition & 1 deletion apisample3.htm → examples/apisample3.htm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Sample HTML5 API Tests</title>
</head>
<script src="testharness.js"></script>
<script src="../testharness.js"></script>

<body onload="load_test_attr.done()">
<h1>Sample HTML5 API Tests</h1>
Expand Down
2 changes: 1 addition & 1 deletion apisample4.htm → examples/apisample4.htm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Harness Handling Uncaught Exception</title>
</head>
<script src="testharness.js"></script>
<script src="../testharness.js"></script>

<body>
<h1>Harness Handling Uncaught Exception</h1>
Expand Down
2 changes: 1 addition & 1 deletion apisample5.htm → examples/apisample5.htm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Harness Ignoring Uncaught Exception</title>
</head>
<script src="testharness.js"></script>
<script src="../testharness.js"></script>

<body>
<h1>Harness Ignoring Uncaught Exception</h1>
Expand Down
4 changes: 2 additions & 2 deletions apisample6.html → examples/apisample6.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<title>Example with file_is_test</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
<script>
onload = function() {
assert_true(true);
Expand Down
4 changes: 2 additions & 2 deletions apisample7.html → examples/apisample7.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<title>Example with file_is_test (should fail)</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
<script>
onload = function() {
assert_true(false);
Expand Down
4 changes: 2 additions & 2 deletions apisample8.html → examples/apisample8.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<title>Example single page test with no body</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
<script>
assert_true(true);
done();
Expand Down
4 changes: 2 additions & 2 deletions apisample9.html → examples/apisample9.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<title>Example single page test with no asserts</title>
<script src="testharness.js"></script>
<script src="testharnessreport.js"></script>
<script src="../testharness.js"></script>
<script src="../testharnessreport.js"></script>
<script>
done();
</script>

0 comments on commit d1cd614

Please sign in to comment.