diff options
| author | roubert@google.com <roubert@google.com@38ededc0-08b8-5190-f2ac-b31f878777ad> | 2014-05-23 08:14:14 +0000 |
|---|---|---|
| committer | roubert@google.com <roubert@google.com@38ededc0-08b8-5190-f2ac-b31f878777ad> | 2014-05-23 08:14:14 +0000 |
| commit | 5527e260ad8fe52786f62ae98cf285283d47bec9 (patch) | |
| tree | 776704498fd664277be531e795fdcca33f2aa06d /cpp/test | |
| parent | 7ddb737724d535079cf6158d721fc094aa3d69dc (diff) | |
| download | src-5527e260ad8fe52786f62ae98cf285283d47bec9.tar.gz | |
Deprecate old AddressValidator constructor.
In the future, AddressValidator objects should always be constructed by
passing a pointer to an existing object that implements the Supplier
interface (and never construct its own Supplier internally).
R=rouslan@chromium.org
BUG=
Review URL: https://codereview.appspot.com/92550048
git-svn-id: http://libaddressinput.googlecode.com/svn/trunk@242 38ededc0-08b8-5190-f2ac-b31f878777ad
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/address_validator_test.cc | 10 | ||||
| -rw-r--r-- | cpp/test/supplier_test.cc | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/cpp/test/address_validator_test.cc b/cpp/test/address_validator_test.cc index 3cb1942..3124c63 100644 --- a/cpp/test/address_validator_test.cc +++ b/cpp/test/address_validator_test.cc @@ -27,6 +27,7 @@ #include <gtest/gtest.h> #include "fake_downloader.h" +#include "ondemand_supplier.h" namespace { @@ -36,6 +37,7 @@ using i18n::addressinput::BuildCallback; using i18n::addressinput::FakeDownloader; using i18n::addressinput::FieldProblemMap; using i18n::addressinput::NullStorage; +using i18n::addressinput::OndemandSupplier; using i18n::addressinput::PreloadSupplier; using i18n::addressinput::scoped_ptr; @@ -86,10 +88,12 @@ class OndemandValidatorWrapper : public ValidatorWrapper { private: OndemandValidatorWrapper() - : validator_(FakeDownloader::kFakeDataUrl, - new FakeDownloader, - new NullStorage) {} + : supplier_(FakeDownloader::kFakeDataUrl, + new FakeDownloader, + new NullStorage), + validator_(&supplier_) {} + OndemandSupplier supplier_; const AddressValidator validator_; DISALLOW_COPY_AND_ASSIGN(OndemandValidatorWrapper); }; diff --git a/cpp/test/supplier_test.cc b/cpp/test/supplier_test.cc index 2c09cc4..a8ad987 100644 --- a/cpp/test/supplier_test.cc +++ b/cpp/test/supplier_test.cc @@ -32,7 +32,6 @@ #include "fake_downloader.h" #include "lookup_key.h" #include "ondemand_supplier.h" -#include "retriever.h" #include "rule.h" namespace { @@ -62,7 +61,6 @@ using i18n::addressinput::LookupKey; using i18n::addressinput::NullStorage; using i18n::addressinput::OndemandSupplier; using i18n::addressinput::PreloadSupplier; -using i18n::addressinput::Retriever; using i18n::addressinput::Rule; using i18n::addressinput::scoped_ptr; using i18n::addressinput::Storage; @@ -88,10 +86,9 @@ class OndemandSupplierWrapper : public SupplierWrapper { private: OndemandSupplierWrapper() - : ondemand_supplier_( - new Retriever(FakeDownloader::kFakeDataUrl, - new FakeDownloader, - new NullStorage)) {} + : ondemand_supplier_(FakeDownloader::kFakeDataUrl, + new FakeDownloader, + new NullStorage) {} OndemandSupplier ondemand_supplier_; DISALLOW_COPY_AND_ASSIGN(OndemandSupplierWrapper); |