Skip to content

Commit cc14128

Browse files
kobylynskyikobylynskyi
committed
Fix line separator tests (#1039)
1 parent 4092ac4 commit cc14128

File tree

3 files changed

+79
-86
lines changed

3 files changed

+79
-86
lines changed

‎src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java‎

Lines changed: 46 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ void generate_CustomAnnotationMappings() throws Exception {
5353

5454
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
5555
assertFileContainsElements(files, "Event.java",
56-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
57-
"using = com.example.json.DateTimeScalarDeserializer.class)"
58-
+ System.lineSeparator() + " private org.joda.time.DateTime createdDateTime;");
56+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
57+
"using = com.example.json.DateTimeScalarDeserializer.class)",
58+
" private org.joda.time.DateTime createdDateTime;");
5959
}
6060

6161
@Test
@@ -69,9 +69,9 @@ void generate_CustomAnnotationMappings_Type() throws Exception {
6969

7070
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
7171
assertFileContainsElements(files, "Event.java",
72-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
73-
"using = com.example.json.DateTimeScalarDeserializer.class)"
74-
+ System.lineSeparator() + " private org.joda.time.DateTime createdDateTime;");
72+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
73+
"using = com.example.json.DateTimeScalarDeserializer.class)",
74+
" private org.joda.time.DateTime createdDateTime;");
7575
}
7676

7777
@Test
@@ -85,9 +85,9 @@ void generate_CustomAnnotationMappings_Regexp() throws Exception {
8585

8686
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
8787
assertFileContainsElements(files, "Event.java",
88-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
89-
"using = com.example.json.DateTimeScalarDeserializer.class)"
90-
+ System.lineSeparator() + " private org.joda.time.DateTime createdDateTime;");
88+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
89+
"using = com.example.json.DateTimeScalarDeserializer.class)",
90+
" private org.joda.time.DateTime createdDateTime;");
9191
}
9292

9393
@Test
@@ -101,9 +101,9 @@ void generate_CustomAnnotationMappings_FieldType() throws Exception {
101101

102102
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
103103
assertFileContainsElements(files, "Event.java",
104-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
105-
"using = com.example.json.DateTimeScalarDeserializer.class)"
106-
+ System.lineSeparator() + " private org.joda.time.DateTime createdDateTime;");
104+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
105+
"using = com.example.json.DateTimeScalarDeserializer.class)",
106+
" private org.joda.time.DateTime createdDateTime;");
107107
}
108108

109109
@Test
@@ -117,9 +117,9 @@ void generate_CustomAnnotationMappings_FieldType_Regexp() throws Exception {
117117

118118
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
119119
assertFileContainsElements(files, "Event.java",
120-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
121-
"using = com.example.json.DateTimeScalarDeserializer.class)"
122-
+ System.lineSeparator() + " private org.joda.time.DateTime createdDateTime;");
120+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
121+
"using = com.example.json.DateTimeScalarDeserializer.class)",
122+
" private org.joda.time.DateTime createdDateTime;");
123123
}
124124

125125
@Test
@@ -151,25 +151,25 @@ void generate_CustomAnnotationMappings_Class() throws Exception {
151151

152152
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
153153
assertFileContainsElements(files, "AcceptTopicSuggestionInput.java",
154-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
155-
"using = AcceptTopicSuggestionInputDeserializer.class)"
156-
+ System.lineSeparator() + "public class AcceptTopicSuggestionInput ");
154+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
155+
"using = AcceptTopicSuggestionInputDeserializer.class)",
156+
"public class AcceptTopicSuggestionInput ");
157157
assertFileContainsElements(files, "AcceptTopicSuggestionPayload.java",
158-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
159-
"using = AcceptTopicSuggestionPayloadDeserializer.class)"
160-
+ System.lineSeparator() + "public class AcceptTopicSuggestionPayload ");
158+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
159+
"using = AcceptTopicSuggestionPayloadDeserializer.class)",
160+
"public class AcceptTopicSuggestionPayload ");
161161
assertFileContainsElements(files, "Actor.java",
162-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
163-
"using = ActorDeserializer.class)"
164-
+ System.lineSeparator() + "public interface Actor ");
162+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
163+
"using = ActorDeserializer.class)",
164+
"public interface Actor ");
165165
assertFileContainsElements(files, "Assignee.java",
166-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
167-
"using = AssigneeDeserializer.class)"
168-
+ System.lineSeparator() + "public interface Assignee ");
166+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
167+
"using = AssigneeDeserializer.class)",
168+
"public interface Assignee ");
169169
assertFileContainsElements(files, "DeploymentOrderField.java",
170-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
171-
"using = DeploymentOrderFieldDeserializer.class)"
172-
+ System.lineSeparator() + "public enum DeploymentOrderField ");
170+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
171+
"using = DeploymentOrderFieldDeserializer.class)",
172+
"public enum DeploymentOrderField ");
173173
}
174174

