Skip to content

Commit b3309dd

Browse files
committed
code review feedback
1 parent 62e8510 commit b3309dd

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

src/main/java/net/datafaker/providers/base/Image.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
import javax.imageio.ImageIO;
5-
import java.awt.*;
65
import java.awt.Color;
6+
import java.awt.Graphics2D;
77
import java.awt.image.BufferedImage;
88
import java.io.ByteArrayOutputStream;
99
import java.io.IOException;

src/test/java/net/datafaker/assertions/ImageAssert.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ public class ImageAssert extends AbstractAssert<ImageAssert, ImageData> {
2626
super(actual, ImageAssert.class);
2727
}
2828

29+
public ImageAssert is(ImageType type) {
30+
return is(type, 256, 256);
31+
}
32+
2933
public ImageAssert is(ImageType type, int width, int height) {
3034
assertImageDataUrl(type);
3135
return switch (type) {
@@ -65,7 +69,7 @@ private ImageAssert verifySvg(ImageData image, int width, int height) {
6569
byte[] bytes = Base64.getDecoder().decode(content);
6670
try {
6771
String xml = new String(bytes);
68-
assertThat(xml).matches("<svg xmlns=\".+\" width=\"256\" height=\"256\">.*");
72+
assertThat(xml).matches("<svg xmlns=\".+\" width=\"256\" height=\"256\">.*</svg>");
6973

7074
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
7175
Document doc = builder.parse(new ByteArrayInputStream(bytes));

src/test/java/net/datafaker/providers/base/ImageTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,37 @@ class ImageTest {
2121

2222
@Test
2323
void bmp() {
24-
assertThatImage(faker.image().base64BMP()).is(BMP, 256, 256);
24+
assertThatImage(faker.image().base64BMP()).is(BMP);
2525
}
2626

2727
@Test
2828
void gif() {
29-
assertThatImage(faker.image().base64GIF()).is(GIF, 256, 256);
29+
assertThatImage(faker.image().base64GIF()).is(GIF);
3030
}
3131

3232
@Test
3333
void png() {
34-
assertThatImage(faker.image().base64PNG()).is(PNG, 256, 256);
34+
assertThatImage(faker.image().base64PNG()).is(PNG);
3535
}
3636

3737
@Test
3838
void jpg() {
39-
assertThatImage(faker.image().base64JPG()).is(JPEG, 256, 256);
39+
assertThatImage(faker.image().base64JPG()).is(JPEG);
4040
}
4141

4242
@Test
4343
void jpeg() {
44-
assertThatImage(faker.image().base64JPEG()).is(JPEG, 256, 256);
44+
assertThatImage(faker.image().base64JPEG()).is(JPEG);
4545
}
4646

4747
@Test
4848
void svg() {
49-
assertThatImage(faker.image().base64SVG()).is(SVG, 256, 256);
49+
assertThatImage(faker.image().base64SVG()).is(SVG);
5050
}
5151

5252
@Test
5353
void tiff() {
54-
assertThatImage(faker.image().base64TIFF()).is(TIFF, 256, 256);
54+
assertThatImage(faker.image().base64TIFF()).is(TIFF);
5555
}
5656

5757
@ParameterizedTest
@@ -65,15 +65,15 @@ void base64(ImageType imageType) {
6565
@Test
6666
void defaultBuilder_generatesPngImage() {
6767
String image = faker.image().base64(Image.ImageBuilder.builder().build());
68-
assertThatImage(image).is(PNG, 256, 256);
68+
assertThatImage(image).is(PNG);
6969
}
7070

7171
@Test
7272
void customBase64builder() {
7373
String gif = faker.image().base64(Image.ImageBuilder.builder()
7474
.type(ImageType.GIF)
7575
.build());
76-
assertThatImage(gif).is(GIF, 256, 256);
76+
assertThatImage(gif).is(GIF);
7777
}
7878

7979
@Test

0 commit comments

Comments
 (0)