Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1172 - Polishing.

Browse Source 
A bit of Javadoc on the factory methods. Avoiding abbreviations in method names, shorter parameter names. More trailing whitespace removal.

Reformatting of method invocation in test cases.

Original pull request: #1192.
This commit is contained in:
Oliver Drotbohm
2020-02-11 15:08:41 +01:00
parent f1bc790a23
commit d1c1fbb01f
2 changed files with 66 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java
View File

@@ -39,7 +39,7 @@ import org.apache.commons.io.output.ByteArrayOutputStream;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.hateoas.TemplateVariable.*;
import org.springframework.hateoas.TemplateVariable.VariableType;
/**
* Unit tests for {@link UriTemplate}.
@@ -301,23 +301,44 @@ class UriTemplateUnitTest {
assertThat(template.expand("value").toString()).isEqualTo("/foo?bar=value");
}
@Test // 1172
@Test // #1172
void useHelperMethodsToBuildUriTemplates() {
assertThat(UriTemplate.of("/foo").with(pathVariable("var")).getVariableNames()).containsExactly("var");
assertThat(UriTemplate.of("/foo") //
.with(pathVariable("var")) //
.getVariableNames()) //
.containsExactly("var");
assertThat(UriTemplate.of("/foo").with(requestParam("var")).with(requestParamContinued("var2")).toString())
.isEqualTo("/foo{?var,var2}");
assertThat(UriTemplate.of("/foo").with(requestParam("var")).with(requestParam("var2")).toString())
.isEqualTo("/foo{?var,var2}");
assertThat(UriTemplate.of("/foo") //
.with(requestParameter("var")) //
.with(requestParameterContinued("var2")) //
.toString()) //
.isEqualTo("/foo{?var,var2}");
assertThat(UriTemplate.of("/foo").with(requestParamContinued("var2")).toString()).isEqualTo("/foo{&var2}");
assertThat(UriTemplate.of("/foo") //
.with(requestParameter("var")) //
.with(requestParameter("var2")) //
.toString()) //
.isEqualTo("/foo{?var,var2}");
assertThat(UriTemplate.of("/foo").with(segment("var")).toString()).isEqualTo("/foo{/var}");
assertThat(UriTemplate.of("/foo") //
.with(requestParameterContinued("var2")) //
.toString()).isEqualTo("/foo{&var2}");
assertThat(UriTemplate.of("/foo").with(fragment("var")).toString()).isEqualTo("/foo{#var}");
assertThat(UriTemplate.of("/foo") //
.with(segment("var")) //
.toString()) //
.isEqualTo("/foo{/var}");
assertThat(UriTemplate.of("/foo").with(compositeParam("var")).toString()).isEqualTo("/foo{*var}");
assertThat(UriTemplate.of("/foo") //
.with(fragment("var")) //
.toString()) //
.isEqualTo("/foo{#var}");
assertThat(UriTemplate.of("/foo") //
.with(compositeParameter("var")) //
.toString()) //
.isEqualTo("/foo{*var}");
}
private static void assertVariables(UriTemplate template, TemplateVariable... variables) {