Bug 1027255: Add ASSERT_/EXPECT_ GTest helpers for mozilla::pkix::Result, r=mmc
authorBrian Smith <brian@briansmith.org>
Wed, 18 Jun 2014 23:40:34 -0700
changeset 189537 4574a8f24e71ae93cd021455b95cbb6fa683e2b7
parent 189536 90b8387626634b30c2603e75d3783931e6ffd7ae
child 189538 bff8515586c2b78248c50386263568a173e8dba8
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmmc
bugs1027255
milestone33.0a1
Bug 1027255: Add ASSERT_/EXPECT_ GTest helpers for mozilla::pkix::Result, r=mmc
security/pkix/test/gtest/moz.build
security/pkix/test/gtest/nssgtest.h
security/pkix/test/gtest/pkixgtest.cpp
security/pkix/test/gtest/pkixgtest.h
--- a/security/pkix/test/gtest/moz.build
+++ b/security/pkix/test/gtest/moz.build
@@ -9,16 +9,17 @@ LIBRARY_NAME = 'mozillapkix_gtest'
 SOURCES += [
     'nssgtest.cpp',
     'pkix_cert_chain_length_tests.cpp',
     'pkix_cert_extension_tests.cpp',
     'pkix_ocsp_request_tests.cpp',
     'pkixder_input_tests.cpp',
     'pkixder_pki_types_tests.cpp',
     'pkixder_universal_types_tests.cpp',
+    'pkixgtest.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '../../include',
     '../../lib',
     '../lib',
 ]
 