175175
@Test
@@ -187,13 +187,11 @@ void generate_CustomAnnotationMappings_Multiple() throws Exception {
187187
generate("src/test/resources/schemas/github.graphqls");
188188

189189
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
190-
assertFileContainsElements(files, "AcceptTopicSuggestionPayload.java", System.lineSeparator() +
191-
"@com.fasterxml.jackson.annotation.JsonTypeInfo(" +
192-
"use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")"
193-
+ System.lineSeparator() +
194-
"@com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(" +
195-
"io.github.kobylynskyi.order.external.starwars.AcceptTopicSuggestionPayloadTypeResolver.class)"
196-
+ System.lineSeparator() +
190+
assertFileContainsElements(files, "AcceptTopicSuggestionPayload.java",
191+
"@com.fasterxml.jackson.annotation.JsonTypeInfo(",
192+
"use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")",
193+
"@com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(",
194+
"io.github.kobylynskyi.order.external.starwars.AcceptTopicSuggestionPayloadTypeResolver.class)",
197195
"public class AcceptTopicSuggestionPayload ");
198196
}
199197

@@ -247,15 +245,13 @@ void generate_CustomAnnotationMappings_RequestResponseClasses() throws Exception
247245

248246
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
249247
assertFileContainsElements(files, "CodeOfConductQueryRequest.java",
250-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
251-
"using = CodeOfConductQueryRequestDeserializer.class)"
252-
+ System.lineSeparator() +
253-
"public class CodeOfConductQueryRequest implements GraphQLOperationRequest {");
248+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
249+
"using = CodeOfConductQueryRequestDeserializer.class)",
250+
"public class CodeOfConductQueryRequest implements GraphQLOperationRequest {");
254251
assertFileContainsElements(files, "CodeOfConductQueryResponse.java",
255-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" +
256-
"using = CodeOfConductQueryResponseDeserializer.class)"
257-
+ System.lineSeparator() +
258-
"public class CodeOfConductQueryResponse extends GraphQLResult<Map<String, CodeOfConduct>> {");
252+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(",
253+
"using = CodeOfConductQueryResponseDeserializer.class)",
254+
"public class CodeOfConductQueryResponse extends GraphQLResult<Map<String, CodeOfConduct>> {");
259255
}
260256

261257
@Test
@@ -312,11 +308,11 @@ void generate_GeneratedAnnotation() throws Exception {
312308
generate("src/test/resources/schemas/test.graphqls");
313309

314310
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
315-
assertFileContainsElements(files, "Event.java", " */" + System.lineSeparator() +
316-
"@jakarta.annotation.Generated(" + System.lineSeparator() +
317-
" value = \"com.kobylynskyi.graphql.codegen.GraphQLCodegen\"," + System.lineSeparator() +
318-
" date = \"2020-12-31T23:59:59-0500\"" + System.lineSeparator() +
319-
")" + System.lineSeparator() +
311+
assertFileContainsElements(files, "Event.java", " */",
312+
"@jakarta.annotation.Generated(",
313+
" value = \"com.kobylynskyi.graphql.codegen.GraphQLCodegen\",",
314+
" date = \"2020-12-31T23:59:59-0500\"",
315+
")",
320316
"public class Event implements java.io.Serializable {");
321317
}
322318

‎src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static com.kobylynskyi.graphql.codegen.TestUtils.assertFileContainsElements;
2222
import static com.kobylynskyi.graphql.codegen.TestUtils.assertSameTrimmedContent;
2323
import static com.kobylynskyi.graphql.codegen.TestUtils.getFileByName;
24-
import static java.lang.System.lineSeparator;
2524
import static java.util.Collections.emptyList;
2625
import static java.util.Collections.singletonList;
2726
import static java.util.Collections.singletonMap;
@@ -142,10 +141,10 @@ void generate_NoPackage() throws Exception {
142141
generate("src/test/resources/schemas/test.graphqls");
143142

144143
File[] files = Objects.requireNonNull(outputBuildDir.listFiles());
145-
assertFileContainsElements(files, "Event.java", lineSeparator() +
146-
"/**" + lineSeparator() +
147-
" * An event that describes a thing that happens" + lineSeparator() +
148-
" */" + lineSeparator());
144+
assertFileContainsElements(files, "Event.java",
145+
"/**",
146+
" * An event that describes a thing that happens",
147+
" */");
149148
}
150149

151150
@Test

‎src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenAnnotationsTest.java‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ void generate_CustomAnnotationMappings() throws Exception {
5757

5858
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
5959
assertFileContainsElements(files, "Event.scala",
60-
" @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
61-
"classOf[com.example.json.DateTimeScalarDeserializer])" + System.lineSeparator() +
62-
" createdDateTime: org.joda.time.DateTime,");
60+
" @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = ",
61+
"classOf[com.example.json.DateTimeScalarDeserializer])",
62+
" createdDateTime: org.joda.time.DateTime,");
6363
}
6464

