external_tests/ssl_gtest/gtest_utils.h
author Nicholas Nethercote <nnethercote@mozilla.com>
Tue, 18 Nov 2014 15:16:24 -0800
changeset 11309 f9bac028f79a6b2129c561137f1d4312c981cedd
parent 11248 2f4676c16d52cb792e3594652271d0b9624eaaca
child 11375 0ffa1171249a5b6f83b18e7b725189786202fcfe
permissions -rw-r--r--
Bug 1095307 - Clean up nssPKIX509_GetIssuerAndSerialFromDER(). r=relyea. This patch: - Removes the two static issuer_and_serial_from_encoding() functions. - Rewrites nssPKIX509_GetIssuerAndSerialFromDER() to be almost identical to the issuer_and_serial_from_encoding() from pkistore.c. This new version avoids unnecessary heap allocations (and so doesn't need an |arena| argument), obtains the issuer and serial in the order suggested by the function name, and is more readable than the old version. - Tweaks nssTrustDomain_FindCertificateByEncodedCertificate() to be more like nssTrustDomain_GetCertByDERFromCache() and nssCertificateStore_FindCertificateByEncodedCertificate(), which are the other two functions that now call nssPKIX509_GetIssuerAndSerialFromDER().

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

#ifndef gtest_utils_h__
#define gtest_utils_h__

namespace nss_test {

// Gtest utilities
class Timeout : public PollTarget {
 public:
  Timeout(int32_t timer_ms) : handle_(nullptr), timed_out_(false) {
    Poller::Instance()->SetTimer(timer_ms, this, &Timeout::ExpiredCallback,
                                 &handle_);
  }

  static void ExpiredCallback(PollTarget* target, Event event) {
    Timeout* timeout = static_cast<Timeout*>(target);
    timeout->timed_out_ = true;
  }

  void Cancel() { handle_->Cancel(); }

  bool timed_out() const { return timed_out_; }

 private:
  Poller::Timer* handle_;
  bool timed_out_;
};

}  // namespace nss_test

#define WAIT_(expression, timeout) \
  do {                             \
    Timeout tm(timeout);           \
    while (!(expression)) {        \
      Poller::Instance()->Poll();  \
      if (tm.timed_out()) break;   \
    }                              \
  } while (0)

#define ASSERT_TRUE_WAIT(expression, timeout) \
  do {                                        \
    WAIT_(expression, timeout);               \
    ASSERT_TRUE(expression);                  \
  } while (0)

#endif