Variations Service now creates field trials from variations seed.

chrome/browser/metrics/variations_service_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/metrics/proto/study.pb.h"
 #include "chrome/browser/metrics/variations_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Converts |time| to chrome_variations::Study proto format.
 int64 TimeToProtoTime(const base::Time& time) {
-  return (time - base::Time::UnixEpoch()).InMilliseconds();
+  return (time - base::Time::UnixEpoch()).InSeconds();
 }
 
 }  // namespace
 
 
 TEST(VariationsServiceTest, CheckStudyChannel) {
   const chrome::VersionInfo::Channel channels[] = {
     chrome::VersionInfo::CHANNEL_CANARY,
     chrome::VersionInfo::CHANNEL_DEV,
     chrome::VersionInfo::CHANNEL_BETA,
     chrome::VersionInfo::CHANNEL_STABLE,
   };
   const chrome_variations::Study_Channel study_channels[] = {
     chrome_variations::Study_Channel_CANARY,
     chrome_variations::Study_Channel_DEV,
     chrome_variations::Study_Channel_BETA,
     chrome_variations::Study_Channel_STABLE,
   };
   ASSERT_EQ(arraysize(channels), arraysize(study_channels));
   bool channel_added[arraysize(channels)] = { 0 };
 
   chrome_variations::Study study;
 
   // Check in the forwarded order. The loop cond is <= arraysize(study_channels)
   // instead of < so that the result of adding the last channel gets checked.
   for (size_t i = 0; i <= arraysize(study_channels); ++i) {
     for (size_t j = 0; j < arraysize(channels); ++j) {
-      const bool expected = channel_added[j];
+      const bool expected = channel_added[j] || study.channel_size()==0;

[Alexei Svitkine (slow), 2012/05/08 03:40:13]

Spaces around ==.

[jwd, 2012/05/08 03:47:24]

Done.

       const bool result = VariationsService::CheckStudyChannel(study,
                                                                channels[j]);
       EXPECT_EQ(expected, result) << "Case " << i << "," << j << " failed!";
     }
 
     if (i < arraysize(study_channels))
     {
       study.add_channel(study_channels[i]);
       channel_added[i] = true;
     }
   }
 
   // Do the same check in the reverse order.
   study.clear_channel();
   memset(&channel_added, 0, sizeof(channel_added));
   for (size_t i = 0; i <= arraysize(study_channels); ++i) {
     for (size_t j = 0; j < arraysize(channels); ++j) {
-      const bool expected = channel_added[j];
+      const bool expected = channel_added[j] || study.channel_size()==0;

[Alexei Svitkine (slow), 2012/05/08 03:40:13]

Spaces around ==.

[jwd, 2012/05/08 03:47:24]

Done.

       const bool result = VariationsService::CheckStudyChannel(study,
                                                                channels[j]);
       EXPECT_EQ(expected, result) << "Case " << i << "," << j << " failed!";
     }
 
     if (i < arraysize(study_channels))
     {
       const int index = arraysize(study_channels) - i - 1;
       study.add_channel(study_channels[index]);
       channel_added[index] = true;
@@ skipping 131 matching lines @@
     for (size_t j = 0; j < ARRAYSIZE_UNSAFE(expiry_test_cases); ++j) {
       study.set_start_date(TimeToProtoTime(start_test_cases[i].start_date));
       study.set_expiry_date(TimeToProtoTime(expiry_test_cases[j].expiry_date));
       const bool expected = start_test_cases[i].expected_result &&
                             expiry_test_cases[j].expected_result;
       const bool result = VariationsService::CheckStudyDate(study, now);
       EXPECT_EQ(expected, result) << "Case " << i << "," << j << " failed!";
     }
   }
 }