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

[drape] test fixes

Browse source
This commit is contained in:
ExMix 2014-12-30 16:06:51 +03:00 • committed by Alex Zolotarev
parent 5d3977bebd
commit 462aa62950
6 changed files with 30 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drape/drape_tests/drape_tests.pro
View file

@ -48,3 +48,4 @@ HEADERS += \
glmock_functions.hpp \
memory_comparer.hpp \
img.hpp \
dummy_texture.hpp

13
drape/drape_tests/dummy_texture.hpp Normal file
View file

@ -0,0 +1,13 @@
#pragma once
#include "../pointers.hpp"
#include "../texture.hpp"
class DummyTexture : public dp::Texture
{
public:
virtual dp::RefPointer<ResourceInfo> FindResource(Key const & /*key*/) const
{
return dp::RefPointer<ResourceInfo>();
}
};

7
drape/drape_tests/font_texture_tests.cpp
View file

@ -1,5 +1,6 @@
#include "../../testing/testing.hpp"
#include "img.hpp"
#include "dummy_texture.hpp"
#include "../font_texture.hpp"
#include "../glyph_manager.hpp"
@ -25,12 +26,6 @@ using namespace dp;
namespace
{
class DummyTexture : public dp::Texture
{
public:
virtual ResourceInfo const * FindResource(Key const & key) const { return nullptr; }
};
class UploadedRender
{
public:

16
drape/drape_tests/stipple_pen_tests.cpp
View file

@ -1,11 +1,13 @@
#include "../../testing/testing.hpp"
#include "memory_comparer.hpp"
#include "dummy_texture.hpp"
#include "../glconstants.hpp"
#include "../stipple_pen_resource.hpp"
#include "../texture.hpp"
#include "glmock_functions.hpp"
#include <gmock/gmock.h>
@ -20,14 +22,6 @@ using namespace dp;
namespace
{
class DummyTexture : public Texture
{
public:
DummyTexture() {}
virtual ResourceInfo const * FindResource(Key const & key) const { return NULL; }
};
void TestPacker(StipplePenPacker & packer, uint32_t width, m2::RectU const & expect)
{
m2::RectU rect = packer.PackResource(width);
@ -410,11 +404,11 @@ UNIT_TEST(StippleMappingTest)
info.m_pattern.push_back(10);
info.m_pattern.push_back(10);
StipplePenResourceInfo const * r1 = index.MapResource(info);
RefPointer<Texture::ResourceInfo> r1 = index.MapResource(info);
TEST(IsRectsEqual(r1->GetTexRect(), m2::RectF(1.0f / width, 1.0f / height,
241.0f / width, 1.0f / height)), ());
StipplePenResourceInfo const * r2 = index.MapResource(info);
RefPointer<Texture::ResourceInfo> r2 = index.MapResource(info);
TEST(IsRectsEqual(r1->GetTexRect(), r2->GetTexRect()), ());
info.m_pattern.clear();
@ -451,7 +445,7 @@ UNIT_TEST(StippleMappingTest)
StipplePenKey secInfo;
secInfo.m_pattern.push_back(20);
secInfo.m_pattern.push_back(20);
StipplePenResourceInfo const * r12 = index.MapResource(secInfo);
RefPointer<Texture::ResourceInfo> r12 = index.MapResource(secInfo);
TEST(IsRectsEqual(r12->GetTexRect(), m2::RectF(1.0f / width, 7.0f / height,
241.0f / width, 7.0f / height)), ());

25
drape/drape_tests/texture_of_colors_tests.cpp
View file

@ -1,10 +1,10 @@
#include "../../testing/testing.hpp"
#include "memory_comparer.hpp"
#include "dummy_texture.hpp"
#include "../glconstants.hpp"
#include "../texture_of_colors.hpp"
#include "../texture_set_holder.hpp"
#include "../texture.hpp"
#include "glmock_functions.hpp"
@ -21,13 +21,6 @@ using namespace dp;
namespace
{
class SimpleTexture : public Texture
{
public:
SimpleTexture() {}
virtual ResourceInfo const * FindResource(Key const & key) const { return NULL; }
};
void TestRects(m2::RectF const & a, m2::RectF const & b)
{
@ -55,12 +48,12 @@ UNIT_TEST(ColorPalleteMappingTests)
{
ColorPalette cp(m2::PointU(32, 16));
ColorResourceInfo const * info1 = cp.MapResource(dp::Color(0, 0, 0, 0));
ColorResourceInfo const * info2 = cp.MapResource(dp::Color(1, 1, 1, 1));
ColorResourceInfo const * info3 = cp.MapResource(dp::Color(0, 0, 0, 0));
RefPointer<Texture::ResourceInfo> info1 = cp.MapResource(dp::Color(0, 0, 0, 0));
RefPointer<Texture::ResourceInfo> info2 = cp.MapResource(dp::Color(1, 1, 1, 1));
RefPointer<Texture::ResourceInfo> info3 = cp.MapResource(dp::Color(0, 0, 0, 0));
TEST_NOT_EQUAL(info1, info2, ());
TEST_EQUAL(info1, info3, ());
TEST_NOT_EQUAL(info1.GetRaw(), info2.GetRaw(), ());
TEST_EQUAL(info1.GetRaw(), info3.GetRaw(), ());
TestRects(info1->GetTexRect(), m2::RectF(1.0f / 32.0f, 1.0f / 16,
1.0f / 32.0f, 1.0f / 16));
TestRects(info2->GetTexRect(), m2::RectF(3.0f / 32.0f, 1.0f / 16,
@ -81,7 +74,7 @@ UNIT_TEST(ColorPalleteUploadingSingleRow)
int const height = 16;
InitOpenGLTextures(width, height);
SimpleTexture texture;
DummyTexture texture;
texture.Create(width, height, dp::RGBA8);
ColorPalette cp(m2::PointU(width, height));
cp.UploadResources(MakeStackRefPointer<Texture>(&texture));
@ -147,7 +140,7 @@ UNIT_TEST(ColorPalleteUploadingPartialyRow)
int const height = 16;
InitOpenGLTextures(width, height);
SimpleTexture texture;
DummyTexture texture;
dp::ColorKey key(dp::Color(0, 0, 0, 0));
texture.Create(width, height, dp::RGBA8);
ColorPalette cp(m2::PointU(width, height));
@ -222,7 +215,7 @@ UNIT_TEST(ColorPalleteUploadingMultipyRow)
int const height = 16;
InitOpenGLTextures(width, height);
SimpleTexture texture;
DummyTexture texture;
dp::ColorKey key(dp::Color(0, 0, 0, 0));
texture.Create(width, height, dp::RGBA8);
ColorPalette cp(m2::PointU(width, height));

2
drape/drape_tests/uniform_value_tests.cpp
View file

@ -166,7 +166,7 @@ UNIT_TEST(UniformValueTest)
}
GpuProgramManager * manager = new GpuProgramManager();
RefPointer<GpuProgram> program = manager->GetProgram(gpu::SOLID_AREA_PROGRAM);
RefPointer<GpuProgram> program = manager->GetProgram(gpu::TEXTURING_PROGRAM);
program->Bind();