Compile-time tests for @path

WonderCsabo · WonderCsabo · commit 79c8ef16c10f · 2015-09-21T11:46:14.000+02:00
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithPathVariable.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithPathVariable.java
@@ -21,6 +21,7 @@
 import org.androidannotations.rest.spring.annotations.Get;
 import org.androidannotations.rest.spring.annotations.Head;
 import org.androidannotations.rest.spring.annotations.Options;
+import org.androidannotations.rest.spring.annotations.Path;
 import org.androidannotations.rest.spring.annotations.Post;
 import org.androidannotations.rest.spring.annotations.Put;
 import org.androidannotations.rest.spring.annotations.Rest;
@@ -49,4 +50,12 @@ public interface ClientWithPathVariable {
 	@Put("/test/{v1}/{v2}")
 	void putWithParameterEntity(int v1, String v2);
 
+	@Get("/test/{v1}")
+	void getWithPathAnnotation(@Path("v1") int version);
+
+	@Get("/test/{v1}/{v2}")
+	void getWithPathAnnotationAndParam(@Path("v1") int v1, String v2);
+
+	@Get("/test/{v1}/{v2}")
+	void getWithCrossParamAnnotations(@Path("v1") int v2, @Path("v2") int v1);
 }
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongPathVariables.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongPathVariables.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.rest.spring;
+
+import org.androidannotations.rest.spring.annotations.Get;
+import org.androidannotations.rest.spring.annotations.Path;
+import org.androidannotations.rest.spring.annotations.Rest;
+import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
+
+@Rest(converters = MappingJacksonHttpMessageConverter.class)
+public interface ClientWithWrongPathVariables {
+
+	@Get("/duplicates/{v1}")
+	void getWithDuplicatePathVariables(@Path("v1") int v1, @Path("v1") int v2);
+
+	@Get("/missingvariable/{v1}")
+	void getWithMissingPathVariable(@Path("v1") int v1, @Path("v2") int hasMissingVariable);
+
+	@Get("/missingparameter/{v1}")
+	void getWithMissingMethodParameter(@Path("v1") int v1);
+
+	void missingGetAnnotation(@Path("missingGet") int v1);
+}
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestTest.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/RestTest.java
@@ -78,6 +78,16 @@ public void clientWithPathVariables() throws IOException {
 		assertCompilationSuccessful(result);
 	}
 
+	@Test
+	public void clientWithWrongPathVariables() throws IOException {
+		CompileResult result = compileFiles(ClientWithWrongPathVariables.class);
+		assertCompilationErrorOn(ClientWithWrongPathVariables.class, "@Get(\"/duplicates/{v1}\")", result);
+		assertCompilationErrorOn(ClientWithWrongPathVariables.class, "@Get(\"/missingvariable/{v1}\")", result);
+		assertCompilationErrorOn(ClientWithWrongPathVariables.class, "@Path(\"v2\")", result);
+		assertCompilationErrorOn(ClientWithWrongPathVariables.class, "@Path(\"missingGet\")", result);
+		assertCompilationErrorCount(5, result);
+	}
+
 	@Test
 	public void clientWithWrongEnhancedMethods() throws IOException {
 		CompileResult result = compileFiles(ClientWithWrongEnhancedMethod.class);
