integration test for #117

justinhrobbins · Feb 2, 2014 · 04045f7 · 04045f7
1 parent 807363c
commit 04045f7
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 13 deletions.
diff --git a/...WebServices/src/test/java/org/robbins/flashcards/webservices/FlashCardsAppResourceIT.java b/...WebServices/src/test/java/org/robbins/flashcards/webservices/FlashCardsAppResourceIT.java
@@ -0,0 +1,30 @@
+
+package org.robbins.flashcards.webservices;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.robbins.flashcards.tests.webservices.BaseRestTest;
+import org.robbins.flashcards.webservices.util.ResourceUrls;
+import org.robbins.tests.IntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+
+@Category(IntegrationTest.class)
+@ContextConfiguration(locations = { "classpath*:applicatonContext-webServices-test.xml" })
+public class FlashCardsAppResourceIT extends BaseRestTest {
+
+    private String getStatusUrl() {
+        return getServerAddress() + ResourceUrls.status;
+    }
+
+    @Test
+    public void status_FoundManifestAndVerson() {
+        String result = getRestTemplate().getForObject(getStatusUrl(), String.class);
+
+        assertThat(result, is(String.class));
+        assertThat(result.length(), greaterThan(1));
+    }
+}
diff --git a/...Cards_WebServices/src/test/java/org/robbins/flashcards/webservices/util/ResourceUrls.java b/...Cards_WebServices/src/test/java/org/robbins/flashcards/webservices/util/ResourceUrls.java
@@ -6,27 +6,29 @@ public final class ResourceUrls {
     private ResourceUrls() {
     };
 
-    public static final String tag = "tags/{id}";
+    public static final String tag = "v1/tags/{id}";
 
-    public static final String tags = "tags/";
+    public static final String tags = "v1/tags/";
 
-    public static final String tagsSearch = "tags/search/?name={name}";
+    public static final String tagsSearch = "v1/tags/search/?name={name}";
 
-    public static final String tagUpdate = "tags/{id}/update";
+    public static final String tagUpdate = "v1/tags/{id}/update";
 
-    public static final String flashCard = "flashcards/{id}";
+    public static final String flashCard = "v1/flashcards/{id}";
 
-    public static final String flashCards = "flashcards/";
+    public static final String flashCards = "v1/flashcards/";
 
-    public static final String flashCardsSearch = "flashcards/search/?question={question}&tags={tags}";
+    public static final String flashCardsSearch = "v1/flashcards/search/?question={question}&tags={tags}";
 
-    public static final String flashCardUpdate = "flashcards/{id}/update";
+    public static final String flashCardUpdate = "v1/flashcards/{id}/update";
 
-    public static final String user = "users/{id}";
+    public static final String user = "v1/users/{id}";
 
-    public static final String users = "users/";
+    public static final String users = "v1/users/";
 
-    public static final String usersSearch = "users/search/?openid={openid}";
+    public static final String usersSearch = "v1/users/search/?openid={openid}";
 
-    public static final String userUpdate = "users/{id}/update";
+    public static final String userUpdate = "v1/users/{id}/update";
+
+    public static final String status = "status/";
 }
diff --git a/FlashCards_WebServices/src/test/resources/application.properties b/FlashCards_WebServices/src/test/resources/application.properties
@@ -1,3 +1,3 @@
-server.address=http://localhost:8080/api/v1/
+server.address=http://localhost:8080/api/
 server.loginname=apiuser
 server.password=apiuserpassword