Skip to content

Commit ea8cfc1

Browse files
jamesrcountsjamesrcounts
committed
Cleanup, tests
1 parent 3a73873 commit ea8cfc1

File tree

41 files changed

+583
-4004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+583
-4004
lines changed

‎src/main/java/org/teachingextensions/approvals/lite/Approvals.java‎

Lines changed: 57 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package org.teachingextensions.approvals.lite;
22

3+
import java.awt.Component;
4+
import java.awt.image.BufferedImage;
5+
import java.util.Arrays;
6+
37
import org.teachingextensions.approvals.lite.ReporterFactory.FileTypes;
48
import org.teachingextensions.approvals.lite.namer.ApprovalNamer;
59
import org.teachingextensions.approvals.lite.namer.JUnitStackTraceNamer;
@@ -11,94 +15,97 @@
1115
import org.teachingextensions.approvals.lite.writers.ComponentApprovalWriter;
1216
import org.teachingextensions.approvals.lite.writers.ImageApprovalWriter;
1317

14-
import java.awt.*;
15-
import java.awt.image.BufferedImage;
16-
import java.util.Arrays;
17-
18-
public class Approvals {
19-
public static void verify(String response) throws Exception {
18+
public class Approvals
19+
{
20+
public static void verify(String response) throws Exception
21+
{
2022
verify(new ApprovalTextWriter(response, "txt"), FileTypes.Text);
2123
}
22-
23-
public static <T> void verifyAll(String header, T[] values) {
24+
public static <T> void verifyAll(String header, T[] values)
25+
{
2426
Approvals.verifyAll(header, Arrays.asList(values));
2527
}
26-
27-
public static <T> void verifyAll(String header, Iterable<T> values) {
28-
Approvals.verifyAll(header, values, new Function1<T, String>() {
28+
public static <T> void verifyAll(String header, Iterable<T> values)
29+
{
30+
Approvals.verifyAll(header, values, new Function1<T, String>()
31+
{
2932
@Override
30-
public String call(T i) {
33+
public String call(T i)
34+
{
3135
return i + "";
3236
}
3337
});
34-
3538
}
36-
37-
public static <T> void verifyAll(String header, T[] values,
38-
Function1<T, String> f1) {
39+
public static <T> void verifyAll(String header, T[] values, Function1<T, String> f1)
40+
{
3941
verifyAll(header, Arrays.asList(values), f1);
4042
}
41-
42-
public static <T> void verifyAll(String header, Iterable<T> array,
43-
Function1<T, String> f1) {
43+
public static <T> void verifyAll(String header, Iterable<T> array, Function1<T, String> f1)
44+
{
4445
String text = formatHeader(header) + ArrayUtils.toString(array, f1);
4546
verify(new ApprovalTextWriter(text, "txt"), FileTypes.Text);
4647
}
47-
48-
private static String formatHeader(String header) {
48+
private static String formatHeader(String header)
49+
{
4950
return StringUtils.isEmpty(header) ? "" : header + "\r\n\r\n\r\n";
5051
}
51-
52-
public static void verifyHtml(String response) throws Exception {
52+
public static void verifyHtml(String response) throws Exception
53+
{
5354
verify(new ApprovalTextWriter(response, "html"), FileTypes.Html);
5455
}
55-
56-
public static void verify(Component component) {
57-
BufferedImage image = ComponentApprovalWriter.drawComponent(component);
58-
Approvals.verify(image);
56+
public static void verify(Component component)
57+
{
58+
Approvals.verify(new ComponentApprovalWriter(component), FileTypes.Image);
5959
}
60-
61-
public static void verify(BufferedImage bufferedImage) {
60+
public static void verify(BufferedImage bufferedImage)
61+
{
6262
verify(new ImageApprovalWriter(bufferedImage), FileTypes.Image);
6363
}
64-
65-
public static void verify(ApprovalWriter writer, ApprovalNamer namer,
66-
ApprovalFailureReporter reporter) {
64+
public static void verify(ApprovalWriter writer, ApprovalNamer namer, ApprovalFailureReporter reporter)
65+
{
6766
verify(new FileApprover(writer, namer), reporter);
6867
}
69-
70-
public static void verify(ApprovalWriter writer, String fileType) {
68+
public static void verify(ApprovalWriter writer, String fileType)
69+
{
7170
verify(writer, createApprovalNamer(), ReporterFactory.get(fileType));
7271
}
73-
74-
public static void verify(FileApprover approver,
75-
ApprovalFailureReporter reporter) {
76-
try {
77-
if (!approver.approve()) {
72+
public static void verify(FileApprover approver, ApprovalFailureReporter reporter)
73+
{
74+
try
75+
{
76+
if (!approver.approve())
77+
{
7878
boolean passed = false;
79-
if (reporter instanceof ApprovalFailureOverrider) {
80-
passed = approver
81-
.askToChangeReceivedToApproved((ApprovalFailureOverrider) reporter);
79+
if (reporter instanceof ApprovalFailureOverrider)
80+
{
81+
passed = approver.askToChangeReceivedToApproved((ApprovalFailureOverrider) reporter);
8282
}
83-
if (!passed) {
83+
if (!passed)
84+
{
8485
approver.reportFailure(reporter);
8586
approver.fail();
86-
} else {
87+
}
88+
else
89+
{
8790
approver.cleanUpAfterSuccess(reporter);
8891
}
89-
} else {
92+
}
93+
else
94+
{
9095
approver.cleanUpAfterSuccess(reporter);
9196
}
92-
} catch (Exception e) {
97+
}
98+
catch (Exception e)
99+
{
93100
throw ObjectUtils.throwAsError(e);
94101
}
95102
}
96-
97-
public static ApprovalNamer createApprovalNamer() {
103+
public static ApprovalNamer createApprovalNamer()
104+
{
98105
return new JUnitStackTraceNamer();
99106
}
100-
101-
public static void verify(Object o) throws Exception {
107+
public static void verify(Object o) throws Exception
108+
{
102109
Approvals.verify(o + "");
103110
}
104111
}

‎src/main/java/org/teachingextensions/approvals/lite/reporters/macosx/BeyondCompareImageReporter.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.teachingextensions.approvals.lite.reporters.macosx;
2+
3+
import org.teachingextensions.approvals.lite.reporters.GenericDiffReporter;
4+
5+
import java.text.MessageFormat;
6+
7+
public class BeyondCompareImageReporter extends GenericDiffReporter
8+
{
9+
public static final BeyondCompareImageReporter INSTANCE = new BeyondCompareImageReporter();
10+
static final String DIFF_PROGRAM = "/usr/local/bin/bcompare";
11+
static final String MESSAGE = MessageFormat.format(
12+
"Unable to find Beyond Compare at {0}",
13+
DIFF_PROGRAM);
14+
15+
public BeyondCompareImageReporter() {
16+
super(DIFF_PROGRAM, STANDARD_ARGUMENTS, MESSAGE, IMAGE_FILE_EXTENSIONS);
17+
}
18+
}

‎src/main/java/org/teachingextensions/approvals/lite/reporters/macosx/BeyondCompareReporter.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44

55
import java.text.MessageFormat;
66

7-
public class BeyondCompareReporter extends GenericDiffReporter {
7+
public class BeyondCompareReporter extends GenericDiffReporter
8+
{
89
public static final BeyondCompareReporter INSTANCE = new BeyondCompareReporter();
9-
static final String DIFF_PROGRAM = "/usr/local/bin/bcompare";
10-
static final String MESSAGE = MessageFormat.format(
11-
"Unable to find Beyond Compare at {0}", DIFF_PROGRAM);
12-
13-
public BeyondCompareReporter() {
10+
static final String DIFF_PROGRAM = "/usr/local/bin/bcompare";
11+
static final String MESSAGE = MessageFormat.format(
12+
"Unable to find Beyond Compare at {0}", DIFF_PROGRAM);
13+
public BeyondCompareReporter()
14+
{
1415
super(DIFF_PROGRAM, MESSAGE);
1516
}
1617
}
18+

‎src/main/java/org/teachingextensions/approvals/lite/reporters/macosx/MacDiffReporter.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
import org.teachingextensions.approvals.lite.reporters.FirstWorkingReporter;
44

5-
public class MacDiffReporter extends FirstWorkingReporter {
6-
public static final MacDiffReporter INSTANCE = new MacDiffReporter();
7-
8-
public MacDiffReporter() {
9-
super(DiffMergeReporter.INSTANCE, KaleidoscopeDiffReporter.INSTANCE, P4MergeReporter.INSTANCE, TkDiffReporter.INSTANCE);
10-
}
5+
public class MacDiffReporter extends FirstWorkingReporter
6+
{
7+
public static final MacDiffReporter INSTANCE = new MacDiffReporter();
8+
public MacDiffReporter()
9+
{
10+
super(DiffMergeReporter.INSTANCE, KaleidoscopeDiffReporter.INSTANCE, P4MergeReporter.INSTANCE,
11+
TkDiffReporter.INSTANCE, BeyondCompareReporter.INSTANCE, BeyondCompareImageReporter.INSTANCE);
12+
}
1113
}

0 commit comments

Comments
 (0)