corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 4ad80127f89f (bug 1519636) for bustage on MarkupMap.h and nsAccessibilityService.cpp. CLOSED TREE

Browse Source
This commit is contained in:
Csoregi Natalia
2019-04-05 09:48:19 +03:00
parent ebe9c62d30
commit 2ded4ab36d
427 changed files with 4485 additions and 6393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/components/telemetry/geckoview/gtest/TestGeckoView.cpp
View File

@@ -235,7 +235,7 @@ TEST_F(TelemetryGeckoViewFixture, ClearPersistenceFiles) {
WritePersistenceFile(nsDependentCString(kSampleData));
CheckPersistenceFileExists(fileExists);
ASSERT_TRUE(fileExists)
<< "We should have written the test persistence file to disk";
<< "We should have written the test persistence file to disk";
// Init the persistence: this will trigger the measurements to be written
// to disk off-the-main thread.
@@ -270,7 +270,7 @@ TEST_F(TelemetryGeckoViewFixture, CheckDataLoadedTopic) {
WritePersistenceFile(nsDependentCString(kSampleData));
CheckPersistenceFileExists(fileExists);
ASSERT_TRUE(fileExists)
<< "The persisted measurements must exist on the disk";
<< "The persisted measurements must exist on the disk";
// Check that the data loaded topic is triggered when the measurement file
// exists.
@@ -321,7 +321,7 @@ TEST_F(TelemetryGeckoViewFixture, PersistScalars) {
CheckPersistenceFileExists(fileExists);
ASSERT_TRUE(fileExists)
<< "The persisted measurements must exist on the disk";
<< "The persisted measurements must exist on the disk";
// Clear the in-memory scalars again. They will be restored from the disk.
Unused << mTelemetry->ClearScalars();
@@ -392,7 +392,7 @@ TEST_F(TelemetryGeckoViewFixture, PersistHistograms) {
CheckPersistenceFileExists(fileExists);
ASSERT_TRUE(fileExists)
<< "The persisted measurements must exist on the disk";
<< "The persisted measurements must exist on the disk";
// Clear the in-memory histograms again. They will be restored from the disk.
GetAndClearHistogram(cx.GetJSContext(), mTelemetry,
@@ -496,7 +496,7 @@ TEST_F(TelemetryGeckoViewFixture, EmptyPendingOperations) {
GetScalarsSnapshot(false, cx.GetJSContext(), &scalarsSnapshot);
ASSERT_TRUE(scalarsSnapshot.isUndefined())
<< "Scalars snapshot should not contain any data.";
<< "Scalars snapshot should not contain any data.";
}
TEST_F(TelemetryGeckoViewFixture, SimpleAppendOperation) {

50
toolkit/components/telemetry/tests/gtest/TelemetryTestHelpers.cpp
View File

@@ -22,13 +22,13 @@ void CheckUintScalar(const char* aName, JSContext* aCx,
JS::RootedValue value(aCx);
JS::RootedObject scalarObj(aCx, &aSnapshot.toObject());
ASSERT_TRUE(JS_GetProperty(aCx, scalarObj, aName, &value))
<< "The test scalar must be reported.";
<< "The test scalar must be reported.";
JS_GetProperty(aCx, scalarObj, aName, &value);
ASSERT_TRUE(value.isInt32())
<< "The scalar value must be of the correct type.";
<< "The scalar value must be of the correct type.";
ASSERT_TRUE(value.toInt32() >= 0)
<< "The uint scalar type must contain a value >= 0.";
<< "The uint scalar type must contain a value >= 0.";
ASSERT_EQ(static_cast<uint32_t>(value.toInt32()), expectedValue)
<< "The scalar value must match the expected value.";
}
@@ -39,9 +39,9 @@ void CheckBoolScalar(const char* aName, JSContext* aCx,
JS::RootedValue value(aCx);
JS::RootedObject scalarObj(aCx, &aSnapshot.toObject());
ASSERT_TRUE(JS_GetProperty(aCx, scalarObj, aName, &value))
<< "The test scalar must be reported.";
<< "The test scalar must be reported.";
ASSERT_TRUE(value.isBoolean())
<< "The scalar value must be of the correct type.";
<< "The scalar value must be of the correct type.";
ASSERT_EQ(static_cast<bool>(value.toBoolean()), expectedValue)
<< "The scalar value must match the expected value.";
}
@@ -52,16 +52,15 @@ void CheckStringScalar(const char* aName, JSContext* aCx,
JS::RootedValue value(aCx);
JS::RootedObject scalarObj(aCx, &aSnapshot.toObject());
ASSERT_TRUE(JS_GetProperty(aCx, scalarObj, aName, &value))
<< "The test scalar must be reported.";
<< "The test scalar must be reported.";
ASSERT_TRUE(value.isString())
<< "The scalar value must be of the correct type.";
<< "The scalar value must be of the correct type.";
bool sameString;
ASSERT_TRUE(
JS_StringEqualsAscii(aCx, value.toString(), expectedValue, &sameString))
<< "JS String comparison failed";
ASSERT_TRUE(sameString)
<< "The scalar value must match the expected string";
<< "JS String comparison failed";
ASSERT_TRUE(sameString) << "The scalar value must match the expected string";
}
void CheckKeyedUintScalar(const char* aName, const char* aKey, JSContext* aCx,
@@ -70,7 +69,7 @@ void CheckKeyedUintScalar(const char* aName, const char* aKey, JSContext* aCx,
JS::RootedObject scalarObj(aCx, &aSnapshot.toObject());
// Get the aName keyed scalar object from the scalars snapshot.
ASSERT_TRUE(JS_GetProperty(aCx, scalarObj, aName, &keyedScalar))
<< "The keyed scalar must be reported.";
<< "The keyed scalar must be reported.";
CheckUintScalar(aKey, aCx, keyedScalar, expectedValue);
}
@@ -81,7 +80,7 @@ void CheckKeyedBoolScalar(const char* aName, const char* aKey, JSContext* aCx,
JS::RootedObject scalarObj(aCx, &aSnapshot.toObject());
// Get the aName keyed scalar object from the scalars snapshot.
ASSERT_TRUE(JS_GetProperty(aCx, scalarObj, aName, &keyedScalar))
<< "The keyed scalar must be reported.";
<< "The keyed scalar must be reported.";
CheckBoolScalar(aKey, aCx, keyedScalar, expectedValue);
}
@@ -93,12 +92,12 @@ void CheckNumberOfProperties(const char* aName, JSContext* aCx,
JS::RootedObject scalarObj(aCx, &aSnapshot.toObject());
// Get the aName keyed scalar object from the scalars snapshot.
ASSERT_TRUE(JS_GetProperty(aCx, scalarObj, aName, &keyedScalar))
<< "The keyed scalar must be reported.";
<< "The keyed scalar must be reported.";
JS::RootedObject keyedScalarObj(aCx, &keyedScalar.toObject());
JS::Rooted<JS::IdVector> ids(aCx, JS::IdVector(aCx));
ASSERT_TRUE(JS_Enumerate(aCx, keyedScalarObj, &ids))
<< "We must be able to get keyed scalar members.";
<< "We must be able to get keyed scalar members.";
ASSERT_EQ(expectedNumProperties, ids.length())
<< "The scalar must report the expected number of properties.";
@@ -178,8 +177,7 @@ void GetOriginSnapshot(JSContext* aCx, JS::MutableHandle<JS::Value> aResult,
nsresult rv;
rv = telemetry->GetOriginSnapshot(aClear, aCx, &originSnapshot);
ASSERT_EQ(rv, NS_OK) << "Snapshotting origin data must not fail.";
ASSERT_TRUE(originSnapshot.isObject())
<< "The snapshot must be an object.";
ASSERT_TRUE(originSnapshot.isObject()) << "The snapshot must be an object.";
aResult.set(originSnapshot);
}
@@ -210,11 +208,11 @@ void GetEncodedOriginStrings(JSContext* aCx, const nsCString& encoding,
JS::RootedObject prioDataObj(aCx, &snapshot.toObject());
bool isArray = false;
ASSERT_TRUE(JS_IsArrayObject(aCx, prioDataObj, &isArray) && isArray)
<< "The metric's origins must be in an array.";
<< "The metric's origins must be in an array.";
uint32_t length = 0;
ASSERT_TRUE(JS_GetArrayLength(aCx, prioDataObj, &length) && length == 1)
<< "Length of returned array must be 1.";
<< "Length of returned array must be 1.";
JS::RootedValue arrayItem(aCx);
ASSERT_TRUE(JS_GetElement(aCx, prioDataObj, 0, &arrayItem));
@@ -229,8 +227,8 @@ void GetEncodedOriginStrings(JSContext* aCx, const nsCString& encoding,
nsAutoJSString jsStr;
ASSERT_TRUE(jsStr.init(aCx, encodingVal));
ASSERT_TRUE(NS_ConvertUTF16toUTF8(jsStr) == encoding)
<< "Actual 'encoding' (" << NS_ConvertUTF16toUTF8(jsStr).get()
<< ") must match expected (" << encoding.get();
<< "Actual 'encoding' (" << NS_ConvertUTF16toUTF8(jsStr).get()
<< ") must match expected (" << encoding.get();
JS::RootedValue prioVal(aCx);
ASSERT_TRUE(JS_GetProperty(aCx, arrayItemObj, "prio", &prioVal));
@@ -261,8 +259,7 @@ void GetEventSnapshot(JSContext* aCx, JS::MutableHandle<JS::Value> aResult,
0 /* eventLimit */, aCx, 1 /* argc */,
&eventSnapshot);
ASSERT_EQ(rv, NS_OK) << "Snapshotting events must not fail.";
ASSERT_TRUE(eventSnapshot.isObject())
<< "The snapshot must be an object.";
ASSERT_TRUE(eventSnapshot.isObject()) << "The snapshot must be an object.";
JS::RootedValue processEvents(aCx);
JS::RootedObject eventObj(aCx, &eventSnapshot.toObject());
@@ -295,8 +292,7 @@ void GetScalarsSnapshot(bool aKeyed, JSContext* aCx,
// Validate the snapshot.
ASSERT_EQ(rv, NS_OK) << "Creating a snapshot of the data must not fail.";
ASSERT_TRUE(scalarsSnapshot.isObject())
<< "The snapshot must be an object.";
ASSERT_TRUE(scalarsSnapshot.isObject()) << "The snapshot must be an object.";
JS::RootedValue processScalars(aCx);
JS::RootedObject scalarObj(aCx, &scalarsSnapshot.toObject());
@@ -323,7 +319,7 @@ void GetAndClearHistogram(JSContext* cx, nsCOMPtr<nsITelemetry> mTelemetry,
JS::RootedValue rval(cx);
ASSERT_TRUE(JS_CallFunctionName(cx, testHistogramObj, "clear",
JS::HandleValueArray::empty(), &rval))
<< "Cannot clear histogram";
<< "Cannot clear histogram";
}
void GetProperty(JSContext* cx, const char* name, JS::HandleValue valueIn,
@@ -331,7 +327,7 @@ void GetProperty(JSContext* cx, const char* name, JS::HandleValue valueIn,
JS::RootedValue property(cx);
JS::RootedObject valueInObj(cx, &valueIn.toObject());
ASSERT_TRUE(JS_GetProperty(cx, valueInObj, name, &property))
<< "Cannot get property '" << name << "'";
<< "Cannot get property '" << name << "'";
valueOut.set(property);
}
@@ -340,7 +336,7 @@ void GetElement(JSContext* cx, uint32_t index, JS::HandleValue valueIn,
JS::RootedValue element(cx);
JS::RootedObject valueInObj(cx, &valueIn.toObject());
ASSERT_TRUE(JS_GetElement(cx, valueInObj, index, &element))
<< "Cannot get element at index '" << index << "'";
<< "Cannot get element at index '" << index << "'";
valueOut.set(element);
}

2
toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp
View File

@@ -38,7 +38,7 @@ TEST_F(TelemetryTestFixture, CombinedStacks) {
ProcessedStack::Module module = stacks.GetModule(frame.mModIndex);
nsPrintfCString moduleName("test%hu", frame.mModIndex);
ASSERT_TRUE(module.mName.Equals(NS_ConvertUTF8toUTF16(moduleName)))
<< "Module should have expected name";
<< "Module should have expected name";
}
for (size_t i = 0; i < kMaxStacksKept; ++i) {

25
toolkit/components/telemetry/tests/gtest/TestEvents.cpp
View File

@@ -74,50 +74,49 @@ TEST_F(TelemetryTestFixture, RecordEventNative) {
ASSERT_TRUE(!EventPresent(cx.GetJSContext(), eventsSnapshot, category, method,
object))
<< "Test event must not be present when recorded before enabled.";
<< "Test event must not be present when recorded before enabled.";
ASSERT_TRUE(EventPresent(cx.GetJSContext(), eventsSnapshot, category, method2,
object))
<< "Test event must be present.";
<< "Test event must be present.";
ASSERT_TRUE(EventPresent(cx.GetJSContext(), eventsSnapshot, category, method,
object2))
<< "Test event with value and extra must be present.";
<< "Test event with value and extra must be present.";
ASSERT_TRUE(EventPresent(cx.GetJSContext(), eventsSnapshot, category, method2,
object2))
<< "Test event with truncated value and extra must be present.";
<< "Test event with truncated value and extra must be present.";
// Ensure that the truncations happened appropriately.
JSContext* aCx = cx.GetJSContext();
JS::RootedObject arrayObj(aCx, &eventsSnapshot.toObject());
JS::Rooted<JS::Value> eventRecord(aCx);
ASSERT_TRUE(JS_GetElement(aCx, arrayObj, 2, &eventRecord))
<< "Must be able to get record.";
<< "Must be able to get record.";
JS::RootedObject recordArray(aCx, &eventRecord.toObject());
uint32_t recordLength;
ASSERT_TRUE(JS_GetArrayLength(aCx, recordArray, &recordLength))
<< "Event record array must have length.";
ASSERT_TRUE(recordLength == 6)
<< "Event record must have 6 elements.";
<< "Event record array must have length.";
ASSERT_TRUE(recordLength == 6) << "Event record must have 6 elements.";
JS::Rooted<JS::Value> str(aCx);
nsAutoJSString jsStr;
// The value string is at index 4
ASSERT_TRUE(JS_GetElement(aCx, recordArray, 4, &str))
<< "Must be able to get value.";
<< "Must be able to get value.";
ASSERT_TRUE(jsStr.init(aCx, str))
<< "Value must be able to be init'd to a jsstring.";
<< "Value must be able to be init'd to a jsstring.";
ASSERT_EQ(NS_ConvertUTF16toUTF8(jsStr).Length(), (uint32_t)80)
<< "Value must have been truncated to 80 bytes.";
// Extra is at index 5
JS::Rooted<JS::Value> obj(aCx);
ASSERT_TRUE(JS_GetElement(aCx, recordArray, 5, &obj))
<< "Must be able to get extra.";
<< "Must be able to get extra.";
JS::RootedObject extraObj(aCx, &obj.toObject());
JS::Rooted<JS::Value> extraVal(aCx);
ASSERT_TRUE(JS_GetProperty(aCx, extraObj, extraKey.get(), &extraVal))
<< "Must be able to get the extra key's value.";
<< "Must be able to get the extra key's value.";
ASSERT_TRUE(jsStr.init(aCx, extraVal))
<< "Extra must be able to be init'd to a jsstring.";
<< "Extra must be able to be init'd to a jsstring.";
ASSERT_EQ(NS_ConvertUTF16toUTF8(jsStr).Length(), (uint32_t)80)
<< "Extra must have been truncated to 80 bytes.";
}

18
toolkit/components/telemetry/tests/gtest/TestHistograms.cpp
View File

@@ -121,7 +121,7 @@ TEST_F(TelemetryTestFixture, TestKeyedKeysHistogram) {
JS::RootedValue expectedKeyData(cx.GetJSContext());
GetProperty(cx.GetJSContext(), "testkey", histogram, &expectedKeyData);
ASSERT_TRUE(!expectedKeyData.isUndefined())
<< "Cannot find the expected key in the histogram data";
<< "Cannot find the expected key in the histogram data";
JS::RootedValue sum(cx.GetJSContext());
GetProperty(cx.GetJSContext(), "sum", expectedKeyData, &sum);
uint32_t uSum = 0;
@@ -132,7 +132,7 @@ TEST_F(TelemetryTestFixture, TestKeyedKeysHistogram) {
// Do the same for the "CommonKey" property.
GetProperty(cx.GetJSContext(), "CommonKey", histogram, &expectedKeyData);
ASSERT_TRUE(!expectedKeyData.isUndefined())
<< "Cannot find the expected key in the histogram data";
<< "Cannot find the expected key in the histogram data";
GetProperty(cx.GetJSContext(), "sum", expectedKeyData, &sum);
JS::ToUint32(cx.GetJSContext(), sum, &uSum);
ASSERT_EQ(uSum, 1U)
@@ -140,7 +140,7 @@ TEST_F(TelemetryTestFixture, TestKeyedKeysHistogram) {
GetProperty(cx.GetJSContext(), "not-allowed", histogram, &expectedKeyData);
ASSERT_TRUE(expectedKeyData.isUndefined())
<< "Unallowed keys must not be recorded in the histogram data";
<< "Unallowed keys must not be recorded in the histogram data";
// The 'not-allowed' key accumulation for 'TELEMETRY_TESTED_KEYED_KEYS' was
// attemtped twice, so we expect the count of
@@ -472,7 +472,7 @@ TEST_F(TelemetryTestFixture, TestKeyedLinearHistogram_MultipleSamples) {
JS::RootedValue expectedKeyData(cx.GetJSContext());
GetProperty(cx.GetJSContext(), "testkey", histogram, &expectedKeyData);
ASSERT_TRUE(!expectedKeyData.isUndefined())
<< "Cannot find the expected key in the histogram data";
<< "Cannot find the expected key in the histogram data";
// Get values object from 'testkey' histogram.
JS::RootedValue values(cx.GetJSContext());
@@ -542,7 +542,7 @@ TEST_F(TelemetryTestFixture, TestKeyedKeysHistogram_MultipleSamples) {
JS::RootedValue testKeyData(cx.GetJSContext());
GetProperty(cx.GetJSContext(), "testkey", histogram, &testKeyData);
ASSERT_TRUE(!testKeyData.isUndefined())
<< "Cannot find the key 'testkey' in the histogram data";
<< "Cannot find the key 'testkey' in the histogram data";
JS::RootedValue values(cx.GetJSContext());
GetProperty(cx.GetJSContext(), "values", testKeyData, &values);
@@ -588,8 +588,8 @@ TEST_F(TelemetryTestFixture, TestKeyedKeysHistogram_MultipleSamples) {
JS::RootedValue commonKeyData(cx.GetJSContext());
GetProperty(cx.GetJSContext(), "CommonKey", histogram, &commonKeyData);
ASSERT_TRUE(commonKeyData.isUndefined())
<< "Found data in key 'CommonKey' even though we accumulated no data to "
"it";
<< "Found data in key 'CommonKey' even though we accumulated no data to "
"it";
// Here we check that our function does not allow accumulation into unallowed
// keys. Get 'not-allowed' property from histogram and check that this also
@@ -597,8 +597,8 @@ TEST_F(TelemetryTestFixture, TestKeyedKeysHistogram_MultipleSamples) {
JS::RootedValue notAllowedKeyData(cx.GetJSContext());
GetProperty(cx.GetJSContext(), "not-allowed", histogram, &notAllowedKeyData);
ASSERT_TRUE(notAllowedKeyData.isUndefined())
<< "Found data in key 'not-allowed' even though accumuling data to it is "
"not allowed";
<< "Found data in key 'not-allowed' even though accumuling data to it is "
"not allowed";
// The 'not-allowed' key accumulation for 'TELEMETRY_TESTED_KEYED_KEYS' was
// attemtped once, so we expect the count of

28
toolkit/components/telemetry/tests/gtest/TestOrigins.cpp
View File

@@ -41,13 +41,13 @@ TEST_F(TelemetryTestFixture, RecordOrigin) {
JS::RootedValue origins(aCx);
JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
<< "telemetry.test_test1 must be in the snapshot.";
<< "telemetry.test_test1 must be in the snapshot.";
JS::RootedObject originsObj(aCx, &origins.toObject());
JS::RootedValue count(aCx);
ASSERT_TRUE(JS_GetProperty(aCx, originsObj, doubleclick.get(), &count));
ASSERT_TRUE(count.isInt32() && count.toInt32() == 1)
<< "Must have recorded the origin exactly once.";
<< "Must have recorded the origin exactly once.";
// Now test that the snapshot didn't clear things out.
GetOriginSnapshot(aCx, &originSnapshot);
@@ -79,13 +79,13 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceAndClear) {
JS::RootedValue origins(aCx);
JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
<< "telemetry.test_test1 must be in the snapshot.";
<< "telemetry.test_test1 must be in the snapshot.";
JS::RootedObject originsObj(aCx, &origins.toObject());
JS::RootedValue count(aCx);
ASSERT_TRUE(JS_GetProperty(aCx, originsObj, doubleclick.get(), &count));
ASSERT_TRUE(count.isInt32() && count.toInt32() == 2)
<< "Must have recorded the origin exactly twice.";
<< "Must have recorded the origin exactly twice.";
// Now check that snapshotting with clear actually cleared it.
GetOriginSnapshot(aCx, &originSnapshot);
@@ -117,13 +117,13 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
JS::RootedValue origins(aCx);
JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
<< "telemetry.test_test1 must be in the snapshot.";
<< "telemetry.test_test1 must be in the snapshot.";
JS::RootedObject originsObj(aCx, &origins.toObject());
JS::RootedValue count(aCx);
ASSERT_TRUE(JS_GetProperty(aCx, originsObj, "__UNKNOWN__", &count));
ASSERT_TRUE(count.isInt32() && count.toInt32() == 1)
<< "Must have recorded the unknown origin exactly once.";
<< "Must have recorded the unknown origin exactly once.";
// Record a second, different unknown origin and ensure only one is stored.
Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, unknown2);
@@ -135,13 +135,13 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
JS::RootedObject snapshotObj2(aCx, &originSnapshot.toObject());
ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj2, telemetryTest1.get(), &origins))
<< "telemetry.test_test1 must be in the snapshot.";
<< "telemetry.test_test1 must be in the snapshot.";
JS::RootedObject originsObj2(aCx, &origins.toObject());
JS::RootedValue count2(aCx);
ASSERT_TRUE(JS_GetProperty(aCx, originsObj2, "__UNKNOWN__", &count2));
ASSERT_TRUE(count2.isInt32() && count2.toInt32() == 1)
<< "Must have recorded the unknown origin exactly once.";
<< "Must have recorded the unknown origin exactly once.";
}
TEST_F(TelemetryTestFixture, EncodedSnapshot) {
@@ -176,13 +176,13 @@ TEST_F(TelemetryTestFixture, EncodedSnapshot) {
secondAStr, secondBStr);
ASSERT_TRUE(aStr != secondAStr)
<< "aStr (" << NS_ConvertUTF16toUTF8(aStr).get()
<< ") must not equal secondAStr (" << NS_ConvertUTF16toUTF8(secondAStr).get()
<< ")";
<< "aStr (" << NS_ConvertUTF16toUTF8(aStr).get()
<< ") must not equal secondAStr ("
<< NS_ConvertUTF16toUTF8(secondAStr).get() << ")";
ASSERT_TRUE(bStr != secondBStr)
<< "bStr (" << NS_ConvertUTF16toUTF8(bStr).get()
<< ") must not equal secondBStr (" << NS_ConvertUTF16toUTF8(secondBStr).get()
<< ")";
<< "bStr (" << NS_ConvertUTF16toUTF8(bStr).get()
<< ") must not equal secondBStr ("
<< NS_ConvertUTF16toUTF8(secondBStr).get() << ")";
}
class MockObserver final : public nsIObserver {

5
toolkit/components/telemetry/tests/gtest/TestScalars.cpp
View File

@@ -259,8 +259,7 @@ TEST_F(TelemetryTestFixture, ScalarUnknownID) {
// Make sure that nothing was recorded in the plain scalars.
JS::RootedValue scalarsSnapshot(cx.GetJSContext());
GetScalarsSnapshot(false, cx.GetJSContext(), &scalarsSnapshot);
ASSERT_TRUE(scalarsSnapshot.isUndefined())
<< "No scalar must be recorded";
ASSERT_TRUE(scalarsSnapshot.isUndefined()) << "No scalar must be recorded";
// Same for the keyed scalars.
Telemetry::ScalarSet(scalarId, NS_LITERAL_STRING("key1"),
@@ -273,7 +272,7 @@ TEST_F(TelemetryTestFixture, ScalarUnknownID) {
JS::RootedValue keyedSnapshot(cx.GetJSContext());
GetScalarsSnapshot(true, cx.GetJSContext(), &keyedSnapshot);
ASSERT_TRUE(keyedSnapshot.isUndefined())
<< "No keyed scalar must be recorded";
<< "No keyed scalar must be recorded";
}
#endif
}