EMConverter: remove unneeded font size management

(bzr r4253.4.1)

2 files changed, 8 insertions, 21 deletions

diff --git a/tests/test_em_converter.cpp b/tests/test_em_converter.cpp
index 3936c08bc..44239263e 100644
--- a/tests/test_em_converter.cpp
+++ b/tests/test_em_converter.cpp
@@ -26,34 +26,19 @@ namespace unity
 {
 
 int const PIXEL_SIZE = 24;
-int const FONT_SIZE = 13;
 double const DPI = 96.0;
 
 class TestEMConverter : public Test
 {
 public:
 TestEMConverter()
- : em_converter(FONT_SIZE, DPI)
+ : em_converter(DPI)
 {
 }
 
 EMConverter em_converter;
 };
 
-TEST_F(TestEMConverter, TestCtor)
-{
- EXPECT_EQ(FONT_SIZE, em_converter.GetFontSize());
- EXPECT_EQ(DPI, em_converter.GetDPI());
-}
-
-TEST_F(TestEMConverter, TestSetFontSize)
-{
- int const font_size = 15;
-
- em_converter.SetFontSize(font_size);
- EXPECT_EQ(font_size, em_converter.GetFontSize());
-}
-
 TEST_F(TestEMConverter, TestSetDPI)
 {
 int const dpi = 120.0;
@@ -79,10 +64,13 @@ TEST_F(TestEMConverter, TestDPIScale2)
 EXPECT_FLOAT_EQ(em_converter.DPIScale(), 2.0);
 }
 
-TEST_F(TestEMConverter, TestPtToPx)
+TEST_F(TestEMConverter, TestConvertPixelScaled)
 {
- int pt = 12;
- EXPECT_EQ(em_converter.PtToPx(pt), 16);
+ for (double scale : std::vector<double>({1.0, 1.25, 1.5, 1.75, 2}))
+ {
+ em_converter.SetDPI(DPI * scale);
+ EXPECT_EQ(std::round(PIXEL_SIZE * scale), em_converter.CP(PIXEL_SIZE));
+ }
 }
 
 } // namespace unity
diff --git a/tests/test_raw_pixel.cpp b/tests/test_raw_pixel.cpp
index 140bf6010..c7cc9eef5 100644
--- a/tests/test_raw_pixel.cpp
+++ b/tests/test_raw_pixel.cpp
@@ -25,14 +25,13 @@ using namespace testing;
 namespace unity
 {
 
-int const FONT_SIZE = 13;
 double const DPI = 96.0;
 
 class TestRawPixel : public Test
 {
 public:
 TestRawPixel()
- : cv(std::make_shared<EMConverter>(FONT_SIZE, DPI))
+ : cv(std::make_shared<EMConverter>(DPI))
 , p_i(10_em)
 , p_f(10.0_em)
 {