Screen orientation: simplify lock-basic.html (#36635)

web-platform-tests · Sep 5, 2023 · 1228817 · 1228817
1 parent da48678
commit 1228817
Showing 1 changed file with 25 additions and 48 deletions.
diff --git a/screen-orientation/lock-basic.html b/screen-orientation/lock-basic.html
@@ -1,47 +1,26 @@
 <!DOCTYPE html>
+<meta charset="utf-8" />
+<meta viewport="width=device-width, initial-scale=1" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<script>
-async function cleanup() {
-  try {
-    await document.exitFullscreen();
-  } catch (e) {}
-  screen.orientation.unlock();
-}
+<script type="module">
+import { attachIframe, makeCleanup, getOppositeOrientation } from "./resources/orientation-utils.js";
 
 promise_test(async t => {
-  t.add_cleanup(cleanup);
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
-  screen.orientation.unlock();
-}, "Test that screen.orientation.unlock() doesn't throw when there is no lock with fullscreen");
-
-test(() => {
-  screen.orientation.unlock();
-}, "Test that screen.orientation.unlock() doesn't throw when there is no lock");
-
-test(() => {
-  const value = screen.orientation.unlock();
-  assert_equals(value, undefined);
-}, "Test that screen.orientation.unlock() returns a void value");
-
-promise_test(async t => {
-  t.add_cleanup(cleanup);
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
+  t.add_cleanup(makeCleanup());
+  await test_driver.bless("request full screen")
+  await document.documentElement.requestFullscreen();
   const value = await screen.orientation.lock('any');
   assert_equals(value, undefined);
 }, "Test that screen.orientation.lock returns a promise which will be fulfilled with a void value.");
 
 promise_test(async t => {
-  t.add_cleanup(cleanup);
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
+  t.add_cleanup(makeCleanup());
+  await test_driver.bless("request full screen")
+  await document.documentElement.requestFullscreen();
+  const initialOrientation = screen.orientation.type;
   const orientations = [
     'any',
     'natural',
@@ -53,47 +32,45 @@
     'portrait-primary',
   ];
   for (const orientation of orientations) {
-    const promiseToChange = screen.orientation.lock(orientation);
-    assert_true(promiseToChange instanceof Promise, "Expected an instance of Promise");
     try {
-      await promiseToChange;
+      await screen.orientation.lock(orientation);
     } catch(err) {
       if (err.name === "NotSupportedError") {
         continue;
       }
       assert_unreached("Unknown error: " + err);
     }
-    const type = screen.orientation.type;
+    const { type } = screen.orientation;
     switch (orientation) {
     case 'any':
       break;
     case 'natural':
-      assert_true(type == "portrait-primary" || type == "landscape-primary");
+      assert_true(type.endsWith("primary"), `Expected primary orientation for "${orientation}", got "${type}"`);
       break;
     case 'portrait':
-      assert_true(type == "portrait-primary" || type == "portrait-secondary");
+      assert_true(type.startsWith("portrait"), `Expected portrait orientation for "${orientation}", got "${type}"`);
       break;
     case 'landscape':
-      assert_true(type == "landscape-primary" || type == "landscape-secondary");
+      assert_true(type.startsWith("landscape"), `Expected landscape orientation for "${orientation}", got "${type}"`);
       break;
     default:
       assert_equals(type, orientation, "Expected orientation to change");
       break;
     }
+    await screen.orientation.lock(initialOrientation);
   }
 }, "Test that screen.orientation.lock returns a pending promise.");
 
 promise_test(async t => {
-  t.add_cleanup(cleanup);
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
-  const preType = screen.orientation.type;
-  const isPortrait = preType.includes("portrait");
-  const newType = `${ isPortrait ? "landscape" : "portrait" }`;
+  t.add_cleanup(makeCleanup());
+  await test_driver.bless("request full screen")
+  await document.documentElement.requestFullscreen();
+  const initialType = screen.orientation.type;
+  const newType = getOppositeOrientation();
   const p = screen.orientation.lock(newType);
-  assert_equals(screen.orientation.type, preType, "Must not change orientation until next spin of event loop");
+  assert_equals(screen.orientation.type, initialType, "Must not change orientation until next spin of event loop");
   await p;
-  assert_true(screen.orientation.type.startsWith(newType), `Expected type to start with ${newType}`);
+  const finalType = screen.orientation.type;
+  assert_true(finalType.startsWith(newType), `Expected type to start with ${newType}, got "${finalType}"`);
 }, "Test that screen.orientation.lock() is actually async");
 </script>