pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed light framework tests

Browse source
This commit is contained in:
r.kuznetsov 2018-10-25 14:40:20 +03:00 • committed by Daria Volvenkova
parent c1d82edc96
commit bc0178a24b
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/LightFramework.cpp
View file

@ -28,8 +28,8 @@ Java_com_mapswithme_maps_LightFramework_nativeGetLocalAdsFeatures(JNIEnv * env,
jint maxCount)
{
Framework framework(REQUEST_TYPE_LOCAL_ADS_FEATURES);
auto const features = framework.Get<REQUEST_TYPE_LOCAL_ADS_FEATURES>(lat, lon, radiusInMeters,
maxCount);
auto const features = framework.GetNonConst<REQUEST_TYPE_LOCAL_ADS_FEATURES>(
lat, lon, radiusInMeters, maxCount);
static jclass const geoFenceFeatureClazz =
jni::GetGlobalClassRef(env, "com/mapswithme/maps/geofence/GeoFenceFeature");
@ -64,6 +64,6 @@ Java_com_mapswithme_maps_LightFramework_nativeLogLocalAdsEvent(JNIEnv * env, jcl
static_cast<uint8_t>(1) /* zoom level */, local_ads::Clock::now(),
static_cast<double>(lat), static_cast<double>(lon),
static_cast<uint16_t>(accuracyInMeters));
framework.Get<REQUEST_TYPE_LOCAL_ADS_STATISTICS>()->RegisterEvent(std::move(event));
framework.GetNonConst<REQUEST_TYPE_LOCAL_ADS_STATISTICS>()->RegisterEvent(std::move(event));
}
} // extern "C"

10
map/framework_light.hpp
View file

@ -100,10 +100,10 @@ public:
auto Get(m2::PointD const & pt) const;
template <RequestTypeMask Type>
auto Get(double lat, double lon, double radiusInMeters, uint32_t maxCount);
auto GetNonConst(double lat, double lon, double radiusInMeters, uint32_t maxCount);
template <RequestTypeMask Type>
auto Get();
auto GetNonConst();
private:
RequestTypeMask m_request;
@ -155,8 +155,8 @@ auto Framework::Get<REQUEST_TYPE_LOCATION>(m2::PointD const & pt) const
}
template <>
auto Framework::Get<REQUEST_TYPE_LOCAL_ADS_FEATURES>(double lat, double lon,
double radiusInMeters, uint32_t maxCount)
auto Framework::GetNonConst<REQUEST_TYPE_LOCAL_ADS_FEATURES>(double lat, double lon,
double radiusInMeters, uint32_t maxCount)
{
ASSERT(m_request & REQUEST_TYPE_LOCAL_ADS_FEATURES, (m_request));
@ -166,7 +166,7 @@ auto Framework::Get<REQUEST_TYPE_LOCAL_ADS_FEATURES>(double lat, double lon,
}
template <>
auto Framework::Get<REQUEST_TYPE_LOCAL_ADS_STATISTICS>()
auto Framework::GetNonConst<REQUEST_TYPE_LOCAL_ADS_STATISTICS>()
{
ASSERT(m_request & REQUEST_TYPE_LOCAL_ADS_STATISTICS, (m_request));

10
map/map_tests/framework_light_tests.cpp
View file

@ -26,6 +26,16 @@ struct LightFrameworkTest
TEST_EQUAL(f.Get<REQUEST_TYPE_NUMBER_OF_UNSENT_UGC>(), 0, ());
TEST(!f.Get<REQUEST_TYPE_USER_AUTH_STATUS>(), ());
}
{
Framework f(REQUEST_TYPE_LOCAL_ADS_FEATURES | REQUEST_TYPE_LOCAL_ADS_STATISTICS);
auto const features = f.GetNonConst<REQUEST_TYPE_LOCAL_ADS_FEATURES>(0.0 /* lat */, 0.0 /* lon */,
100 /* radiusInMeters */,
0 /* maxCount */);
auto stats = f.GetNonConst<REQUEST_TYPE_LOCAL_ADS_STATISTICS>();
TEST(stats != nullptr, ());
TEST_EQUAL(features.size(), 0, ());
}
}
};
} // namespace lightweight