Revert of Mojo EDK: Introduce MojoQueryHandleSignalsState API

mojo/public/js/tests/core_unittest.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 define([
     "gin/test/expect",
     "mojo/public/js/core",
     "gc",
   ], function(expect, core, gc) {
 
@@ skipping 71 matching lines @@
     expect(sharedBuffer.result).toBe(core.RESULT_OK);
     expect(core.isHandle(sharedBuffer.handle)).toBeTruthy();
 
     test(sharedBuffer, buffer_size);
   }
 
   function testNop(pipe) {
   }
 
   function testReadAndWriteMessage(pipe) {
-    var state0 = core.queryHandleSignalsState(pipe.handle0);
-    expect(state0.result).toBe(core.RESULT_OK);
-    expect(state0.satisfiedSignals).toBe(core.HANDLE_SIGNAL_WRITABLE);
-    expect(state0.satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
+    var wait = core.waitMany([], [], 0);
+    expect(wait.result).toBe(core.RESULT_INVALID_ARGUMENT);
+    expect(wait.index).toBe(null);
+    expect(wait.signalsState).toBe(null);
 
-    var state1 = core.queryHandleSignalsState(pipe.handle1);
-    expect(state1.result).toBe(core.RESULT_OK);
-    expect(state1.satisfiedSignals).toBe(core.HANDLE_SIGNAL_WRITABLE);
-    expect(state1.satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
+    wait = core.wait(pipe.handle0, core.HANDLE_SIGNAL_READABLE, 0);
+    expect(wait.result).toBe(core.RESULT_DEADLINE_EXCEEDED);
+    expect(wait.signalsState.satisfiedSignals).toBe(
+           core.HANDLE_SIGNAL_WRITABLE);
+    expect(wait.signalsState.satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
+
+    wait = core.waitMany(
+                  [pipe.handle0, pipe.handle1],
+                  [core.HANDLE_SIGNAL_READABLE,core.HANDLE_SIGNAL_READABLE],
+                  0);
+    expect(wait.result).toBe(core.RESULT_DEADLINE_EXCEEDED);
+    expect(wait.index).toBe(null);
+    expect(wait.signalsState[0].satisfiedSignals).toBe(
+           core.HANDLE_SIGNAL_WRITABLE);
+    expect(wait.signalsState[0].satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
+    expect(wait.signalsState[1].satisfiedSignals).toBe(
+           core.HANDLE_SIGNAL_WRITABLE);
+    expect(wait.signalsState[1].satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
+
+    wait = core.wait(pipe.handle0, core.HANDLE_SIGNAL_WRITABLE, 0);
+    expect(wait.result).toBe(core.RESULT_OK);
+    expect(wait.signalsState.satisfiedSignals).toBe(
+           core.HANDLE_SIGNAL_WRITABLE);
+    expect(wait.signalsState.satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
 
     var senderData = new Uint8Array(42);
     for (var i = 0; i < senderData.length; ++i) {
       senderData[i] = i * i;
     }
 
     var result = core.writeMessage(
       pipe.handle0, senderData, [],
       core.WRITE_MESSAGE_FLAG_NONE);
 
     expect(result).toBe(core.RESULT_OK);
 
-    state0 = core.queryHandleSignalsState(pipe.handle0);
-    expect(state0.result).toBe(core.RESULT_OK);
-    expect(state0.satisfiedSignals).toBe(core.HANDLE_SIGNAL_WRITABLE);
-    expect(state0.satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
+    wait = core.wait(pipe.handle0, core.HANDLE_SIGNAL_WRITABLE, 0);
+    expect(wait.result).toBe(core.RESULT_OK);
+    expect(wait.signalsState.satisfiedSignals).toBe(
+        core.HANDLE_SIGNAL_WRITABLE);
+    expect(wait.signalsState.satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
 
-    var wait = core.wait(pipe.handle1, core.HANDLE_SIGNAL_READABLE,
-                         core.DEADLINE_INDEFINITE);
+    wait = core.wait(pipe.handle1, core.HANDLE_SIGNAL_READABLE,
+                     core.DEADLINE_INDEFINITE);
     expect(wait.result).toBe(core.RESULT_OK);
     expect(wait.signalsState.satisfiedSignals).toBe(HANDLE_SIGNAL_READWRITABLE);
     expect(wait.signalsState.satisfiableSignals).toBe(HANDLE_SIGNAL_ALL);
 
     var read = core.readMessage(pipe.handle1, core.READ_MESSAGE_FLAG_NONE);
 
     expect(read.result).toBe(core.RESULT_OK);
     expect(read.buffer.byteLength).toBe(42);
     expect(read.handles.length).toBe(0);
 
@@ skipping 86 matching lines @@
     }
 
     expect(core.unmapBuffer(mappedBuffer0.buffer)).toBe(core.RESULT_OK);
     expect(core.unmapBuffer(mappedBuffer1.buffer)).toBe(core.RESULT_OK);
 
     expect(core.close(dupedBufferHandle.handle)).toBe(core.RESULT_OK);
     expect(core.close(sharedBuffer.handle)).toBe(core.RESULT_OK);
   }
 
 });