Skip to content

Commit fc7a722

Browse files
committed
r renamed
1 parent aa469b7 commit fc7a722

File tree

4 files changed

+38
-38
lines changed

4 files changed

+38
-38
lines changed

approvaltests-tests/src/test/java/org/approvaltests/TableTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.approvaltests;
22

33
import org.approvaltests.legacycode.Range;
4-
import org.approvaltests.utils.MarkdownTable;
4+
import org.approvaltests.utils.VerifiableMarkdownTable;
55
import org.junit.jupiter.api.Test;
66

77
public class TableTest
@@ -10,15 +10,15 @@ public class TableTest
1010
void abilityModifier()
1111
{
1212
Integer[] inputs = Range.get(1, 20);
13-
MarkdownTable table = MarkdownTable.create(inputs, a -> getModifier(a), "Score", "Modifier");
13+
VerifiableMarkdownTable table = VerifiableMarkdownTable.create(inputs, a -> getModifier(a), "Score", "Modifier");
1414
Approvals.verify(table);
1515
}
1616
@Test
1717
void differentCases()
1818
{
1919
// begin-snippet: markdown_table_example
2020
String[] inputs = {"verify json", "verify all", "verify parameters", "verify as json"};
21-
MarkdownTable table = MarkdownTable.withHeaders("Input", "Camel Case", "Snake Case", "Kebab Case");
21+
VerifiableMarkdownTable table = VerifiableMarkdownTable.withHeaders("Input", "Camel Case", "Snake Case", "Kebab Case");
2222
table.addRowsForInputs(inputs, this::toCamelCase, this::toSnakeCase, this::toKebabCase);
2323
Approvals.verify(table);
2424
// end-snippet

approvaltests-util/src/main/java/com/spun/util/MarkdownTableBasic.java renamed to approvaltests-util/src/main/java/com/spun/util/MarkdownTable.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
import org.lambda.functions.Function1;
44
import org.lambda.query.Queryable;
55

6-
public class MarkdownTableBasic implements MarkdownCompatible
6+
public class MarkdownTable implements MarkdownCompatible
77
{
88
protected String markdown;
9-
public static <I, O> MarkdownTableBasic create(I[] inputs, Function1<I, O> o, String column1, String column2)
9+
public static <I, O> MarkdownTable create(I[] inputs, Function1<I, O> o, String column1, String column2)
1010
{
11-
MarkdownTableBasic table = new MarkdownTableBasic().withColumnHeaders(column1, column2);
11+
MarkdownTable table = new MarkdownTable().withColumnHeaders(column1, column2);
1212
for (I input : inputs)
1313
{
1414
table.addRow(input, o.call(input));
1515
}
1616
return table;
1717
}
18-
public static MarkdownTableBasic withHeaders(String... columnNames)
18+
public static MarkdownTable withHeaders(String... columnNames)
1919
{
20-
MarkdownTableBasic table = new MarkdownTableBasic();
20+
MarkdownTable table = new MarkdownTable();
2121
return table.withColumnHeaders(columnNames);
2222
}
23-
public <I> MarkdownTableBasic addRowsForInputs(I[] inputs, Function1<I, Object>... transfers)
23+
public <I> MarkdownTable addRowsForInputs(I[] inputs, Function1<I, Object>... transfers)
2424
{
2525
for (I input : inputs)
2626
{
@@ -30,12 +30,12 @@ public <I> MarkdownTableBasic addRowsForInputs(I[] inputs, Function1<I, Object>.
3030
}
3131
return this;
3232
}
33-
public MarkdownTableBasic addRow(Object... columns)
33+
public MarkdownTable addRow(Object... columns)
3434
{
3535
markdown += printRow(columns);
3636
return this;
3737
}
38-
public MarkdownTableBasic withColumnHeaders(String... headers)
38+
public MarkdownTable withColumnHeaders(String... headers)
3939
{
4040
markdown = printColumnHeaders(headers);
4141
return this;

approvaltests/src/main/java/org/approvaltests/utils/MarkdownTable.java

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package org.approvaltests.utils;
2+
3+
import com.spun.util.MarkdownTable;
4+
import org.approvaltests.core.Options;
5+
import org.approvaltests.core.Verifiable;
6+
import org.approvaltests.core.VerifyParameters;
7+
import org.lambda.functions.Function1;
8+
9+
public class VerifiableMarkdownTable extends MarkdownTable implements Verifiable
10+
{
11+
public VerifiableMarkdownTable(MarkdownTable markdownTableBasic) {
12+
this.markdown = markdownTableBasic.toMarkdown();
13+
}
14+
15+
public static <I, O> VerifiableMarkdownTable create(I[] inputs, Function1<I, O> o, String column1, String column2)
16+
{
17+
return new VerifiableMarkdownTable(MarkdownTable.create(inputs, o, column1, column2));
18+
}
19+
public static VerifiableMarkdownTable withHeaders(String... columnNames) {
20+
return new VerifiableMarkdownTable(MarkdownTable.withHeaders(columnNames));
21+
}
22+
@Override
23+
public VerifyParameters getVerifyParameters(Options options)
24+
{
25+
return new VerifyParameters(options.forFile().withExtension(".md"));
26+
}
27+
}

0 commit comments

Comments
 (0)