Skip to content
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

Jump to bottom

[WIP] Removing legacy modules. Disabled SSE/WS client tests for now #1995

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Removing legacy modules. Disabled SSE/WS client tests for now #1995

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
8 changes: 3 additions & 5 deletions graphql-dgs-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-webflux")
testImplementation("com.graphql-java:graphql-java-extended-scalars")
testImplementation("io.projectreactor:reactor-test")
testImplementation(project(":graphql-dgs-subscriptions-graphql-sse-autoconfigure"))
testImplementation(project(":graphql-dgs-subscriptions-sse-autoconfigure"))
testImplementation(project(":graphql-dgs-subscriptions-websockets-autoconfigure"))
testImplementation(project(":graphql-dgs-spring-boot-oss-autoconfigure"))
testImplementation(project(":graphql-dgs-spring-webmvc-autoconfigure"))

testImplementation(project(":graphql-dgs-spring-graphql-starter"))
testImplementation(project(":graphql-dgs-spring-graphql-starter-test"))
}
9 changes: 3 additions & 6 deletions graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/CustomGraphQLClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,14 @@ package com.netflix.graphql.dgs.client
import com.netflix.graphql.dgs.DgsComponent
import com.netflix.graphql.dgs.DgsQuery
import com.netflix.graphql.dgs.DgsTypeDefinitionRegistry
import com.netflix.graphql.dgs.autoconfig.DgsAutoConfiguration
import com.netflix.graphql.dgs.subscriptions.graphql.sse.DgsGraphQLSSEAutoConfig
import com.netflix.graphql.dgs.webmvc.autoconfigure.DgsWebMvcAutoConfiguration
import com.netflix.graphql.dgs.test.EnableDgsTest
import graphql.language.FieldDefinition
import graphql.language.ObjectTypeDefinition
import graphql.language.TypeName
import graphql.schema.idl.TypeDefinitionRegistry
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.web.server.LocalServerPort
Expand All @@ -39,10 +36,10 @@ import org.springframework.http.HttpMethod
import org.springframework.web.client.RestTemplate

