Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1282004 - Make it easier to run all PSM GTests at once. r=mgoodwin

Browse Source 
Currently, running all the PSM GTests involves providing a filter that catches
all the various tests. This is annoying and error prone.

The changes here make running all PSM GTests as easy as:
  mach gtest "psm*"

MozReview-Commit-ID: EqaysNvwJaQ

--HG--
extra : transplant_source : %0CCM%99%12%18%8D%B9%DD%84%0C%A06%0Ba%AD%A7%EB%B3%FB
This commit is contained in:
Cykesiopka 2016-06-27 09:06:43 -07:00
parent 4cbe3b8fd3
commit 3f7ca34d26
5 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/manager/ssl/tests/gtest/DataStorageTest.cpp
View File

@ -16,7 +16,7 @@
using namespace mozilla;
class DataStorageTest : public ::testing::Test
class psm_DataStorageTest : public ::testing::Test
{
protected:
virtual void SetUp()
@ -36,7 +36,7 @@ NS_NAMED_LITERAL_CSTRING(testKey, "test");
NS_NAMED_LITERAL_CSTRING(testValue, "value");
NS_NAMED_LITERAL_CSTRING(privateTestValue, "private");
TEST_F(DataStorageTest, GetPutRemove)
TEST_F(psm_DataStorageTest, GetPutRemove)
{
EXPECT_TRUE(dataWillPersist);
@ -92,7 +92,7 @@ TEST_F(DataStorageTest, GetPutRemove)
EXPECT_TRUE(result.IsEmpty());
}
TEST_F(DataStorageTest, InputValidation)
TEST_F(psm_DataStorageTest, InputValidation)
{
EXPECT_TRUE(dataWillPersist);
@ -154,7 +154,7 @@ TEST_F(DataStorageTest, InputValidation)
EXPECT_TRUE(result.IsEmpty());
}
TEST_F(DataStorageTest, Eviction)
TEST_F(psm_DataStorageTest, Eviction)
{
EXPECT_TRUE(dataWillPersist);
@ -182,7 +182,7 @@ TEST_F(DataStorageTest, Eviction)
EXPECT_STREQ("value", result.get());
}
TEST_F(DataStorageTest, ClearPrivateData)
TEST_F(psm_DataStorageTest, ClearPrivateData)
{
EXPECT_TRUE(dataWillPersist);
@ -195,7 +195,7 @@ TEST_F(DataStorageTest, ClearPrivateData)
EXPECT_TRUE(result.IsEmpty());
}
TEST_F(DataStorageTest, Shutdown)
TEST_F(psm_DataStorageTest, Shutdown)
{
EXPECT_TRUE(dataWillPersist);

4
security/manager/ssl/tests/gtest/DeserializeCertTest.cpp
View File

@ -23,7 +23,7 @@
// We would like to move away from this binary compatibility requirement
// in service workers. See bug 1248628.
TEST(DeserializeCert, gecko33)
TEST(psm_DeserializeCert, gecko33)
{
// Gecko 33+ vintage Security info serialized with UUIDs:
// - nsISupports 00000000-0000-0000-c000-000000000046
@ -59,7 +59,7 @@ TEST(DeserializeCert, gecko33)
ASSERT_TRUE(cert);
}
TEST(DeserializeCert, gecko46)
TEST(psm_DeserializeCert, gecko46)
{
// Gecko 46+ vintage Security info serialized with UUIDs:
// - nsISupports 00000000-0000-0000-c000-000000000046

20
security/manager/ssl/tests/gtest/OCSPCacheTest.cpp
View File

@ -31,10 +31,10 @@ LiteralInput(const char(&valueString)[N])
const int MaxCacheEntries = 1024;
class OCSPCacheTest : public ::testing::Test
class psm_OCSPCacheTest : public ::testing::Test
{
protected:
OCSPCacheTest() : now(Now()) { }
psm_OCSPCacheTest() : now(Now()) { }
static void SetUpTestCase()
{
@ -70,7 +70,7 @@ Input fakeKey000(LiteralInput("key000"));
Input fakeKey001(LiteralInput("key001"));
Input fakeSerial0000(LiteralInput("0000"));
TEST_F(OCSPCacheTest, TestPutAndGet)
TEST_F(psm_OCSPCacheTest, TestPutAndGet)
{
Input fakeSerial000(LiteralInput("000"));
Input fakeSerial001(LiteralInput("001"));
@ -84,7 +84,7 @@ TEST_F(OCSPCacheTest, TestPutAndGet)
resultOut, timeOut));
}
TEST_F(OCSPCacheTest, TestVariousGets)
TEST_F(psm_OCSPCacheTest, TestVariousGets)
{
SCOPED_TRACE("");
for (int i = 0; i < MaxCacheEntries; i++) {
@ -132,7 +132,7 @@ TEST_F(OCSPCacheTest, TestVariousGets)
resultOut, timeOut));
}
TEST_F(OCSPCacheTest, TestEviction)
TEST_F(psm_OCSPCacheTest, TestEviction)
{
SCOPED_TRACE("");
// By putting more distinct entries in the cache than it can hold,
@ -155,7 +155,7 @@ TEST_F(OCSPCacheTest, TestEviction)
resultOut, timeOut));
}
TEST_F(OCSPCacheTest, TestNoEvictionForRevokedResponses)
TEST_F(psm_OCSPCacheTest, TestNoEvictionForRevokedResponses)
{
SCOPED_TRACE("");
CertID notEvicted(fakeIssuer1, fakeKey000, fakeSerial0000);
@ -185,7 +185,7 @@ TEST_F(OCSPCacheTest, TestNoEvictionForRevokedResponses)
ASSERT_FALSE(cache.Get(evicted, resultOut, timeOut));
}
TEST_F(OCSPCacheTest, TestEverythingIsRevoked)
TEST_F(psm_OCSPCacheTest, TestEverythingIsRevoked)
{
SCOPED_TRACE("");
Time timeIn(now);
@ -228,7 +228,7 @@ TEST_F(OCSPCacheTest, TestEverythingIsRevoked)
ASSERT_EQ(Result::ERROR_REVOKED_CERTIFICATE, result);
}
TEST_F(OCSPCacheTest, VariousIssuers)
TEST_F(psm_OCSPCacheTest, VariousIssuers)
{
SCOPED_TRACE("");
Time timeIn(now);
@ -249,7 +249,7 @@ TEST_F(OCSPCacheTest, VariousIssuers)
resultOut, timeOut));
}
TEST_F(OCSPCacheTest, Times)
TEST_F(psm_OCSPCacheTest, Times)
{
SCOPED_TRACE("");
CertID certID(fakeIssuer1, fakeKey000, fakeSerial0000);
@ -273,7 +273,7 @@ TEST_F(OCSPCacheTest, Times)
TimeFromElapsedSecondsAD(50));
}
TEST_F(OCSPCacheTest, NetworkFailure)
TEST_F(psm_OCSPCacheTest, NetworkFailure)
{
SCOPED_TRACE("");
CertID certID(fakeIssuer1, fakeKey000, fakeSerial0000);

2
security/manager/ssl/tests/gtest/README.txt Normal file
View File

@ -0,0 +1,2 @@
Please name all test cases in this directory with the prefix "psm". This makes
it easier to run all PSM related GTests at once.

40
security/manager/ssl/tests/gtest/TLSIntoleranceTest.cpp
View File

@ -13,13 +13,13 @@
NS_NAMED_LITERAL_CSTRING(HOST, "example.org");
const int16_t PORT = 443;
class TLSIntoleranceTest : public ::testing::Test
class psm_TLSIntoleranceTest : public ::testing::Test
{
protected:
nsSSLIOLayerHelpers helpers;
};
TEST_F(TLSIntoleranceTest, Test_Full_Fallback_Process)
TEST_F(psm_TLSIntoleranceTest, FullFallbackProcess)
{
ASSERT_EQ(SSL_LIBRARY_VERSION_TLS_1_0, helpers.mVersionFallbackLimit);
@ -95,7 +95,7 @@ TEST_F(TLSIntoleranceTest, Test_Full_Fallback_Process)
}
}
TEST_F(TLSIntoleranceTest, Test_Disable_Fallback_With_High_Limit)
TEST_F(psm_TLSIntoleranceTest, DisableFallbackWithHighLimit)
{
// this value disables version fallback entirely: with this value, all efforts
// to mark an origin as version intolerant fail
@ -114,7 +114,7 @@ TEST_F(TLSIntoleranceTest, Test_Disable_Fallback_With_High_Limit)
0));
}
TEST_F(TLSIntoleranceTest, Test_Fallback_Limit_Below_Min)
TEST_F(psm_TLSIntoleranceTest, FallbackLimitBelowMin)
{
// check that we still respect the minimum version,
// when it is higher than the fallback limit
@ -138,7 +138,7 @@ TEST_F(TLSIntoleranceTest, Test_Fallback_Limit_Below_Min)
0));
}
TEST_F(TLSIntoleranceTest, Test_Tolerant_Overrides_Intolerant_1)
TEST_F(psm_TLSIntoleranceTest, TolerantOverridesIntolerant1)
{
ASSERT_TRUE(helpers.rememberIntolerantAtVersion(HOST, PORT,
SSL_LIBRARY_VERSION_TLS_1_0,
@ -154,7 +154,7 @@ TEST_F(TLSIntoleranceTest, Test_Tolerant_Overrides_Intolerant_1)
ASSERT_EQ(StrongCiphersWorked, strongCipherStatus);
}
TEST_F(TLSIntoleranceTest, Test_Tolerant_Overrides_Intolerant_2)
TEST_F(psm_TLSIntoleranceTest, TolerantOverridesIntolerant2)
{
ASSERT_TRUE(helpers.rememberIntolerantAtVersion(HOST, PORT,
SSL_LIBRARY_VERSION_TLS_1_0,
@ -170,7 +170,7 @@ TEST_F(TLSIntoleranceTest, Test_Tolerant_Overrides_Intolerant_2)
ASSERT_EQ(StrongCiphersWorked, strongCipherStatus);
}
TEST_F(TLSIntoleranceTest, Test_Intolerant_Does_Not_Override_Tolerant)
TEST_F(psm_TLSIntoleranceTest, IntolerantDoesNotOverrideTolerant)
{
// No adjustment made when there is no entry for the site.
helpers.rememberTolerantAtVersion(HOST, PORT, SSL_LIBRARY_VERSION_TLS_1_1);
@ -188,7 +188,7 @@ TEST_F(TLSIntoleranceTest, Test_Intolerant_Does_Not_Override_Tolerant)
ASSERT_EQ(StrongCiphersWorked, strongCipherStatus);
}
TEST_F(TLSIntoleranceTest, Test_Port_Is_Relevant)
TEST_F(psm_TLSIntoleranceTest, PortIsRelevant)
{
helpers.rememberTolerantAtVersion(HOST, 1, SSL_LIBRARY_VERSION_TLS_1_2);
ASSERT_FALSE(helpers.rememberIntolerantAtVersion(HOST, 1,
@ -217,7 +217,7 @@ TEST_F(TLSIntoleranceTest, Test_Port_Is_Relevant)
}
}
TEST_F(TLSIntoleranceTest, Test_Intolerance_Reason_Initial)
TEST_F(psm_TLSIntoleranceTest, IntoleranceReasonInitial)
{
ASSERT_EQ(0, helpers.getIntoleranceReason(HOST, 1));
@ -225,7 +225,7 @@ TEST_F(TLSIntoleranceTest, Test_Intolerance_Reason_Initial)
ASSERT_EQ(0, helpers.getIntoleranceReason(HOST, 2));
}
TEST_F(TLSIntoleranceTest, Test_Intolerance_Reason_Stored)
TEST_F(psm_TLSIntoleranceTest, IntoleranceReasonStored)
{
helpers.rememberIntolerantAtVersion(HOST, 1, SSL_LIBRARY_VERSION_TLS_1_0,
SSL_LIBRARY_VERSION_TLS_1_2,
@ -238,7 +238,7 @@ TEST_F(TLSIntoleranceTest, Test_Intolerance_Reason_Stored)
ASSERT_EQ(SSL_ERROR_BAD_MAC_READ, helpers.getIntoleranceReason(HOST, 1));
}
TEST_F(TLSIntoleranceTest, Test_Intolerance_Reason_Cleared)
TEST_F(psm_TLSIntoleranceTest, IntoleranceReasonCleared)
{
ASSERT_EQ(0, helpers.getIntoleranceReason(HOST, 1));
@ -252,7 +252,7 @@ TEST_F(TLSIntoleranceTest, Test_Intolerance_Reason_Cleared)
ASSERT_EQ(0, helpers.getIntoleranceReason(HOST, 1));
}
TEST_F(TLSIntoleranceTest, Test_Strong_Ciphers_Failed)
TEST_F(psm_TLSIntoleranceTest, StrongCiphersFailed)
{
helpers.mVersionFallbackLimit = SSL_LIBRARY_VERSION_TLS_1_1;
@ -297,7 +297,7 @@ TEST_F(TLSIntoleranceTest, Test_Strong_Ciphers_Failed)
}
}
TEST_F(TLSIntoleranceTest, Test_Strong_Ciphers_Failed_At_1_1)
TEST_F(psm_TLSIntoleranceTest, StrongCiphersFailedAt1_1)
{
helpers.mVersionFallbackLimit = SSL_LIBRARY_VERSION_TLS_1_0;
@ -343,7 +343,7 @@ TEST_F(TLSIntoleranceTest, Test_Strong_Ciphers_Failed_At_1_1)
}
}
TEST_F(TLSIntoleranceTest, Test_Strong_Ciphers_Failed_With_High_Limit)
TEST_F(psm_TLSIntoleranceTest, StrongCiphersFailedWithHighLimit)
{
// this value disables version fallback entirely: with this value, all efforts
// to mark an origin as version intolerant fail
@ -364,7 +364,7 @@ TEST_F(TLSIntoleranceTest, Test_Strong_Ciphers_Failed_With_High_Limit)
0));
}
TEST_F(TLSIntoleranceTest, Test_Tolerant_Does_Not_Override_Weak_Ciphers_Fallback)
TEST_F(psm_TLSIntoleranceTest, TolerantDoesNotOverrideWeakCiphersFallback)
{
ASSERT_TRUE(helpers.rememberStrongCiphersFailed(HOST, PORT, 0));
// No adjustment made when intolerant is zero.
@ -378,7 +378,7 @@ TEST_F(TLSIntoleranceTest, Test_Tolerant_Does_Not_Override_Weak_Ciphers_Fallback
ASSERT_EQ(StrongCiphersFailed, strongCipherStatus);
}
TEST_F(TLSIntoleranceTest, Test_Weak_Ciphers_Fallback_Does_Not_Override_Tolerant)
TEST_F(psm_TLSIntoleranceTest, WeakCiphersFallbackDoesNotOverrideTolerant)
{
// No adjustment made when there is no entry for the site.
helpers.rememberTolerantAtVersion(HOST, PORT, SSL_LIBRARY_VERSION_TLS_1_1);
@ -393,7 +393,7 @@ TEST_F(TLSIntoleranceTest, Test_Weak_Ciphers_Fallback_Does_Not_Override_Tolerant
ASSERT_EQ(StrongCiphersWorked, strongCipherStatus);
}
TEST_F(TLSIntoleranceTest, TLS_Forget_Intolerance)
TEST_F(psm_TLSIntoleranceTest, TLSForgetIntolerance)
{
{
ASSERT_TRUE(helpers.rememberIntolerantAtVersion(HOST, PORT,
@ -423,7 +423,7 @@ TEST_F(TLSIntoleranceTest, TLS_Forget_Intolerance)
}
}
TEST_F(TLSIntoleranceTest, TLS_Forget_Strong_Cipher_Failed)
TEST_F(psm_TLSIntoleranceTest, TLSForgetStrongCipherFailed)
{
{
ASSERT_TRUE(helpers.rememberStrongCiphersFailed(HOST, PORT, 0));
@ -446,7 +446,7 @@ TEST_F(TLSIntoleranceTest, TLS_Forget_Strong_Cipher_Failed)
}
}
TEST_F(TLSIntoleranceTest, TLS_Dont_Forget_Tolerance)
TEST_F(psm_TLSIntoleranceTest, TLSDontForgetTolerance)
{
{
helpers.rememberTolerantAtVersion(HOST, PORT, SSL_LIBRARY_VERSION_TLS_1_1);
@ -488,7 +488,7 @@ TEST_F(TLSIntoleranceTest, TLS_Dont_Forget_Tolerance)
}
}
TEST_F(TLSIntoleranceTest, TLS_Per_Site_Fallback_Limit)
TEST_F(psm_TLSIntoleranceTest, TLSPerSiteFallbackLimit)
{
NS_NAMED_LITERAL_CSTRING(example_com, "example.com");
NS_NAMED_LITERAL_CSTRING(example_net, "example.net");