From 5dcde3f855d944cac1180ee0d0a98e45f3340eaa Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 29 Oct 2019 15:15:24 +0800 Subject: [PATCH] [Go][Server] better tests (#4295) * better test for go-api-server * better test for go gin server * fix go-api-server test * fix folder path * remove red test * update test files * update script with gofmt * update windows batch files * discard changes before running ensure-up-to-date * add go-api-server to ensure uptodate script --- CI/circle_parallel.sh | 4 ++ bin/go-gin-petstore-server.sh | 5 +- bin/go-petstore-server.sh | 4 +- bin/utils/ensure-up-to-date | 1 + bin/windows/go-gin-petstore-server.bat | 2 +- bin/windows/go-petstore-server.bat | 4 +- pom.xml | 2 + samples/server/petstore/go-api-server/pom.xml | 61 +++++++++++++++++++ .../server/petstore/go-gin-api-server/pom.xml | 61 +++++++++++++++++++ 9 files changed, 136 insertions(+), 8 deletions(-) create mode 100644 samples/server/petstore/go-api-server/pom.xml create mode 100644 samples/server/petstore/go-gin-api-server/pom.xml diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 5ec173139656..b7142b28a9dc 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -24,6 +24,10 @@ elif [ "$NODE_INDEX" = "2" ]; then # install elm-format npm install -g elm-format + # clear any changes to the samples + git checkout -- . + + # look for outdated samples ./bin/utils/ensure-up-to-date fi #elif [ "$NODE_INDEX" = "3" ]; then diff --git a/bin/go-gin-petstore-server.sh b/bin/go-gin-petstore-server.sh index b18bffcdff72..98dd63100a22 100755 --- a/bin/go-gin-petstore-server.sh +++ b/bin/go-gin-petstore-server.sh @@ -29,8 +29,8 @@ SPEC="modules/openapi-generator/src/test/resources/2_0/petstore.yaml" GENERATOR="go-gin-server" STUB_DIR="samples/server/petstore/go-gin-api-server" -echo "Removing files and folders under $STUB_DIR" -rm -rf $STUB_DIR +echo "Removing auto-generated files and folders under $STUB_DIR" +rm -rf $STUB_DIR/go # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" @@ -38,4 +38,3 @@ export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" ags="generate -t modules/openapi-generator/src/main/resources/go-gin-server -i $SPEC -g $GENERATOR -o $STUB_DIR --additional-properties packageName=petstoreserver --additional-properties hideGenerationTimestamp=true $@" java $JAVA_OPTS -jar $executable $ags -#!/usr/bin/env bash \ No newline at end of file diff --git a/bin/go-petstore-server.sh b/bin/go-petstore-server.sh index 3e5c19e436b9..e8ac83eba825 100755 --- a/bin/go-petstore-server.sh +++ b/bin/go-petstore-server.sh @@ -29,8 +29,8 @@ SPEC="modules/openapi-generator/src/test/resources/2_0/petstore.yaml" GENERATOR="go-server" STUB_DIR="samples/server/petstore/go-api-server" -echo "Removing files and folders under $STUB_DIR" -rm -rf $STUB_DIR +echo "Removing auto-generated files and folders under $STUB_DIR" +rm -rf $STUB_DIR/go # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date index 4793470bf221..f97dd12b8fe1 100755 --- a/bin/utils/ensure-up-to-date +++ b/bin/utils/ensure-up-to-date @@ -61,6 +61,7 @@ declare -a scripts=( "./bin/go-experimental-petstore.sh" "./bin/go-petstore.sh" "./bin/go-petstore-withxml.sh" +"./bin/go-petstore-server.sh" "./bin/go-gin-petstore-server.sh" "./bin/groovy-petstore.sh" "./bin/apex-petstore.sh" diff --git a/bin/windows/go-gin-petstore-server.bat b/bin/windows/go-gin-petstore-server.bat index f46a0482b22a..894976e9991e 100644 --- a/bin/windows/go-gin-petstore-server.bat +++ b/bin/windows/go-gin-petstore-server.bat @@ -11,7 +11,7 @@ set GENERATOR=go-gin-server set STUB_DIR=samples\server\petstore\go-gin-api-server echo Removing files and folders under %STUB_DIR% -del /F /S /Q %STUB_DIR% +del /F /S /Q %STUB_DIR%\go REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i %SPEC% -g %GENERATOR% -o %STUB_DIR% --additional-properties packageName=petstoreserver diff --git a/bin/windows/go-petstore-server.bat b/bin/windows/go-petstore-server.bat index c4eb17284aec..e520f5b252a8 100644 --- a/bin/windows/go-petstore-server.bat +++ b/bin/windows/go-petstore-server.bat @@ -11,11 +11,11 @@ set GENERATOR=go-server set STUB_DIR=samples\server\petstore\go-api-server echo Removing files and folders under %STUB_DIR% -del /F /S /Q %STUB_DIR% +del /F /S /Q %STUB_DIR%\go REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i %SPEC% -g %GENERATOR% -o %STUB_DIR% --additional-properties packageName=petstoreserver java %JAVA_OPTS% -jar %executable% %ags% -endlocal \ No newline at end of file +endlocal diff --git a/pom.xml b/pom.xml index 76812078fff6..978ccba2cdad 100644 --- a/pom.xml +++ b/pom.xml @@ -1183,6 +1183,8 @@ + samples/server/petstore/go-api-server + samples/server/petstore/go-gin-api-server samples/openapi3/client/petstore/ruby diff --git a/samples/server/petstore/go-api-server/pom.xml b/samples/server/petstore/go-api-server/pom.xml new file mode 100644 index 000000000000..f570ff8b8680 --- /dev/null +++ b/samples/server/petstore/go-api-server/pom.xml @@ -0,0 +1,61 @@ + + 4.0.0 + org.openapitools + GoApiServer + pom + 1.0-SNAPSHOT + Go Api Server + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + gofmt-test + integration-test + + exec + + + gofmt + + -w + ./main.go + + + + + gofmt-file-test + integration-test + + exec + + + gofmt + + -w + ./go/ + + + + + + + + diff --git a/samples/server/petstore/go-gin-api-server/pom.xml b/samples/server/petstore/go-gin-api-server/pom.xml new file mode 100644 index 000000000000..2f39285d4d4a --- /dev/null +++ b/samples/server/petstore/go-gin-api-server/pom.xml @@ -0,0 +1,61 @@ + + 4.0.0 + org.openapitools + GoGinServer + pom + 1.0-SNAPSHOT + Go Gin Server + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + gofmt-test + integration-test + + exec + + + gofmt + + -w + ./main.go + + + + + gofmt-file-test + integration-test + + exec + + + gofmt + + -w + ./go/ + + + + + + + +