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

Add test for mixin redefined member ordering #1139

Merged
merged 1 commit into from
Mar 17, 2022
Merged

Add test for mixin redefined member ordering #1139

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
37 changes: 37 additions & 0 deletions smithy-model/src/test/java/software/amazon/smithy/model/shapes/StructureShapeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,4 +273,41 @@ public void flatteningStructureWithNoMixinsDoesNothing() {

assertThat(shape, equalTo(StructureShape.builder().id("smithy.example#A").build()));
}

@Test
public void redefiningMembersPreservesOrder() {
StringShape string = StringShape.builder().id("smithy.example#String").build();
StructureShape mixin1 = StructureShape.builder()
.id("smithy.example#Mixin1")
.addTrait(MixinTrait.builder().build())
.addMember("a", string.getId())
.addMember("b", string.getId())
.addMember("c", string.getId())
.build();
StructureShape mixin2 = StructureShape.builder()
.id("smithy.example#Mixin2")
.addTrait(MixinTrait.builder().build())
.addMember("c", string.getId())
.addMember("b", string.getId())
.addMember("a", string.getId())
.build();
StructureShape mixin3 = StructureShape.builder()
.id("smithy.example#Mixin3")
.addTrait(MixinTrait.builder().build())
.addMember("b", string.getId())
.addMember("c", string.getId())
.addMember("a", string.getId())
.addMixin(mixin2)
.build();
StructureShape concrete = StructureShape.builder()
.id("smithy.example#Concrete")
// Note that d is added before mixins, but the builder tracks this
// and handles ordering appropriately when building the shape.
.addMember("d", string.getId())
.addMixin(mixin1)
.addMixin(mixin3)
.build();

assertThat(concrete.getMemberNames(), contains("a", "b", "c", "d"));
}
}