Skip to content

Fix failing tests on some OS #1027

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
merged 2 commits into from
Feb 19, 2023
Merged

Fix failing tests on some OS #1027

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8b62df
Fix failing tests on some OS
esfomeado Feb 3, 2023
d626f22
Fix check style
esfomeado Feb 5, 2023
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
21 changes: 11 additions & 10 deletions src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenAnnotationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void generate_CustomAnnotationMappings() throws Exception {
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
assertFileContainsElements(files, "Event.scala",
" @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
"classOf[com.example.json.DateTimeScalarDeserializer])\n" +
"classOf[com.example.json.DateTimeScalarDeserializer])" + System.lineSeparator() +
" createdDateTime: org.joda.time.DateTime,");
}

Expand Down Expand Up @@ -91,23 +91,23 @@ void generate_CustomAnnotationMappings_Class() throws Exception {
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
assertFileContainsElements(files, "AcceptTopicSuggestionInput.scala",
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
"classOf[AcceptTopicSuggestionInputDeserializer])\n" +
"classOf[AcceptTopicSuggestionInputDeserializer])" + System.lineSeparator() +
"case class AcceptTopicSuggestionInput");
assertFileContainsElements(files, "AcceptTopicSuggestionPayload.scala",
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
"classOf[AcceptTopicSuggestionPayloadDeserializer])\n" +
"classOf[AcceptTopicSuggestionPayloadDeserializer])" + System.lineSeparator() +
"case class AcceptTopicSuggestionPayload");
assertFileContainsElements(files, "Actor.scala",
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
"classOf[ActorDeserializer])\n" +
"classOf[ActorDeserializer])" + System.lineSeparator() +
"trait Actor");
assertFileContainsElements(files, "Assignee.scala",
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
"classOf[AssigneeDeserializer])\n" +
"classOf[AssigneeDeserializer])" + System.lineSeparator() +
"trait Assignee");
assertFileContainsElements(files, "DeploymentOrderField.scala",
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
"classOf[DeploymentOrderFieldDeserializer])\n" +
"classOf[DeploymentOrderFieldDeserializer])" + System.lineSeparator() +
"object DeploymentOrderField extends Enumeration");
}

Expand All @@ -128,9 +128,10 @@ void generate_CustomAnnotationMappings_Multiple() throws Exception {
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
assertFileContainsElements(files, "AcceptTopicSuggestionPayload.scala",
"@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson" +
".annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")\n" +
".annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")" + System.lineSeparator() +
"@com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(classOf[io.github" +
".kobylynskyi.order.external.starwars.AcceptTopicSuggestionPayloadTypeResolver])\n" +
".kobylynskyi.order.external.starwars.AcceptTopicSuggestionPayloadTypeResolver])" +
System.lineSeparator() +
"case class AcceptTopicSuggestionPayload");
}

Expand All @@ -154,11 +155,11 @@ void generate_CustomAnnotationMappings_RequestResponseClasses() throws Exception
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
assertFileContainsElements(files, "CodeOfConductQueryRequest.scala",
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
"classOf[CodeOfConductQueryRequestDeserializer])\n" +
"classOf[CodeOfConductQueryRequestDeserializer])" + System.lineSeparator() +
"class CodeOfConductQueryRequest");
assertFileContainsElements(files, "CodeOfConductQueryResponse.scala",
"@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = " +
"classOf[CodeOfConductQueryResponseDeserializer])\n" +
"classOf[CodeOfConductQueryResponseDeserializer])" + System.lineSeparator() +
"class CodeOfConductQueryResponse extends GraphQLResult[JMap[String, " +
"CodeOfConduct]]");
}
Expand Down