Skip to content

Commit

Permalink
Support Canvas#drawRect with RectF
Browse files Browse the repository at this point in the history
  • Loading branch information
@Akshay2131
Akshay2131 committed Apr 4, 2022
1 parent 3fd918c commit 18ad2d3
Show file tree
Hide file tree
Showing 3 changed files with 310 additions and 219 deletions.
109 changes: 81 additions & 28 deletions robolectric/src/test/java/org/robolectric/shadows/ShadowCanvasTest.java
View file
Expand Up @@ -38,29 +38,36 @@ public void shouldDescribeBitmapDrawing() throws Exception {
canvas.drawBitmap(imageBitmap, 1, 2, new Paint());
canvas.drawBitmap(imageBitmap, 100, 200, new Paint());

assertEquals("Bitmap for file:/an/image.jpg at (1,2)\n" +
"Bitmap for file:/an/image.jpg at (100,200)", shadowOf(canvas).getDescription());
assertEquals(
"Bitmap for file:/an/image.jpg at (1,2)\n" + "Bitmap for file:/an/image.jpg at (100,200)",
shadowOf(canvas).getDescription());

assertEquals("Bitmap for file:/an/image.jpg at (1,2)\n" +
"Bitmap for file:/an/image.jpg at (100,200)", shadowOf(targetBitmap).getDescription());
assertEquals(
"Bitmap for file:/an/image.jpg at (1,2)\n" + "Bitmap for file:/an/image.jpg at (100,200)",
shadowOf(targetBitmap).getDescription());
}

@Test
public void shouldDescribeBitmapDrawing_withDestinationRect() throws Exception {
Canvas canvas = new Canvas(targetBitmap);
canvas.drawBitmap(imageBitmap, new Rect(1,2,3,4), new Rect(5,6,7,8), new Paint());
canvas.drawBitmap(imageBitmap, new Rect(1, 2, 3, 4), new Rect(5, 6, 7, 8), new Paint());

assertEquals("Bitmap for file:/an/image.jpg at (5,6) with height=2 and width=2 taken from"
+ " Rect(1, 2 - 3, 4)", shadowOf(canvas).getDescription());
assertEquals(
"Bitmap for file:/an/image.jpg at (5,6) with height=2 and width=2 taken from"
+ " Rect(1, 2 - 3, 4)",
shadowOf(canvas).getDescription());
}

@Test
public void shouldDescribeBitmapDrawing_withDestinationRectF() throws Exception {
Canvas canvas = new Canvas(targetBitmap);
canvas.drawBitmap(imageBitmap, new Rect(1,2,3,4), new RectF(5.0f,6.0f,7.5f,8.5f), new Paint());
canvas.drawBitmap(
imageBitmap, new Rect(1, 2, 3, 4), new RectF(5.0f, 6.0f, 7.5f, 8.5f), new Paint());

assertEquals("Bitmap for file:/an/image.jpg at (5.0,6.0) with height=2.5 and width=2.5 taken"
+ " from Rect(1, 2 - 3, 4)", shadowOf(canvas).getDescription());
assertEquals(
"Bitmap for file:/an/image.jpg at (5.0,6.0) with height=2.5 and width=2.5 taken"
+ " from Rect(1, 2 - 3, 4)",
shadowOf(canvas).getDescription());
}

@Test
Expand All @@ -69,13 +76,17 @@ public void shouldDescribeBitmapDrawing_WithMatrix() throws Exception {
canvas.drawBitmap(imageBitmap, new Matrix(), new Paint());
canvas.drawBitmap(imageBitmap, new Matrix(), new Paint());

assertEquals("Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={}, post=[]]\n"
+ "Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={},"
+ " post=[]]", shadowOf(canvas).getDescription());
assertEquals(
"Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={}, post=[]]\n"
+ "Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={},"
+ " post=[]]",
shadowOf(canvas).getDescription());

assertEquals("Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={}, post=[]]\n"
+ "Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={},"
+ " post=[]]", shadowOf(targetBitmap).getDescription());
assertEquals(
"Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={}, post=[]]\n"
+ "Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={},"
+ " post=[]]",
shadowOf(targetBitmap).getDescription());
}

@Test
Expand All @@ -84,10 +95,11 @@ public void visualize_shouldReturnDescription() throws Exception {
canvas.drawBitmap(imageBitmap, new Matrix(), new Paint());
canvas.drawBitmap(imageBitmap, new Matrix(), new Paint());

assertEquals("Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={}, post=[]]\n"
+ "Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={},"
+ " post=[]]", ShadowCanvas.visualize(canvas));

assertEquals(
"Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={}, post=[]]\n"
+ "Bitmap for file:/an/image.jpg transformed by Matrix[pre=[], set={},"
+ " post=[]]",
ShadowCanvas.visualize(canvas));
}

