Fixed merge error

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_RoundedCorners@1356814 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java b/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
index ebe7f17b5dd13c8b1d99f677dcebb4381d02b927..0f3e6e847f43ff3cdbf167f404f9b59cc5b91585 100644 (file)
--- a/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
+++ b/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
@@ -29,6 +29,7 @@ import org.w3c.dom.Document;
 import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.fonts.FontTriplet;
 import org.apache.fop.render.RenderingContext;
+import org.apache.fop.traits.BorderProps;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
@@ -76,6 +77,13 @@ public class AbstractIFPainterTestCase {
             public void drawText(int x, int y, int letterSpacing, int wordSpacing, int[][] dp,
                     String text) throws IFException {
             }
+
+            public void clipBackground(Rectangle rect, BorderProps bpsBefore,
+                    BorderProps bpsAfter, BorderProps bpsStart,
+                    BorderProps bpsEnd) throws IFException {
+                // TODO Auto-generated method stub
+                throw new UnsupportedOperationException();
+            }
         };
         FontInfo fontInfo = mock(FontInfo.class);
         when(handler.getFontInfo()).thenReturn(fontInfo);