diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-12-01 13:45:03 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-12-02 15:47:33 +0100 |
| commit | 44239d8002792c1f6d9373db46382ac9f4d27466 (patch) | |
| tree | 3f6071418fd13741c2e480137a68e4b5438474fd /vcl/qa | |
| parent | b78e0c05ba3490b595807dbc4ea6b21f2a88a1c6 (diff) | |
vcl: improve vcldemo & outdev test.
Change-Id: I1ebc3c3b3cffabc8ba446ecd45ac2d9b0d45aff1
Diffstat (limited to 'vcl/qa')
| -rw-r--r-- | vcl/qa/cppunit/outdev.cxx | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx index 47e8dcfece70..de02ffc04f37 100644 --- a/vcl/qa/cppunit/outdev.cxx +++ b/vcl/qa/cppunit/outdev.cxx @@ -15,6 +15,9 @@ #include <vcl/bmpacc.hxx> #include <vcl/wrkwin.hxx> +#include <tools/stream.hxx> +#include <vcl/pngwrite.hxx> + class VclOutdevTest : public test::BootstrapFixture { public: @@ -36,18 +39,30 @@ void VclOutdevTest::testVirtualDevice() aVDev.DrawPixel(Point(1,2),COL_GREEN); aVDev.DrawPixel(Point(31,30),COL_RED); - CPPUNIT_ASSERT(aVDev.GetPixel(Point(0,0)) == COL_WHITE); - CPPUNIT_ASSERT(aVDev.GetPixel(Point(1,2)) == COL_GREEN); - CPPUNIT_ASSERT(aVDev.GetPixel(Point(31,30)) == COL_RED); - CPPUNIT_ASSERT(aVDev.GetPixel(Point(30,31)) == COL_WHITE); - Size aSize = aVDev.GetOutputSizePixel(); CPPUNIT_ASSERT(aSize == Size(32,32)); Bitmap aBmp = aVDev.GetBitmap(Point(),aSize); - Bitmap::ScopedReadAccess pAcc(aBmp); + +#if 0 + OUString rFileName("/tmp/foo-unx.png"); + try { + vcl::PNGWriter aWriter( aBmp ); + SvFileStream sOutput( rFileName, STREAM_WRITE ); + aWriter.Write( sOutput ); + sOutput.Close(); + } catch (...) { + SAL_WARN("vcl", "Error writing png to " << rFileName); + } +#endif + + CPPUNIT_ASSERT(aVDev.GetPixel(Point(0,0)) == COL_WHITE); + CPPUNIT_ASSERT(aVDev.GetPixel(Point(1,2)) == COL_GREEN); + CPPUNIT_ASSERT(aVDev.GetPixel(Point(31,30)) == COL_RED); + CPPUNIT_ASSERT(aVDev.GetPixel(Point(30,31)) == COL_WHITE); // Gotcha: y and x swap for BitmapReadAccess: deep joy. + Bitmap::ScopedReadAccess pAcc(aBmp); CPPUNIT_ASSERT(pAcc->GetPixel(0,0) == Color(COL_WHITE)); CPPUNIT_ASSERT(pAcc->GetPixel(2,1) == Color(COL_GREEN)); CPPUNIT_ASSERT(pAcc->GetPixel(30,31) == Color(COL_RED)); |