Port ppapi_ppb_core nacl_integration test to browser_tests.

BUG= http://code.google.com/p/nativeclient/issues/detail?id=2959


Review URL: https://chromiumcodereview.appspot.com/10958026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158714 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 355 deletions

diff --git a/ppapi/native_client/ppapi_scons_files.py b/ppapi/native_client/ppapi_scons_files.py
index 8603f0c..d9815de 100644
--- a/ppapi/native_client/ppapi_scons_files.py
+++ b/ppapi/native_client/ppapi_scons_files.py
@@ -34,7 +34,6 @@ nonvariant_test_scons_files = [
     'tests/ppapi_browser/extension_mime_handler/nacl.scons',
     'tests/ppapi_browser/manifest/nacl.scons',
     'tests/ppapi_browser/ppb_audio/nacl.scons',
-    'tests/ppapi_browser/ppb_core/nacl.scons',
     'tests/ppapi_browser/ppb_dev/nacl.scons',
     'tests/ppapi_browser/ppb_file_system/nacl.scons',
     'tests/ppapi_browser/ppb_graphics2d/nacl.scons',
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons
deleted file mode 100644
index 7c6bd4b..0000000
--- a/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- python -*-
-# Copyright (c) 2012 The Native Client Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-# This test uses ppapi_test_lib.
-
-Import('env')
-
-env.Prepend(CPPDEFINES=['XP_UNIX'])
-env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
-                     'ppb_core')
-
-nexe = env.ProgramNameForNmf('ppapi_ppb_core')
-env.Alias('ppapi_ppb_core${PROGSUFFIX}', 
-          ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
-
-env.ComponentProgram(
-    nexe,
-    ['ppapi_ppb_core.cc'],
-    EXTRA_LIBS=['ppapi',
-                'ppapi_test_lib',
-                'pthread',
-                'platform',
-                'gio'])
-
-# Note that the html is required to run this program.
-env.Publish(nexe, 'run',
-            ['ppapi_ppb_core.html',
-             env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
-                      'browserdata/nacltest.js')])
-
-node = env.PPAPIBrowserTester('ppapi_ppb_core_browser_test.out',
-                              url='ppapi_ppb_core.html',
-                              nmf_names=['ppapi_ppb_core'],
-                              files=env.ExtractPublishedFiles(nexe))
-
-env.AddNodeToTestSuite(node,
-                       ['chrome_browser_tests'],
-                       'run_ppapi_ppb_core_browser_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken())
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.cc b/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.cc
deleted file mode 100644
index b683b17..0000000
--- a/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include <pthread.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
-
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/ppb_core.h"
-#include "ppapi/c/ppb_url_request_info.h"
-
-namespace {
-
-const int32_t kNotPPError = 12345;
-const int kStressChecksum = 0x12345678;
-
-void EmptyCompletionCallback(void* data, int32_t /*result*/) {
-  CHECK(data == NULL);
-}
-
-// Calls PPB_Core::CallOnMainThread(). To be invoked off the main thread.
-void* InvokeCallOnMainThread(void* thread_argument) {
-  PPB_Core* ppb_core = reinterpret_cast<PPB_Core*>(thread_argument);
-  PP_CompletionCallback callback = MakeTestableCompletionCallback(
-      "CallOnMainThreadCallback_FromNonMainThread",
-      EmptyCompletionCallback,
-      NULL /*user_data*/);
-  ppb_core->CallOnMainThread(0 /*delay*/, callback, PP_OK);
-  return NULL;
-}
-
-struct StressData {
-  const PPB_Core* ppb_core_;
-  const int callbacks_per_thread_;
-  int callback_counter_;
-  const int checksum_;
-  StressData(const PPB_Core* ppb_core, int callbacks_per_thread, int total)
-      : ppb_core_(ppb_core),
-        callbacks_per_thread_(callbacks_per_thread),
-        callback_counter_(total),
-        checksum_(kStressChecksum) {
-  }
-};
-
-// When passed in stress->callback_counter_ reaches zero, notify JS via
-// MakeTestableCompletionCallback.
-void ThreadStressCompletionCallback(void* data, int32_t result) {
-  if (PP_OK == result) {
-    StressData* stress = reinterpret_cast<StressData*>(data);
-    CHECK(kStressChecksum == stress->checksum_);
-    CHECK(NULL != stress->ppb_core_);
-    stress->callback_counter_ -= 1;
-    if (0 == stress->callback_counter_) {
-      // All the callbacks triggered, so now report back that this test passed.
-      PP_CompletionCallback callback = MakeTestableCompletionCallback(
-          "CallOnMainThreadCallback_ThreadStress",
-          EmptyCompletionCallback, NULL);
-      stress->ppb_core_->CallOnMainThread(0, callback, PP_OK);
-      // At this point we're done with the structure, so set it to zero.
-      // If anyone from here on out tries to access it, either the pointer
-      // check or the checksum should trip. It is intentionally left on the
-      // heap to prevent re-use of the memory.
-      memset(stress, 0, sizeof(*stress));
-    }
-  }
-}
-
-// Calls PPB_Core::CallOnMainThread(). To be invoked off the main thread.
-// This is a stess test version.
-void* InvokeCallOnMainThreadStress(void* thread_argument) {
-  StressData* stress = reinterpret_cast<StressData*>(thread_argument);
-  PP_CompletionCallback callback = PP_MakeCompletionCallback(
-      ThreadStressCompletionCallback, stress);
-  for (int i = 0; i < stress->callbacks_per_thread_; ++i) {
-    CHECK(NULL != stress->ppb_core_);
-    CHECK(kStressChecksum == stress->checksum_);
-    stress->ppb_core_->CallOnMainThread(0, callback, PP_OK);
-  }
-  return NULL;
-}
-
-// Calls PPB_Core::IsMainThread(). To be invoked off the main thread.
-void* InvokeIsMainThread(void* thread_argument) {
-  PPB_Core* ppb_core = reinterpret_cast<PPB_Core*>(thread_argument);
-  return reinterpret_cast<void*>(ppb_core->IsMainThread());
-}
-
-// Tests PPB_Core::GetTime().
-void TestGetTime() {
-  PP_Time time1 = PPBCore()->GetTime();
-  EXPECT(time1 > 0);
-
-  usleep(100000);  // 0.1 second
-
-  PP_Time time2 = PPBCore()->GetTime();
-  EXPECT(time2 > time1);
-
-  TEST_PASSED;
-}
-
-// Tests PPB_Core::GetTimeTicks().
-void TestGetTimeTicks() {
-  PP_TimeTicks time_ticks1 = PPBCore()->GetTimeTicks();
-  EXPECT(time_ticks1 > 0);
-
-  usleep(100000);  // 0.1 second
-
-  PP_TimeTicks time_ticks2 = PPBCore()->GetTimeTicks();
-  EXPECT(time_ticks2 > time_ticks1);
-
-  TEST_PASSED;
-}
-
-// Tests PPB_Core::CallOnMainThread() from the main thread.
-void TestCallOnMainThread_FromMainThread() {
-  PP_CompletionCallback callback = MakeTestableCompletionCallback(
-      "CallOnMainThreadCallback_FromMainThread",
-      EmptyCompletionCallback,
-      NULL /*user_data*/);
-  PPBCore()->CallOnMainThread(0 /*delay*/, callback, kNotPPError);
-
-  TEST_PASSED;
-}
-
-// Tests PPB_Core::CallOnMainThread() from the main thread after a long delay.
-// This is useful for surf-away/reload tests where the nexe is aborted
-// after the callback was scheduled, but before it was fired.
-void TestCallOnMainThread_FromMainThreadDelayed() {
-  PP_CompletionCallback callback = MakeTestableCompletionCallback(
-      "CallOnMainThreadCallback_FromMainThreadDelayed",
-      EmptyCompletionCallback,
-      NULL /*user_data*/);
-  PPBCore()->CallOnMainThread(1000 /*delay in ms*/, callback, kNotPPError);
-
-  TEST_PASSED;
-}
-
-// Tests PPB_Core::CallOnMainThread from non-main thread.
-void TestCallOnMainThread_FromNonMainThread() {
-  pthread_t tid;
-  void* ppb_core = reinterpret_cast<void*>(const_cast<PPB_Core*>(PPBCore()));
-  CHECK(pthread_create(&tid, NULL, InvokeCallOnMainThread, ppb_core) == 0);
-  // Use a non-joined thread.  This is a more useful test than
-  // joining the thread: we want to test CallOnMainThread() when it
-  // is called concurrently with the main thread.
-  CHECK(pthread_detach(tid) == 0);
-
-  TEST_PASSED;
-}
-
-// Tests PPB_Core::CallOnMainThread from non-main thread.
-// This is a stress test version that calls many times from many threads.
-void TestCallOnMainThread_FromNonMainThreadStress() {
-  const int kNumThreads = 10;
-  const int kNumPerThread = 100;
-  const int kNumCallbacks = kNumThreads * kNumPerThread;
-  StressData* stress = new StressData(PPBCore(), kNumPerThread, kNumCallbacks);
-  for (int i = 0; i < kNumThreads; ++i) {
-    pthread_t tid;
-    CHECK(pthread_create(
-        &tid, NULL, InvokeCallOnMainThreadStress, stress) == 0);
-    CHECK(pthread_detach(tid) == 0);
-  }
-  TEST_PASSED;
-}
-
-// Tests PPB_Core::IsMainThread() from the main thread.
-void TestIsMainThread_FromMainThread() {
-  EXPECT(PPBCore()->IsMainThread() == PP_TRUE);
-  TEST_PASSED;
-}
-
-// Tests PPB_Core::IsMainThread() from non-main thread.
-void TestIsMainThread_FromNonMainThread() {
-  pthread_t tid;
-  void* thread_result;
-  void* ppb_core = reinterpret_cast<void*>(const_cast<PPB_Core*>(PPBCore()));
-  CHECK(pthread_create(&tid, NULL, InvokeIsMainThread, ppb_core) == 0);
-  CHECK(pthread_join(tid, &thread_result) == 0);
-  EXPECT(reinterpret_cast<int>(thread_result) == PP_FALSE);
-
-  TEST_PASSED;
-}
-
-
-// Tests PPB_Core::AddRefResource() and PPB_Core::ReleaseResource() with
-// a valid resource.
-void TestAddRefAndReleaseResource() {
-  PP_Resource valid_resource = PPBURLRequestInfo()->Create(pp_instance());
-  EXPECT(valid_resource != kInvalidResource);
-  EXPECT(PPBURLRequestInfo()->IsURLRequestInfo(valid_resource) == PP_TRUE);
-
-  // Adjusting ref count should not delete the resource.
-  for (size_t j = 0; j < 100; ++j) PPBCore()->AddRefResource(valid_resource);
-  EXPECT(PPBURLRequestInfo()->IsURLRequestInfo(valid_resource) == PP_TRUE);
-  for (size_t j = 0; j < 100; ++j) PPBCore()->ReleaseResource(valid_resource);
-  EXPECT(PPBURLRequestInfo()->IsURLRequestInfo(valid_resource) == PP_TRUE);
-
-  // Releasing the ref count from Create() must delete the resource.
-  PPBCore()->ReleaseResource(valid_resource);
-  EXPECT(PPBURLRequestInfo()->IsURLRequestInfo(valid_resource) != PP_TRUE);
-
-  TEST_PASSED;
-}
-
-// Tests PPB_Core::AddRefResource() and PPB_Core::ReleaseResource() with
-// an invalid resource.
-void TestAddRefAndReleaseInvalidResource() {
-  for (size_t j = 0; j < 100; ++j) {
-    PPBCore()->AddRefResource(kInvalidResource);
-    PPBCore()->ReleaseResource(kInvalidResource);
-  }
-
-  TEST_PASSED;
-}
-
-}  // namespace
-
-void SetupTests() {
-  RegisterTest("TestGetTime", TestGetTime);
-  RegisterTest("TestGetTimeTicks", TestGetTimeTicks);
-  RegisterTest("TestIsMainThread_FromMainThread",
-               TestIsMainThread_FromMainThread);
-  RegisterTest("TestIsMainThread_FromNonMainThread",
-               TestIsMainThread_FromNonMainThread);
-  RegisterTest("TestAddRefAndReleaseResource",
-               TestAddRefAndReleaseResource);
-  RegisterTest("TestAddRefAndReleaseInvalidResource",
-               TestAddRefAndReleaseInvalidResource);
-  RegisterTest("TestCallOnMainThread_FromMainThread",
-               TestCallOnMainThread_FromMainThread);
-  RegisterTest("TestCallOnMainThread_FromMainThreadDelayed",
-               TestCallOnMainThread_FromMainThreadDelayed);
-  RegisterTest("TestCallOnMainThread_FromNonMainThread",
-               TestCallOnMainThread_FromNonMainThread);
-  RegisterTest("TestCallOnMainThread_FromNonMainThreadStress",
-               TestCallOnMainThread_FromNonMainThreadStress);
-}
-
-void SetupPluginInterfaces() {
-  // none
-}
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.html b/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.html
deleted file mode 100644
index 797b16c..0000000
--- a/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-  <!-- Copyright 2011 Google Inc.  All rights reserved. -->
-  <head>
-    <META HTTP-EQUIV="Pragma" CONTENT="no-cache" />
-    <META HTTP-EQUIV="Expires" CONTENT="-1" />
-    <script type="text/javascript" src="nacltest.js"></script>
-    <script type="application/x-javascript">
-      //<![CDATA[
-      function setupTests(tester, plugin) {
-        function addTest(test_name, responses) {
-          if (responses === undefined) {
-            responses = [];
-          }
-          var expected_messages = [test_name + ':PASSED'].concat(responses);
-          tester.addAsyncTest('PPB_Core::' + test_name, function(test) {
-            test.expectMessageSequence(plugin, expected_messages);
-            plugin.postMessage(test_name)
-          });
-        }
-
-        // Off the main thread.
-        // Doing these tests first will check that the proxy is properly
-        // caching the interface pointers on the main thread on initialization.
-        addTest('TestCallOnMainThread_FromNonMainThread',
-                ['CallOnMainThreadCallback_FromNonMainThread']);
-        addTest('TestCallOnMainThread_FromNonMainThreadStress',
-                ['CallOnMainThreadCallback_ThreadStress']);
-
-        // On the main thread.
-        addTest('TestGetTime');
-        addTest('TestGetTimeTicks');
-        addTest('TestIsMainThread_FromMainThread');
-        addTest('TestIsMainThread_FromNonMainThread');
-        addTest('TestAddRefAndReleaseResource');
-        addTest('TestAddRefAndReleaseInvalidResource');
-        addTest('TestCallOnMainThread_FromMainThread',
-                ['CallOnMainThreadCallback_FromMainThread']);
-        addTest('TestCallOnMainThread_FromMainThreadDelayed',
-                ['CallOnMainThreadCallback_FromMainThreadDelayed']);
-
-      }
-      //]]>
-    </script>
-    <title>PPAPI PPB_Core Test</title>
-  </head>
-  <body>
-    <h1>PPAPI PPB_Core Test</h1>
-
-    <embed type="application/x-nacl" id="test_nexe"
-           name="nacl_module"
-           src="ppapi_ppb_core.nmf"
-           width="0" height="0" />
-
-    <script type="text/javascript">
-      //<![CDATA[
-      var tester = new Tester();
-      setupTests(tester, $('test_nexe'));
-      tester.waitFor($('test_nexe'));
-      tester.run();
-      //]]>
-    </script>
-  </body>
-</html>