Skip to content

Migrate to assertj #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
muehmar merged 1 commit into from
Dec 15, 2024
Merged

Migrate to assertj #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions core/src/test/java/io/github/muehmar/codegenerator/GeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import static io.github.muehmar.codegenerator.TestData.noData;
import static io.github.muehmar.codegenerator.TestSettings.noSettings;
import static io.github.muehmar.codegenerator.writer.Writer.javaWriter;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

import ch.bluecare.commons.data.PList;
import io.github.muehmar.codegenerator.TestData.BooleanData;
Expand All @@ -23,21 +23,21 @@ class GeneratorTest {
void constant_when_created_then_correctOutput() {
final Generator<Void, Void> gen = constant("Hello World!");
final Writer writer = gen.generate(noData(), noSettings(), javaWriter());
assertEquals("Hello World!", writer.asString());
assertThat(writer.asString()).isEqualTo("Hello World!");
}

@Test
void constant_when_formatArguments_then_correctOutput() {
final Generator<Void, Void> gen = constant("Hello %s!", "World");
final Writer writer = gen.generate(noData(), noSettings(), javaWriter());
assertEquals("Hello World!", writer.asString());
assertThat(writer.asString()).isEqualTo("Hello World!");
}

@Test
void ofWriterFunction_when_created_then_correctOutput() {
final Generator<Void, Void> gen = ofWriterFunction(w -> w.println("Hello World!"));
final Writer writer = gen.generate(noData(), noSettings(), javaWriter());
assertEquals("Hello World!", writer.asString());
assertThat(writer.asString()).isEqualTo("Hello World!");
}

@Test
Expand All @@ -47,7 +47,7 @@ void appendGenerator_when_called_then_generatedCorrectAppended() {

final Generator<Void, Void> gen = genA.append(genB);
final Writer writer = gen.generate(noData(), noSettings(), javaWriter());
assertEquals("genA\ngenB", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\ngenB");
}

@Test
Expand All @@ -57,7 +57,7 @@ void appendGeneratorWithTabs_when_called_then_generatedCorrectAppendedWithIndent

final Generator<Void, Void> gen = genA.append(genB, 2);
final Writer writer = gen.generate(noData(), noSettings(), javaWriter());
assertEquals("genA\n genB", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\n genB");
}

@Test
Expand All @@ -66,7 +66,7 @@ void appendUnaryOperator_when_called_then_generatedCorrectAppend() {

final Generator<Void, Void> gen = genA.append(w -> w.println("appended"));
final Writer writer = gen.generate(noData(), noSettings(), javaWriter());
assertEquals("genA\nappended", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\nappended");
}

@Test
Expand All @@ -76,7 +76,7 @@ void appendMappingInput_when_called_then_generatedCorrectAppend() {

final Generator<String, Void> gen = genA.append(genB, String::length);
final Writer writer = gen.generate("Hello World!", noSettings(), javaWriter());
assertEquals("genA\n12", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\n12");
}

@Test
Expand All @@ -87,7 +87,7 @@ void appendMappingInputWithSettings_when_called_then_generatedCorrectAppend() {
final Generator<String, Integer> gen =
genA.append(genB, (in, settings) -> in.length() + settings);
final Writer writer = gen.generate("Hello World!", 10, javaWriter());
assertEquals("genA\n22", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\n22");
}

@Test
Expand All @@ -102,7 +102,7 @@ void appendList_when_called_then_contentCreatedForEveryElementInTheList() {
genA.appendList(fieldGen, ListData::getList);
final Writer writer = generator.generate(data, noSettings(), javaWriter());

assertEquals("genA\nid\nusername\nnickname", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\nid\nusername\nnickname");
}

@Test
Expand All @@ -117,7 +117,7 @@ void appendList_when_calledWithSeparator_then_separatorAddedBetween() {
genA.appendList(fieldGen, ListData::getList, ofWriterFunction(Writer::println));
final Writer writer = generator.generate(data, noSettings(), javaWriter());

assertEquals("genA\nid\n\nusername\n\nnickname", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\nid\n\nusername\n\nnickname");
}

@Test
Expand All @@ -132,7 +132,7 @@ void appendList_when_emptyList_then_initialGenExecuted() {
genA.appendList(fieldGen, ignore -> PList.empty(), ofWriterFunction(Writer::println));
final Writer writer = generator.generate(data, noSettings(), javaWriter());

assertEquals("genA", writer.asString());
assertThat(writer.asString()).isEqualTo("genA");
}

@Test
Expand All @@ -144,7 +144,7 @@ void appendOptional_when_nonEmpty_then_contentAdded() {
genA.appendOptional(genB, Function.identity());
final Writer writer = generator.generate(Optional.of("data"), noSettings(), javaWriter());

assertEquals("genA\n-> data", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\n-> data");
}

@Test
Expand All @@ -156,7 +156,7 @@ void appendOptional_when_empty_then_nothingAdded() {
genA.appendOptional(genB, Function.identity());
final Writer writer = generator.generate(Optional.empty(), noSettings(), javaWriter());

assertEquals("genA", writer.asString());
assertThat(writer.asString()).isEqualTo("genA");
}

@Test
Expand All @@ -168,7 +168,7 @@ void appendConditionally_when_conditionEvaluatedToTrue_then_generatorAppended()
genA.appendConditionally(genB, BooleanData::isFlag);
final Writer writer = generator.generate(booleanData(true), noSettings(), javaWriter());

assertEquals("genA\ngenB", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\ngenB");
}

@Test
Expand All @@ -180,7 +180,7 @@ void appendConditionally_when_conditionEvaluatedToFalse_then_generatorNotAppende
genA.appendConditionally(genB, BooleanData::isFlag);
final Writer writer = generator.generate(booleanData(false), noSettings(), javaWriter());

assertEquals("genA", writer.asString());
assertThat(writer.asString()).isEqualTo("genA");
}

@Test
Expand All @@ -191,7 +191,7 @@ void filter_when_conditionIsTrue_then_generatorUnchanged() {

final Writer writer = generator.generate(1, 2, javaWriter());

assertEquals("genA", writer.asString());
assertThat(writer.asString()).isEqualTo("genA");
}

@Test
Expand All @@ -202,7 +202,7 @@ void filter_when_conditionIsFalse_then_emptyGeneratorReturned() {

final Writer writer = generator.generate(2, 2, javaWriter());

assertEquals("", writer.asString());
assertThat(writer.asString()).isEqualTo("");
}

@Test
Expand All @@ -214,7 +214,7 @@ void appendSingleBlankLine_when_called_then_outputHasNewLineAppended() {
.appendSingleBlankLine()
.generate(noData(), noSettings(), javaWriter());

assertEquals("genA\n", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\n");
}

@Test
Expand All @@ -223,7 +223,7 @@ void appendNewLine_when_called_then_outputHasNewLineAppended() {

final Writer writer = genA.appendNewLine().generate(noData(), noSettings(), javaWriter());

assertEquals("genA\n", writer.asString());
assertThat(writer.asString()).isEqualTo("genA\n");
}

@Test
Expand All @@ -232,7 +232,7 @@ void prependNewLine_when_called_then_outputHasNewLinePrepended() {

final Writer writer = genA.prependNewLine().generate(noData(), noSettings(), javaWriter());

assertEquals("\ngenA", writer.asString());
assertThat(writer.asString()).isEqualTo("\ngenA");
}

@Test
Expand All @@ -241,7 +241,7 @@ void int_when_called_then_indentedByGivenTabs() {

final Writer writer = genA.indent(2).generate(noData(), noSettings(), javaWriter());

assertEquals(" genA", writer.asString());
assertThat(writer.asString()).isEqualTo(" genA");
}

@Test
Expand All @@ -252,6 +252,6 @@ void contraMap_when_newGenCalled_then_inputTransformedAccordingly() {

final Writer writer = generator.generate(255, noSettings(), javaWriter());

assertEquals("ff", writer.asString());
assertThat(writer.asString()).isEqualTo("ff");
}
}
95 changes: 52 additions & 43 deletions core/src/test/java/io/github/muehmar/codegenerator/java/ClassGenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static io.github.muehmar.codegenerator.TestSettings.noSettings;
import static io.github.muehmar.codegenerator.writer.Writer.javaWriter;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

import ch.bluecare.commons.data.PList;
import io.github.muehmar.codegenerator.Generator;
Expand Down Expand Up @@ -39,9 +39,13 @@ void generate_when_simplePojoAndSingleContent_then_correctGeneratedString() {

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals(
"package io.github.muehmar;\n" + "\n" + "public class HelloWorld {\n" + " Content\n" + "}",
writer.asString());
assertThat(writer.asString())
.isEqualTo(
"package io.github.muehmar;\n"
+ "\n"
+ "public class HelloWorld {\n"
+ " Content\n"
+ "}");
}

@Test
Expand All @@ -62,14 +66,14 @@ void generate_when_javaDoc_then_correctGeneratedString() {

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals(
"package io.github.muehmar;\n"
+ "\n"
+ "/** HelloWorld */\n"
+ "public class HelloWorld {\n"
+ " Content\n"
+ "}",
writer.asString());
assertThat(writer.asString())
.isEqualTo(
"package io.github.muehmar;\n"
+ "\n"
+ "/** HelloWorld */\n"
+ "public class HelloWorld {\n"
+ " Content\n"
+ "}");
}

@Test
Expand All @@ -90,13 +94,13 @@ void generate_when_interface_then_correctOutput() {

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals(
"package io.github.muehmar;\n"
+ "\n"
+ "public interface HelloWorld {\n"
+ " Content\n"
+ "}",
writer.asString());
assertThat(writer.asString())
.isEqualTo(
"package io.github.muehmar;\n"
+ "\n"
+ "public interface HelloWorld {\n"
+ " Content\n"
+ "}");
}

@Test
Expand All @@ -117,9 +121,13 @@ void generate_when_enum_then_correctOutput() {

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals(
"package io.github.muehmar;\n" + "\n" + "public enum HelloWorld {\n" + " Content\n" + "}",
writer.asString());
assertThat(writer.asString())
.isEqualTo(
"package io.github.muehmar;\n"
+ "\n"
+ "public enum HelloWorld {\n"
+ " Content\n"
+ "}");
}

@Test
Expand All @@ -140,13 +148,13 @@ void generate_when_interfaceInheritsInterface_then_correctInheritance() {

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals(
"package io.github.muehmar;\n"
+ "\n"
+ "public interface HelloWorld extends World {\n"
+ " Content\n"
+ "}",
writer.asString());
assertThat(writer.asString())
.isEqualTo(
"package io.github.muehmar;\n"
+ "\n"
+ "public interface HelloWorld extends World {\n"
+ " Content\n"
+ "}");
}

@Test
Expand All @@ -167,14 +175,14 @@ void generate_when_refAddedInContent_then_refPrinted() {

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals(
"package io.github.muehmar;\n"
+ "\n"
+ "import java.util.Optional;\n"
+ "\n"
+ "public class HelloWorld {\n"
+ "}",
writer.asString());
assertThat(writer.asString())
.isEqualTo(
"package io.github.muehmar;\n"
+ "\n"
+ "import java.util.Optional;\n"
+ "\n"
+ "public class HelloWorld {\n"
+ "}");
}

@Test
Expand All @@ -195,7 +203,7 @@ void generate_when_nestedClass_then_noRefsAndPackagePrinted() {

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals("public class HelloWorld {\n" + "}", writer.asString());
assertThat(writer.asString()).isEqualTo("public class HelloWorld {\n" + "}");
}

@ParameterizedTest
Expand All @@ -218,7 +226,7 @@ void generate_when_privateAndFinalModifierUnordered_then_correctOutputWithOrdere

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals("public final class HelloWorld {\n" + "}", writer.asString());
assertThat(writer.asString()).isEqualTo("public final class HelloWorld {\n" + "}");
}

@Test
Expand All @@ -239,7 +247,7 @@ void generate_when_hasSuperClass_then_correctOutput() {

final Writer writer =
generator.generate(new StringData("HelloWorld"), noSettings(), javaWriter());
assertEquals("public class HelloWorld extends Superclass {\n" + "}", writer.asString());
assertThat(writer.asString()).isEqualTo("public class HelloWorld extends Superclass {\n" + "}");
}

@Test
Expand All @@ -260,8 +268,8 @@ void generate_when_hasSuperClassAndInterfaces_then_correctOutput() {

final Writer writer =
generator.generate(TestData.stringListData("Hello", "World"), noSettings(), javaWriter());
assertEquals(
"public class Hello extends Superclass implements World {\n" + "}", writer.asString());
assertThat(writer.asString())
.isEqualTo("public class Hello extends Superclass implements World {\n" + "}");
}

@Test
Expand All @@ -285,7 +293,8 @@ void generate_when_annotations_then_correctOutput() {

final Writer writer =
generator.generate(TestData.stringListData("Hello", "World"), noSettings(), javaWriter());
assertEquals("@Hello\n" + "@World\n" + "public class Hello {\n" + "}", writer.asString());
assertThat(writer.asString())
.isEqualTo("@Hello\n" + "@World\n" + "public class Hello {\n" + "}");
}

private static Stream<Arguments> publicAndFinalModifierUnordered() {
Expand Down
Loading
Loading