summaryrefslogtreecommitdiffstats
path: root/base/hmac_unittest.cc
diff options
context:
space:
mode:
authordeanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 12:24:06 +0000
committerdeanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 12:24:06 +0000
commit6bc9ad9d75fff7583fe8592eb4587792897b41cc (patch)
treea0f88aa07fd6f648289386154651c6aaea5c161c /base/hmac_unittest.cc
parent88010e083e2d9c235120b7f8702fe82d7620b2e9 (diff)
downloadchromium_src-6bc9ad9d75fff7583fe8592eb4587792897b41cc.zip
chromium_src-6bc9ad9d75fff7583fe8592eb4587792897b41cc.tar.gz
chromium_src-6bc9ad9d75fff7583fe8592eb4587792897b41cc.tar.bz2
We are not going to support win2k, so this test can always run.
BUG=1084719 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/hmac_unittest.cc')
-rw-r--r--base/hmac_unittest.cc16
1 files changed, 2 insertions, 14 deletions
diff --git a/base/hmac_unittest.cc b/base/hmac_unittest.cc
index 1afc666..3ff2f9f 100644
--- a/base/hmac_unittest.cc
+++ b/base/hmac_unittest.cc
@@ -1,14 +1,11 @@
// Copyright (c) 2006-2008 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.
-//
-// Program to generate an HMAC-SHA1 digest for a given string, for use in
-// calculating and verifying SafeBrowsing MACs.
#include <string>
#include "base/hmac.h"
-#include "base/no_windows2000_unittest.h"
+#include "testing/gtest/include/gtest/gtest.h"
static const int kKeySize = 16;
static const int kDigestSize = 20;
@@ -50,15 +47,7 @@ const char kMessage[] =
"-phish-shavar_a_2629-2631\nu:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_2"
"626-2628\nu:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_2625\n";
-// TODO(paulg): Bug: http://b/1084719, skip this test on Windows 2000 until
-// this bug is fixed.
-class HMACTest : public NoWindows2000Test<testing::Test> {
-};
-
-TEST_F(HMACTest, HmacSafeBrowsingResponseTest) {
- if (IsTestCaseDisabled())
- return;
-
+TEST(HMACTest, HmacSafeBrowsingResponseTest) {
std::string message_data(kMessage);
HMAC hmac(HMAC::SHA1, kClientKey, kKeySize);
@@ -67,4 +56,3 @@ TEST_F(HMACTest, HmacSafeBrowsingResponseTest) {
EXPECT_TRUE(hmac.Sign(message_data, calculated_hmac, kDigestSize));
EXPECT_EQ(memcmp(kReceivedHmac, calculated_hmac, kDigestSize), 0);
}
-