More mangling for generated package names and path #1804
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
golangcibot
reviewed
Nov 18, 2018
generator/shared_test.go
Outdated
| @@ -458,6 +458,44 @@ func TestShared_MangleFileName(t *testing.T) { | |||
| assert.True(t, strings.HasSuffix(res, "_test_swagger")) | |||
| } | |||
|
|
|||
| func TestShared_ManglePackagePath(t *testing.T) { | |||
There was a problem hiding this comment.
461-478 lines are duplicate of generator/shared_test.go:480-497
generator/shared_test.go
Outdated
| assert.Equal(t, "a/b/c-d/e_f/g_h", res) | ||
| } | ||
|
|
||
| func TestShared_ManglePackageName(t *testing.T) { |
There was a problem hiding this comment.
480-497 lines are duplicate of generator/shared_test.go:461-478
generator/client_test.go
Outdated
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func testClientGenOpts() (g GenOpts) { | ||
| g.Target = "." | ||
| g.APIPackage = "operations" |
There was a problem hiding this comment.
string operations has 2 occurrences, make it a constant
generator/client_test.go
Outdated
| g.APIPackage = "operations" | ||
| g.ModelPackage = "models" | ||
| g.ServerPackage = "restapi" | ||
| g.ClientPackage = "client" |
There was a problem hiding this comment.
string client has 2 occurrences, make it a constant
generator/client_test.go
Outdated
| assert.Error(t, err) | ||
|
|
||
| opts = testClientGenOpts() | ||
| opts.Spec = "../fixtures/petstores/petstore.json" |
There was a problem hiding this comment.
string ../fixtures/petstores/petstore.json has 2 occurrences, make it a constant
generator/client_test.go
Outdated
| g.Target = "." | ||
| g.APIPackage = "operations" | ||
| g.ModelPackage = "models" | ||
| g.ServerPackage = "restapi" |
There was a problem hiding this comment.
string restapi has 2 occurrences, make it a constant
generator/client_test.go
Outdated
| func testClientGenOpts() (g GenOpts) { | ||
| g.Target = "." | ||
| g.APIPackage = "operations" | ||
| g.ModelPackage = "models" |
There was a problem hiding this comment.
string models has 4 occurrences, make it a constant
Codecov Report
@@ Coverage Diff @@
## master #1804 +/- ##
==========================================
+ Coverage 80.07% 80.41% +0.33%
==========================================
Files 38 38
Lines 7494 7521 +27
==========================================
+ Hits 6001 6048 +47
+ Misses 1014 1000 -14
+ Partials 479 473 -6
Continue to review full report at Codecov.
|
Makes generation functional and consistent regarding: * dashes in names * reserved suffixes, which are meaningful for go, like 'test' * sub-directories specified as target names (e.g. 'api/subdir') * packages for client, model and server * fixes go-swagger#1683 * fixes go-swagger#1157 * fixes go-swagger#1624 * replaces go-swagger#1790 Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
casualjim
approved these changes
Nov 19, 2018
fredbi
added a commit
to fredbi/go-swagger
that referenced
this pull request
Nov 20, 2018
* fixes go-swagger#1808 Thanks to @MrLuje for uncovering this issue. Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
fredbi
added a commit
to fredbi/go-swagger
that referenced
this pull request
Nov 20, 2018
* fixes go-swagger#1808 Thanks to @MrLuje for uncovering this issue. Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
casualjim
added a commit
that referenced
this pull request
Nov 20, 2018
Fixed regression on Windows introduced by #1804
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Makes generation functional and consistent regarding:
dashes in names
reserved suffixes, which are meaningful for go, like 'test'
sub-directories specified as target names (e.g. 'api/subdir')
packages for client, model and server
fixes Client wont compile with a route tagged "test" #1683
fixes Generate client does not handle "-" dashes in --client-package consistently #1157
fixes Can't have server code in subdirectory #1624
replaces WIP: Support server generation in a subdirectory #1624 #1790
Signed-off-by: Frederic BIDON fredbi@yahoo.com