6565
@Test
@@ -89,25 +89,25 @@ void generate_CustomAnnotationMappings_Class() throws Exception {
8989

9090
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
9191
assertFileContainsElements(files, "AcceptTopicSuggestionInput.scala",
92-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
93-
"classOf[AcceptTopicSuggestionInputDeserializer])" + System.lineSeparator() +
94-
"case class AcceptTopicSuggestionInput");
92+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = ",
93+
"classOf[AcceptTopicSuggestionInputDeserializer])",
94+
"case class AcceptTopicSuggestionInput");
9595
assertFileContainsElements(files, "AcceptTopicSuggestionPayload.scala",
96-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
97-
"classOf[AcceptTopicSuggestionPayloadDeserializer])" + System.lineSeparator() +
98-
"case class AcceptTopicSuggestionPayload");
96+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = ",
97+
"classOf[AcceptTopicSuggestionPayloadDeserializer])",
98+
"case class AcceptTopicSuggestionPayload");
9999
assertFileContainsElements(files, "Actor.scala",
100-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
101-
"classOf[ActorDeserializer])" + System.lineSeparator() +
102-
"trait Actor");
100+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = ",
101+
"classOf[ActorDeserializer])",
102+
"trait Actor");
103103
assertFileContainsElements(files, "Assignee.scala",
104-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
105-
"classOf[AssigneeDeserializer])" + System.lineSeparator() +
106-
"trait Assignee");
104+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = ",
105+
"classOf[AssigneeDeserializer])",
106+
"trait Assignee");
107107
assertFileContainsElements(files, "DeploymentOrderField.scala",
108-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
109-
"classOf[DeploymentOrderFieldDeserializer])" + System.lineSeparator() +
110-
"object DeploymentOrderField extends Enumeration");
108+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = ",
109+
"classOf[DeploymentOrderFieldDeserializer])",
110+
"object DeploymentOrderField extends Enumeration");
111111
}
112112

113113
@Test
@@ -125,12 +125,11 @@ void generate_CustomAnnotationMappings_Multiple() throws Exception {
125125

126126
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
127127
assertFileContainsElements(files, "AcceptTopicSuggestionPayload.scala",
128-
"@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson" +
129-
".annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")" + System.lineSeparator() +
130-
"@com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(classOf[io.github" +
131-
".kobylynskyi.order.external.starwars.AcceptTopicSuggestionPayloadTypeResolver])" +
132-
System.lineSeparator() +
133-
"case class AcceptTopicSuggestionPayload");
128+
"@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson",
129+
".annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")",
130+
"@com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(classOf[io.github",
131+
".kobylynskyi.order.external.starwars.AcceptTopicSuggestionPayloadTypeResolver])",
132+
"case class AcceptTopicSuggestionPayload");
134133
}
135134

136135
@Test
@@ -151,14 +150,13 @@ void generate_CustomAnnotationMappings_RequestResponseClasses() throws Exception
151150

152151
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
153152
assertFileContainsElements(files, "CodeOfConductQueryRequest.scala",
154-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
155-
"classOf[CodeOfConductQueryRequestDeserializer])" + System.lineSeparator() +
156-
"class CodeOfConductQueryRequest");
153+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = ",
154+
"classOf[CodeOfConductQueryRequestDeserializer])",
155+
"class CodeOfConductQueryRequest");
157156
assertFileContainsElements(files, "CodeOfConductQueryResponse.scala",
158-
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
159-
"classOf[CodeOfConductQueryResponseDeserializer])" + System.lineSeparator() +
160-
"class CodeOfConductQueryResponse extends GraphQLResult[JMap[String, " +
161-
"CodeOfConduct]]");
157+
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = ",
158+
"classOf[CodeOfConductQueryResponseDeserializer])",
159+
"class CodeOfConductQueryResponse extends GraphQLResult[JMap[String, CodeOfConduct]]");
162160
}
163161

164162
@Test

0 commit comments

Comments
 (0)