CppunitTest_cppcanvas_test: generalize testComposite

Make it pass without cairo canvas.

Change-Id: I81dd5d21bde6d1e09c2e8eeea75d05ddf1793d91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153263
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>

cppcanvas/CppunitTest_cppcanvas_test.mk

@@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_use_vcl,cppcanvas_test))
 
 $(eval $(call gb_CppunitTest_use_components,cppcanvas_test,\
 	$(if $(ENABLE_CAIRO_CANVAS),canvas/source/cairo/cairocanvas) \
+	canvas/source/vcl/vclcanvas \
 	canvas/source/factory/canvasfactory \
     configmgr/source/configmgr \
     i18npool/util/i18npool \

cppcanvas/qa/unit/test.cxx

@@ -30,12 +30,10 @@ public:
 
 CPPUNIT_TEST_FIXTURE(CanvasTest, testComposite)
 {
-#if ENABLE_CAIRO_CANVAS
     ScopedVclPtrInstance<WorkWindow> pWin( nullptr, WB_STDWORK );
 
     uno::Reference<rendering::XCanvas> xCanvas = pWin->GetOutDev()->GetCanvas ();
-    if( !xCanvas.is() )
-        return; // can't get a canvas working at all - truly headless ?
+    CPPUNIT_ASSERT(xCanvas.is());
 
     // a huge canvas ...
     Size aSize (1, 1);
@@ -70,8 +68,6 @@ CPPUNIT_TEST_FIXTURE(CanvasTest, testComposite)
         XCachedPrimitive    fillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
 #endif
     }
-
-#endif
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();