@SpringBootTest(
classes = [DgsAutoConfiguration::class, DgsWebMvcAutoConfiguration::class, WebClientGraphQLClientTest.TestApp::class],
classes = [WebClientGraphQLClientTest.TestApp::class],
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
)
@EnableAutoConfiguration(exclude = [DgsGraphQLSSEAutoConfig::class])
@EnableDgsTest
class CustomGraphQLClientTest {
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
@LocalServerPort
Expand Down
9 changes: 3 additions & 6 deletions ...-client/src/test/kotlin/com/netflix/graphql/dgs/client/CustomReactiveGraphQLClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ package com.netflix.graphql.dgs.client
import com.netflix.graphql.dgs.DgsComponent
import com.netflix.graphql.dgs.DgsQuery
import com.netflix.graphql.dgs.DgsTypeDefinitionRegistry
import com.netflix.graphql.dgs.autoconfig.DgsAutoConfiguration
import com.netflix.graphql.dgs.subscriptions.graphql.sse.DgsGraphQLSSEAutoConfig
import com.netflix.graphql.dgs.webmvc.autoconfigure.DgsWebMvcAutoConfiguration
import com.netflix.graphql.dgs.test.EnableDgsTest
import graphql.language.FieldDefinition
import graphql.language.ObjectTypeDefinition
import graphql.language.TypeName
import graphql.schema.idl.TypeDefinitionRegistry
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.web.server.LocalServerPort
Expand All @@ -37,10 +34,10 @@ import org.springframework.web.reactive.function.client.toEntity
import reactor.test.StepVerifier

@SpringBootTest(
classes = [DgsAutoConfiguration::class, DgsWebMvcAutoConfiguration::class, WebClientGraphQLClientTest.TestApp::class],
classes = [WebClientGraphQLClientTest.TestApp::class],
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
)
@EnableAutoConfiguration(exclude = [DgsGraphQLSSEAutoConfig::class])
@EnableDgsTest
class CustomReactiveGraphQLClientTest {
@LocalServerPort
var port: Int? = null
Expand Down
94 changes: 0 additions & 94 deletions ...src/test/kotlin/com/netflix/graphql/dgs/client/GraphqlSSESubscriptionGraphQLClientTest.kt
View file
Open in desktop

This file was deleted.

11 changes: 3 additions & 8 deletions ...-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/RestClientGraphQLClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ import com.netflix.graphql.dgs.DgsQuery
import com.netflix.graphql.dgs.DgsRuntimeWiring
import com.netflix.graphql.dgs.DgsTypeDefinitionRegistry
import com.netflix.graphql.dgs.InputArgument
import com.netflix.graphql.dgs.autoconfig.DgsAutoConfiguration
import com.netflix.graphql.dgs.subscriptions.graphql.sse.DgsGraphQLSSEAutoConfig
import com.netflix.graphql.dgs.webmvc.autoconfigure.DgsWebMvcAutoConfiguration
import com.netflix.graphql.dgs.test.EnableDgsTest
import graphql.GraphQLContext
import graphql.scalars.ExtendedScalars
import graphql.schema.Coercing
Expand All @@ -38,7 +36,6 @@ import org.intellij.lang.annotations.Language
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.web.server.LocalServerPort
Expand All @@ -48,17 +45,15 @@ import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.client.RestClient
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
import java.util.Locale
import java.util.*

@SpringBootTest(
classes = [
DgsAutoConfiguration::class,
DgsWebMvcAutoConfiguration::class,
RestClientGraphQLClientTest.TestApp::class,
],
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
)
@EnableAutoConfiguration(exclude = [DgsGraphQLSSEAutoConfig::class])
@EnableDgsTest
class RestClientGraphQLClientTest {
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
@LocalServerPort
Expand Down
11 changes: 5 additions & 6 deletions ...client/src/test/kotlin/com/netflix/graphql/dgs/client/SSESubscriptionGraphQLClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,14 @@ package com.netflix.graphql.dgs.client
import com.netflix.graphql.dgs.DgsComponent
import com.netflix.graphql.dgs.DgsSubscription
import com.netflix.graphql.dgs.DgsTypeDefinitionRegistry
import com.netflix.graphql.dgs.autoconfig.DgsAutoConfiguration
import com.netflix.graphql.dgs.subscriptions.graphql.sse.DgsGraphQLSSEAutoConfig
import com.netflix.graphql.dgs.subscriptions.sse.DgsSSEAutoConfig
import com.netflix.graphql.dgs.test.EnableDgsTest
import graphql.language.FieldDefinition.newFieldDefinition
import graphql.language.ObjectTypeDefinition.newObjectTypeDefinition
import graphql.language.TypeName
import graphql.schema.idl.TypeDefinitionRegistry
import org.junit.jupiter.api.Assertions.assertThrows
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.web.server.LocalServerPort
Expand All @@ -38,10 +36,11 @@ import reactor.core.publisher.Flux
import reactor.test.StepVerifier

@SpringBootTest(
classes = [DgsAutoConfiguration::class, DgsSSEAutoConfig::class, TestApp::class],
classes = [TestApp::class],
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
)
@EnableAutoConfiguration(exclude = [DgsGraphQLSSEAutoConfig::class])
@EnableDgsTest
@Disabled
internal class SSESubscriptionGraphQLClientTest {
@LocalServerPort
var port: Int? = null
Expand Down
9 changes: 2 additions & 7 deletions ...l-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/WebClientGraphQLClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ import com.netflix.graphql.dgs.DgsQuery
import com.netflix.graphql.dgs.DgsRuntimeWiring
import com.netflix.graphql.dgs.DgsTypeDefinitionRegistry
import com.netflix.graphql.dgs.InputArgument
import com.netflix.graphql.dgs.autoconfig.DgsAutoConfiguration
import com.netflix.graphql.dgs.subscriptions.graphql.sse.DgsGraphQLSSEAutoConfig
import com.netflix.graphql.dgs.webmvc.autoconfigure.DgsWebMvcAutoConfiguration
import com.netflix.graphql.dgs.test.EnableDgsTest
import graphql.GraphQLContext
import graphql.scalars.ExtendedScalars
import graphql.schema.Coercing
Expand All @@ -38,7 +36,6 @@ import org.assertj.core.api.Assertions.assertThat
import org.intellij.lang.annotations.Language
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.fail
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.web.server.LocalServerPort
Expand All @@ -57,13 +54,11 @@ import java.util.*
@Suppress("GraphQLUnresolvedReference")
@SpringBootTest(
classes = [
DgsAutoConfiguration::class,
DgsWebMvcAutoConfiguration::class,
WebClientGraphQLClientTest.TestApp::class,
],
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
)
@EnableAutoConfiguration(exclude = [DgsGraphQLSSEAutoConfig::class])
@EnableDgsTest
class WebClientGraphQLClientTest {
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
@LocalServerPort
Expand Down
11 changes: 5 additions & 6 deletions ...src/test/kotlin/com/netflix/graphql/dgs/client/WebSocketGraphQLClientWithDGSServerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,24 @@ package com.netflix.graphql.dgs.client
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import com.netflix.graphql.dgs.subscriptions.graphql.sse.DgsGraphQLSSEAutoConfig
import com.netflix.graphql.dgs.subscriptions.sse.DgsSSEAutoConfig
import com.netflix.graphql.dgs.subscriptions.websockets.DgsWebSocketAutoConfig
import com.netflix.graphql.dgs.test.EnableDgsTest
import graphql.GraphQLException
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
import org.slf4j.LoggerFactory
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.web.server.LocalServerPort
import org.springframework.web.reactive.socket.client.ReactorNettyWebSocketClient
import reactor.test.StepVerifier

@SpringBootTest(
classes = [DgsWebSocketAutoConfig::class, TestApp::class],
classes = [TestApp::class],
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
)
@EnableAutoConfiguration(exclude = [DgsSSEAutoConfig::class, DgsGraphQLSSEAutoConfig::class])
@EnableDgsTest
@Disabled
internal class WebSocketGraphQLClientWithDGSServerTest {
private val logger = LoggerFactory.getLogger(WebSocketGraphQLClientWithDGSServerTest::class.java)

Expand Down
8 changes: 0 additions & 8 deletions graphql-dgs-example-java-webflux/README.md
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions graphql-dgs-example-java-webflux/build.gradle.kts
View file
Open in desktop

This file was deleted.

Loading
Loading