--- a/security/pkix/test/gtest/nssgtest.h
+++ b/security/pkix/test/gtest/nssgtest.h
@@ -39,17 +39,17 @@ class SECStatusWithPRErrorCode
 {
 public:
   SECStatusWithPRErrorCode(SECStatus rv, PRErrorCode errorCode)
     : mRv(rv)
     , mErrorCode(errorCode)
   {
   }
 
-  SECStatusWithPRErrorCode(SECStatus rv)
+  explicit SECStatusWithPRErrorCode(SECStatus rv)
     : mRv(rv)
     , mErrorCode(rv == SECSuccess ? 0 : PR_GetError())
   {
   }
 
   bool operator==(const SECStatusWithPRErrorCode& other) const
   {
     return mRv == other.mRv && mErrorCode == other.mErrorCode;
@@ -57,17 +57,17 @@ public:
 
 private:
   const SECStatus mRv;
   const PRErrorCode mErrorCode;
 
   friend std::ostream& operator<<(std::ostream& os,
                                   SECStatusWithPRErrorCode const& value);
 
-  void operator=(const SECStatusWithPRErrorCode&) /*delete*/;
+  void operator=(const SECStatusWithPRErrorCode&) /*= delete*/;
 };
 
 ::std::ostream& operator<<(::std::ostream&,
                            SECStatusWithPRErrorCode const&);
 
 #define ASSERT_SECSuccess(rv) \
   ASSERT_EQ(::mozilla::pkix::test::SECStatusWithPRErrorCode(SECSuccess, 0), \
             ::mozilla::pkix::test::SECStatusWithPRErrorCode(rv))
new file mode 100644
--- /dev/null
+++ b/security/pkix/test/gtest/pkixgtest.cpp
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This code is made available to you under your choice of the following sets
+ * of licensing terms:
+ */
+/* 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/.
+ */
+/* Copyright 2014 Mozilla Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "pkixgtest.h"
+
+namespace mozilla { namespace pkix { namespace test {
+
+std::ostream&
+operator<<(std::ostream& os, const ResultWithPRErrorCode& value)
+{
+  switch (value.mRv)
+  {
+    case Success:
+      os << "Success";
+      break;
+    case RecoverableError:
+      os << "RecoverableError";
+      break;
+    case SECFailure:
+      os << "FatalError";
+      break;
+    default:
+      os << "[Invalid Result: " << static_cast<int64_t>(value.mRv) << ']';
+      break;
+  }
+
+  if (value.mRv != Success) {
+    os << '(';
+    const char* name = PR_ErrorToName(value.mErrorCode);
+    if (name) {
+      os << name;
+    } else {
+      os << value.mErrorCode;
+    }
+    os << ')';
+  }
+
+  return os;
+}
+
+} } } // namespace mozilla::pkix::test
new file mode 100644
--- /dev/null
+++ b/security/pkix/test/gtest/pkixgtest.h
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This code is made available to you under your choice of the following sets
+ * of licensing terms:
+ */
+/* 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/.
+ */
+/* Copyright 2014 Mozilla Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef mozilla_pkix__pkixgtest_h
+#define mozilla_pkix__pkixgtest_h
+
+#include <ostream>
+
+#include "gtest/gtest.h"
+#include "pkixutil.h"
+#include "prerror.h"
+#include "stdint.h"
+
+namespace mozilla { namespace pkix { namespace test {
+
+class ResultWithPRErrorCode
+{
+public:
+  ResultWithPRErrorCode(Result rv, PRErrorCode errorCode)
+    : mRv(rv)
+    , mErrorCode(errorCode)
+  {
+  }
+
+  explicit ResultWithPRErrorCode(Result rv)
+    : mRv(rv)
+    , mErrorCode(rv == Success ? 0 : PR_GetError())
+  {
+  }
+
+  bool operator==(const ResultWithPRErrorCode& other) const
+  {
+    return mRv == other.mRv && mErrorCode == other.mErrorCode;
+  }
+
+private:
+  const Result mRv;
+  const PRErrorCode mErrorCode;
+
+  friend std::ostream& operator<<(std::ostream& os,
+                                  const ResultWithPRErrorCode & value);
+
+  void operator=(const ResultWithPRErrorCode&) /*= delete*/;
+};
+
+::std::ostream& operator<<(::std::ostream&, const ResultWithPRErrorCode &);
+
+#define ASSERT_Success(rv) \
+  ASSERT_EQ(::mozilla::pkix::test::ResultWithPRErrorCode( \
+                ::mozilla::pkix::Success, 0), \
+            ::mozilla::pkix::test::ResultWithPRErrorCode(rv))
+#define EXPECT_Success(rv) \
+  EXPECT_EQ(::mozilla::pkix::test::ResultWithPRErrorCode( \
+                ::mozilla::pkix::Success, 0), \
+            ::mozilla::pkix::test::ResultWithPRErrorCode(rv))
+
+#define ASSERT_RecoverableError(expectedError, rv) \
+  ASSERT_EQ(::mozilla::pkix::test::ResultWithPRErrorCode( \
+                 ::mozilla::pkix::RecoverableError, expectedError), \
+            ::mozilla::pkix::test::ResultWithPRErrorCode(rv))
+#define EXPECT_RecoverableError(expectedError, rv) \
+  EXPECT_EQ(::mozilla::pkix::test::ResultWithPRErrorCode( \
+                 ::mozilla::pkix::RecoverableError, expectedError), \
+            ::mozilla::pkix::test::ResultWithPRErrorCode(rv))
+
+#define ASSERT_FatalError(expectedError, rv) \
+  ASSERT_EQ(::mozilla::pkix::test::ResultWithPRErrorCode( \
+                 ::mozilla::pkix::FatalError, expectedError), \
+            ::mozilla::pkix::test::ResultWithPRErrorCode(rv))
+#define EXPECT_FatalError(expectedError, rv) \
+  EXPECT_EQ(::mozilla::pkix::test::ResultWithPRErrorCode( \
+                 ::mozilla::pkix::FatalError, expectedError), \
+            ::mozilla::pkix::test::ResultWithPRErrorCode(rv))
+
+} } } // namespace mozilla::pkix::test
+
+#endif // mozilla_pkix__pkixgtest_h