hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

improved Stringify

Browse Source
This commit is contained in:
Michael Hoennig
2022-09-30 16:27:18 +02:00
parent 31854bb838
commit d3312c4444
6 changed files with 159 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/test/java/net/hostsharing/hsadminng/StringifyUnitTest.java
View File

@@ -2,24 +2,17 @@ package net.hostsharing.hsadminng;
import lombok.*;
import lombok.experimental.FieldNameConstants;
import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
import org.junit.jupiter.api.Test;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.UUID;
import static net.hostsharing.hsadminng.Stringify.stringify;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
class StringifyUnitTest {
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
@@ -27,15 +20,20 @@ class StringifyUnitTest {
private static Stringify<TestBean> toString = stringify(TestBean.class, "bean")
.withProp(TestBean.Fields.label, TestBean::getLabel)
.withProp(TestBean.Fields.content, TestBean::getContent)
.withProp(TestBean.Fields.contentA, TestBean::getContentA)
.withProp(TestBean.Fields.contentB, TestBean::getContentB)
.withProp(TestBean.Fields.value, TestBean::getValue)
.withProp(TestBean.Fields.active, TestBean::isActive);
private UUID uuid;
private String label;
private SubBean content;
private SubBeanWithUnquotedValues contentA;
private SubBeanWithQuotedValues contentB;
private int value;
private boolean active;
@Override
@@ -51,15 +49,41 @@ class StringifyUnitTest {
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
public static class SubBean implements Stringifyable {
public static class SubBeanWithUnquotedValues implements Stringifyable {
private static Stringify<SubBean> toString = stringify(SubBean.class)
.withProp(SubBean.Fields.key, SubBean::getKey)
.withProp(Fields.value, SubBean::getValue);
private static Stringify<SubBeanWithUnquotedValues> toString = stringify(SubBeanWithUnquotedValues.class)
.withProp(SubBeanWithUnquotedValues::getKey)
.withProp(SubBeanWithUnquotedValues::getValue)
.withSeparator(": ")
.quotedValues(false);
private String key;
private String value;
@Override
public String toString() {
return toString.apply(this);
}
@Override
public String toShortString() {
return key + ":" + value;
}
}
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public static class SubBeanWithQuotedValues implements Stringifyable {
private static Stringify<SubBeanWithQuotedValues> toString = stringify(SubBeanWithQuotedValues.class)
.withProp(SubBeanWithQuotedValues::getKey)
.withProp(SubBeanWithQuotedValues::getValue)
.withSeparator(": ")
.quotedValues(true);
private String key;
private Integer value;
@@ -78,22 +102,33 @@ class StringifyUnitTest {
@Test
void stringifyWhenAllPropsHaveValues() {
final var given = new TestBean(UUID.randomUUID(), "some label",
new SubBean("some content", 1234), false);
new SubBeanWithUnquotedValues("some key", "some value"),
new SubBeanWithQuotedValues("some key", 1234),
42,
false);
final var result = given.toString();
assertThat(result).isEqualTo("bean(label='some label', content='some content:1234', active=false)");
assertThat(result).isEqualTo(
"bean(label='some label', contentA='some key:some value', contentB='some key:1234', value=42, active=false)");
}
@Test
void stringifyWhenAllNullablePropsHaveNulValues() {
final var given = new TestBean();
final var result = given.toString();
assertThat(result).isEqualTo("bean(active=false)");
assertThat(result).isEqualTo("bean(value=0, active=false)");
}
@Test
void stringifyWithoutExplicitNameUsesSimpleClassName() {
final var given = new SubBean("some key", 1234);
final var given = new SubBeanWithUnquotedValues("some key", "some value");
final var result = given.toString();
assertThat(result).isEqualTo("SubBean(key='some key', value=1234)");
assertThat(result).isEqualTo("SubBeanWithUnquotedValues(some key: some value)");
}
@Test
void stringifyWithQuotedValueTrueQuotesEvenIntegers() {
final var given = new SubBeanWithQuotedValues("some key", 1234);
final var result = given.toString();
assertThat(result).isEqualTo("SubBeanWithQuotedValues('some key': '1234')");
}
}

34
src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityTest.java Normal file
View File

@@ -0,0 +1,34 @@
package net.hostsharing.hsadminng.hs.office.partner;
import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
class HsOfficePartnerEntityTest {
@Test
void toStringContainsPersonAndContact() {
final var given = HsOfficePartnerEntity.builder()
.person(HsOfficePersonEntity.builder().tradeName("some trade name").build())
.contact(HsOfficeContactEntity.builder().label("some label").build())
.build();
final var result = given.toString();
assertThat(result).isEqualTo("partner(some trade name: some label)");
}
@Test
void toShortStringContainsPersonAndContact() {
final var given = HsOfficePartnerEntity.builder()
.person(HsOfficePersonEntity.builder().tradeName("some trade name").build())
.contact(HsOfficeContactEntity.builder().label("some label").build())
.build();
final var result = given.toShortString();
assertThat(result).isEqualTo("some trade name");
}
}

16
src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java
View File

@@ -150,9 +150,9 @@ class HsOfficePartnerRepositoryIntegrationTest extends ContextBasedTest {
// then
allThesePartnersAreReturned(
result,
"partner(Third OHG, third contact)",
"partner(Second e.K., second contact)",
"partner(First GmbH, first contact)");
"partner(Third OHG: third contact)",
"partner(Second e.K.: second contact)",
"partner(First GmbH: first contact)");
}
@Test
@@ -164,7 +164,7 @@ class HsOfficePartnerRepositoryIntegrationTest extends ContextBasedTest {
final var result = partnerRepo.findPartnerByOptionalNameLike(null);
// then:
exactlyThesePartnersAreReturned(result, "partner(First GmbH, first contact)");
exactlyThesePartnersAreReturned(result, "partner(First GmbH: first contact)");
}
}
@@ -180,7 +180,7 @@ class HsOfficePartnerRepositoryIntegrationTest extends ContextBasedTest {
final var result = partnerRepo.findPartnerByOptionalNameLike("third contact");
// then
exactlyThesePartnersAreReturned(result, "partner(Third OHG, third contact)");
exactlyThesePartnersAreReturned(result, "partner(Third OHG: third contact)");
}
}
@@ -392,20 +392,20 @@ class HsOfficePartnerRepositoryIntegrationTest extends ContextBasedTest {
void cleanup() {
context("superuser-alex@hostsharing.net", null);
tempPartners.forEach(tempPartner -> {
System.out.println("DELETING temporary partner: " + tempPartner.getDisplayName());
System.out.println("DELETING temporary partner: " + tempPartner.toString());
partnerRepo.deleteByUuid(tempPartner.getUuid());
});
}
void exactlyThesePartnersAreReturned(final List<HsOfficePartnerEntity> actualResult, final String... partnerNames) {
assertThat(actualResult)
.extracting(HsOfficePartnerEntity::getDisplayName)
.extracting(partnerEntity -> partnerEntity.toString())
.containsExactlyInAnyOrder(partnerNames);
}
void allThesePartnersAreReturned(final List<HsOfficePartnerEntity> actualResult, final String... partnerNames) {
assertThat(actualResult)
.extracting(HsOfficePartnerEntity::getDisplayName)
.extracting(partnerEntity -> partnerEntity.toString())
.contains(partnerNames);
}
}