#1683 - Backport of tests.

Backport of the tests introduced with 071256 to make sure the problem doesn't exist in this branch.

src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java

@@ -348,6 +348,15 @@ class UriTemplateUnitTest {
 		assertThat(UriTemplate.isTemplate("http://localhost/api/rest/v1/userGroups/50/functions/{?id*}")).isTrue();
 	}
 
+	@Test // #1696
+	void adaptsRequestParamVariableToContinuationIfBaseUriContainsParameter() {
+
+		UriTemplate template = UriTemplate.of("/path/{bar}/foo.zip?type=foo")
+				.with(new TemplateVariable("foobar", VariableType.REQUEST_PARAM));
+
+		assertThat(template.toString()).isEqualTo("/path/{bar}/foo.zip?type=foo{&foobar}");
+	}
+
 	private static void assertVariables(UriTemplate template, TemplateVariable... variables) {
 		assertVariables(template, Arrays.asList(variables));
 	}