Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'storage/storage_integration_tests/storage_http_tests.cpp')
-rw-r--r--storage/storage_integration_tests/storage_http_tests.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/storage/storage_integration_tests/storage_http_tests.cpp
index 5c64865e9a..5b780d25f6 100644
--- a/storage/storage_integration_tests/storage_http_tests.cpp
+++ b/storage/storage_integration_tests/storage_http_tests.cpp
@@ -58,8 +58,6 @@ string const GetResumeFullPath(string const & countryId, string const & version)
void InitStorage(Storage & storage, Storage::UpdateCallback const & didDownload,
Storage::ProgressFunction const & progress)
{
- TEST(version::IsSingleMwm(storage.GetCurrentDataVersion()), ());
-
auto const changeCountryFunction = [&](CountryId const & /* countryId */) {
if (!storage.IsDownloadInProgress())
{
@@ -76,20 +74,19 @@ void InitStorage(Storage & storage, Storage::UpdateCallback const & didDownload,
class StorageHttpTest
{
-protected:
- WritableDirChanger const m_writableDirChanger;
- Storage m_storage;
- string const m_version;
- tests_support::ScopedDir const m_cleanupVersionDir;
-
public:
StorageHttpTest()
- : m_writableDirChanger(kMapTestDir), m_storage(COUNTRIES_FILE),
+ : m_writableDirChanger(kMapTestDir),
m_version(strings::to_string(m_storage.GetCurrentDataVersion())),
m_cleanupVersionDir(m_version)
{
- TEST(version::IsSingleMwm(m_storage.GetCurrentDataVersion()), ());
}
+
+protected:
+ WritableDirChanger const m_writableDirChanger;
+ Storage m_storage;
+ string const m_version;
+ tests_support::ScopedDir const m_cleanupVersionDir;
};
} // namespace