@Test
Expand All @@ -96,8 +108,8 @@ public void drawColor_shouldReturnDescription() throws Exception {
canvas.drawColor(Color.WHITE);
canvas.drawColor(Color.GREEN);
canvas.drawColor(Color.TRANSPARENT);
assertEquals("draw color -1draw color -16711936draw color 0",
shadowOf(canvas).getDescription());
assertEquals(
"draw color -1draw color -16711936draw color 0", shadowOf(canvas).getDescription());
}

@Test
Expand Down Expand Up @@ -125,7 +137,8 @@ public void drawPath_shouldRecordThePathAndThePaint() throws Exception {
}

@Test
public void drawPath_shouldRecordThePointsOfEachPathEvenWhenItIsTheSameInstance() throws Exception {
public void drawPath_shouldRecordThePointsOfEachPathEvenWhenItIsTheSameInstance()
throws Exception {
Canvas canvas = new Canvas(targetBitmap);
Paint paint = new Paint();
Path path = new Path();
Expand All @@ -139,8 +152,10 @@ public void drawPath_shouldRecordThePointsOfEachPathEvenWhenItIsTheSameInstance(

ShadowCanvas shadow = shadowOf(canvas);
assertThat(shadow.getPathPaintHistoryCount()).isEqualTo(2);
assertEquals(shadowOf(shadow.getDrawnPath(0)).getPoints().get(0), new ShadowPath.Point(10, 10, LINE_TO));
assertEquals(shadowOf(shadow.getDrawnPath(1)).getPoints().get(0), new ShadowPath.Point(20, 20, LINE_TO));
assertEquals(
shadowOf(shadow.getDrawnPath(0)).getPoints().get(0), new ShadowPath.Point(10, 10, LINE_TO));
assertEquals(
shadowOf(shadow.getDrawnPath(1)).getPoints().get(0), new ShadowPath.Point(20, 20, LINE_TO));
}

@Test
Expand All @@ -157,8 +172,13 @@ public void drawPath_shouldAppendDescriptionToBitmap() throws Exception {
canvas.drawPath(path1, paint);
canvas.drawPath(path2, paint);

assertEquals("Path " + shadowOf(path1).getPoints().toString() + "\n"
+ "Path " + shadowOf(path2).getPoints().toString(), shadowOf(canvas).getDescription());
assertEquals(
"Path "
+ shadowOf(path1).getPoints().toString()
+ "\n"
+ "Path "
+ shadowOf(path2).getPoints().toString(),
shadowOf(canvas).getDescription());

assertEquals(
"Path "
Expand Down Expand Up @@ -223,7 +243,7 @@ public void shouldRecordText_charArrayOverload() throws Exception {
Canvas canvas = new Canvas();
Paint paint = new Paint();
paint.setColor(1);
canvas.drawText(new char[]{'h', 'e', 'l', 'l', 'o'}, 2, 3, 1f, 2f, paint);
canvas.drawText(new char[] {'h', 'e', 'l', 'l', 'o'}, 2, 3, 1f, 2f, paint);
ShadowCanvas shadowCanvas = shadowOf(canvas);

assertThat(shadowCanvas.getTextHistoryCount()).isEqualTo(1);
Expand Down Expand Up @@ -529,4 +549,37 @@ public void restoreToCount() {

assertThat(canvas.getSaveCount()).isEqualTo(save1);
}

@Test
public void drawRect_withPureFloatPosition() {
Bitmap bitmap = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
bitmap.eraseColor(Color.BLACK);
assertThat(bitmap.getPixel(0, 0)).isEqualTo(Color.BLACK);

Canvas canvas = new Canvas(bitmap);
Paint paint = new Paint();
paint.setStyle(Paint.Style.FILL);
paint.setAntiAlias(true);
paint.setColor(Color.WHITE);
canvas.drawRect(0, 0, 10, 10, paint);
assertThat(bitmap.getPixel(0, 0)).isEqualTo(Color.WHITE);
}

@Test
public void drawRect_withRectF() throws Exception {
Canvas canvas = new Canvas();
Paint paint = new Paint();
paint.setColor(Color.WHITE);
RectF rect = new RectF(2f, 4f, 10f, 10f);
canvas.drawRect(2f, 4f, 10f, 10f, paint);
ShadowCanvas shadowCanvas = shadowOf(canvas);

ShadowCanvas.RectPaintHistoryEvent drawRect = shadowCanvas.getDrawnRect(0);
assertThat(drawRect.left).isEqualTo(2f);
assertThat(drawRect.top).isEqualTo(4f);
assertThat(drawRect.right).isEqualTo(10f);
assertThat(drawRect.bottom).isEqualTo(10f);
assertThat(drawRect.rect).isEqualTo(rect);
assertThat(drawRect.paint.getColor()).isEqualTo(Color.WHITE);
}
}

0 comments on commit 18ad2d3

Please sign in to comment.