Unverified Commit 50148e69 authored by Fahad Zubair's avatar Fahad Zubair Committed by GitHub
Browse files

Use `serverIntegrationTest` instead of local server invocation function (#3775) 



Member constraint shape tests were using a server codegen invocation
function which was very similar to `serverIntegrationTest`. This PR
removes that and uses `serverIntegrationTest` instead.

Co-authored-by: default avatarFahad Zubair <fahadzub@amazon.com>
parent 507ebe8a

codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ConstraintsMemberShapeTest.kt

+14 −76
Original line number Diff line number Diff line
@@ -14,27 +14,16 @@ import software.amazon.smithy.model.SourceLocation 
import software.amazon.smithy.model.shapes.ShapeId

import software.amazon.smithy.model.traits.RequiredTrait

import software.amazon.smithy.model.traits.Trait

import software.amazon.smithy.rust.codegen.core.rustlang.RustModule

import software.amazon.smithy.rust.codegen.core.rustlang.RustWriter

import software.amazon.smithy.rust.codegen.core.rustlang.Writable

import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig

import software.amazon.smithy.rust.codegen.core.smithy.RuntimeCrateLocation

import software.amazon.smithy.rust.codegen.core.smithy.RustCrate

import software.amazon.smithy.rust.codegen.core.smithy.transformers.OperationNormalizer

import software.amazon.smithy.rust.codegen.core.testutil.IntegrationTestParams

import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel

import software.amazon.smithy.rust.codegen.core.testutil.generatePluginContext

import software.amazon.smithy.rust.codegen.core.testutil.testModule

import software.amazon.smithy.rust.codegen.core.testutil.unitTest

import software.amazon.smithy.rust.codegen.core.util.runCommand

import software.amazon.smithy.rust.codegen.core.util.toPascalCase

import software.amazon.smithy.rust.codegen.core.util.toSnakeCase

import software.amazon.smithy.rust.codegen.server.smithy.customizations.CustomValidationExceptionWithReasonDecorator

import software.amazon.smithy.rust.codegen.server.smithy.customizations.ServerRequiredCustomizations

import software.amazon.smithy.rust.codegen.server.smithy.customizations.SmithyValidationExceptionDecorator

import software.amazon.smithy.rust.codegen.server.smithy.customize.CombinedServerCodegenDecorator

import software.amazon.smithy.rust.codegen.server.smithy.testutil.serverTestCodegenContext

import software.amazon.smithy.rust.codegen.server.smithy.testutil.serverIntegrationTest

import software.amazon.smithy.rust.codegen.server.smithy.transformers.ConstrainedMemberTransform

import java.io.File

import java.nio.file.Path



class ConstraintsMemberShapeTest {

    private val outputModelOnly =
@@ -284,59 +273,9 @@ class ConstraintsMemberShapeTest { 
        )

    }



    private fun runServerCodeGen(

        model: Model,

        dirToUse: File? = null,

        writable: Writable,

    ): Path {

        val runtimeConfig =

            RuntimeConfig(runtimeCrateLocation = RuntimeCrateLocation.path(File("../rust-runtime").absolutePath))



        val (context, dir) =

            generatePluginContext(

                model,

                runtimeConfig = runtimeConfig,

                overrideTestDir = dirToUse,

            )

        val codegenDecorator =

            CombinedServerCodegenDecorator.fromClasspath(

                context,

                ServerRequiredCustomizations(),

                SmithyValidationExceptionDecorator(),

                CustomValidationExceptionWithReasonDecorator(),

            )



        ServerCodegenVisitor(context, codegenDecorator)

            .execute()



        val codegenContext = serverTestCodegenContext(model)

        val settings = ServerRustSettings.from(context.model, context.settings)

        val rustCrate =

            RustCrate(

                context.fileManifest,

                codegenContext.symbolProvider,

                settings.codegenConfig,

                codegenContext.expectModuleDocProvider(),

            )



        // We cannot write to the lib anymore as the RustWriter overwrites it, so writing code directly to check.rs

        // and then adding a `mod check;` to the lib.rs

        rustCrate.withModule(RustModule.public("check")) {

            writable(this)

            File("$dir/src/check.rs").writeText(toString())

        }



        val lib = File("$dir/src/lib.rs")

        val libContents = lib.readText() + "\nmod check;"

        lib.writeText(libContents)



        return dir

    }



    @Test

    fun `generate code and check member constrained shapes are in the right modules`() {

        val dir =

            runServerCodeGen(outputModelOnly) {

        serverIntegrationTest(outputModelOnly, IntegrationTestParams(service = "constrainedMemberShape#ConstrainedService")) { codegenContext, rustCrate ->

            fun RustWriter.testTypeExistsInBuilderModule(typeName: String) {

                unitTest(

                    "builder_module_has_${typeName.toSnakeCase()}",
@@ -346,6 +285,7 @@ class ConstraintsMemberShapeTest { 
                )

            }



            rustCrate.testModule {

                // All directly constrained members of the output structure should be in the builder module

                setOf(

                    "ConstrainedLong",
@@ -394,9 +334,7 @@ class ConstraintsMemberShapeTest { 
                    ).generateUseStatements("crate::model::pattern_string_list_override"),

                )

            }



        val env = mapOf("RUSTFLAGS" to "-A dead_code")

        "cargo test".runCommand(dir, env)

        }

    }



    /**