Multi-dimension rappor metrics

components/rappor/rappor_metric_unittest.cc

 // Copyright 2014 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.
 
 #include "components/rappor/rappor_metric.h"
 
 #include <stdlib.h>
 
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace rappor {
 
 const RapporParameters kTestRapporParameters = {
     1 /* Num cohorts */,
-    16 /* Bloom filter size bytes */,
+    8 /* Bloom filter size bytes */,
     4 /* Bloom filter hash count */,
+    8,
     PROBABILITY_75 /* Fake data probability */,
     PROBABILITY_50 /* Fake one probability */,
     PROBABILITY_75 /* One coin probability */,
     PROBABILITY_50 /* Zero coin probability */,
     FINE_LEVEL /* Reporting level (not used) */};
 
 const RapporParameters kTestStatsRapporParameters = {
     1 /* Num cohorts */,
     50 /* Bloom filter size bytes */,
     4 /* Bloom filter hash count */,
+    0,
     PROBABILITY_75 /* Fake data probability */,
     PROBABILITY_50 /* Fake one probability */,
     PROBABILITY_75 /* One coin probability */,
     PROBABILITY_50 /* Zero coin probability */,
     FINE_LEVEL /* Reporting level (not used) */};
 
-// Check for basic syntax and use.
-TEST(RapporMetricTest, BasicMetric) {
-  RapporMetric testMetric("MyRappor", kTestRapporParameters, 0);
-  testMetric.AddSample("Bar");
-  EXPECT_EQ(0x80, testMetric.bytes()[1]);
-}
-
 TEST(RapporMetricTest, GetReport) {
-  RapporMetric metric("MyRappor", kTestRapporParameters, 0);
+  RapporMetric metric("MyRappor", kTestRapporParameters);
 
   const ByteVector report = metric.GetReport(
       HmacByteVectorGenerator::GenerateEntropyInput());
   EXPECT_EQ(16u, report.size());
 }
 
 TEST(RapporMetricTest, GetReportStatistics) {
-  RapporMetric metric("MyStatsRappor", kTestStatsRapporParameters, 0);
+  RapporMetric metric("MyStatsRappor", kTestStatsRapporParameters);
 
   ByteVector real_bits(kTestStatsRapporParameters.bloom_filter_size_bytes);
   // Set 152 bits (19 bytes)
   for (char i = 0; i < 19; i++) {
     real_bits[i] = 0xff;
   }
-  metric.SetBytesForTesting(real_bits);
+  metric.AddSample(real_bits);
   const int real_bit_count = CountBits(real_bits);
   EXPECT_EQ(real_bit_count, 152);
 
   const std::string secret = HmacByteVectorGenerator::GenerateEntropyInput();
   const ByteVector report = metric.GetReport(secret);
 
   // For the bits we actually set in the Bloom filter, get a count of how
   // many of them reported true.
   ByteVector from_true_reports = report;
   // Real bits AND report bits.
@@ skipping 23 matching lines @@
   // stats.binom(152, 0.65625).ppf(0.999995) = 124
   EXPECT_LE(true_from_true_count, 124);
 
   // stats.binom(248, 0.59375).ppf(.000005) = 113
   EXPECT_GT(true_from_false_count, 113);
   // stats.binom(248, 0.59375).ppf(.999995) = 181
   EXPECT_LE(true_from_false_count, 181);
 }
 
 }  // namespace rappor