Added ModuleItem unit test according to https://github.com/instructure/CanvasAPI/tree/develop/src/test/java/ModuleItemUnitTest.java.

Author: anguslee-wse

src/main/java/edu/ksu/canvas/impl/ModuleItemImpl.java

@@ -2,7 +2,7 @@
 
 import com.google.gson.reflect.TypeToken;
 import edu.ksu.canvas.interfaces.CanvasWriter;
-import edu.ksu.canvas.interfaces.ModuleItemReader;;
+import edu.ksu.canvas.interfaces.ModuleItemReader;
 import edu.ksu.canvas.model.ModuleItem;
 import edu.ksu.canvas.net.RestClient;
 import edu.ksu.canvas.oauth.OauthToken;

src/main/java/edu/ksu/canvas/model/ModuleItem.java

@@ -16,6 +16,7 @@ public class ModuleItem extends BaseCanvasModel implements Serializable {
 	private String pageUrl; /* only for 'Page' type */
 	private String externalUrl; /* only for 'ExternalUrl' and 'ExternalTool' types */
 	private Boolean newTab; /* only for 'ExternalTool' type */
+	private CompletionRequirement completionRequirement;
 	private Boolean published;
 
 	public Long getId() {
@@ -114,11 +115,48 @@ public void setNewTab(java.lang.Boolean newTab) {
 		this.newTab = newTab;
 	}
 
+	public CompletionRequirement getCompletionRequirement() {
+		return completionRequirement;
+	}
+
+	public void setCompletionRequirement(CompletionRequirement completionRequirement) {
+		this.completionRequirement = completionRequirement;
+	}
+
 	public Boolean getPublished() {
 		return published;
 	}
 
 	public void setPublished(Boolean published) {
 		this.published = published;
 	}
+
+	public class CompletionRequirement extends BaseCanvasModel implements Serializable {
+		private String type;
+		private java.math.BigDecimal minScore;
+		private Boolean completed;
+
+		public java.math.BigDecimal getMinScore() {
+			return minScore;
+		}
+
+		public void setMinScore(java.math.BigDecimal minScore) {
+			this.minScore = minScore;
+		}
+
+		public Boolean getCompleted() {
+			return completed;
+		}
+
+		public void setCompleted(Boolean completed) {
+			this.completed = completed;
+		}
+
+		public String getType() {
+			return type;
+		}
+		public void setType(String type) {
+			this.type = type;
+		}
+	}
 }

src/test/java/edu/ksu/canvas/tests/module/ModuleItemListingTest.java

@@ -0,0 +1,49 @@
+package edu.ksu.canvas.tests.module;
+
+import edu.ksu.canvas.CanvasTestBase;
+import edu.ksu.canvas.impl.ModuleItemImpl;
+import edu.ksu.canvas.interfaces.ModuleItemReader;
+import edu.ksu.canvas.model.ModuleItem;
+import edu.ksu.canvas.net.FakeRestClient;
+import edu.ksu.canvas.requestOptions.ListModuleItemsOptions;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.IOException;
+import java.util.List;
+
+public class ModuleItemListingTest extends CanvasTestBase {
+	@Autowired
+	private FakeRestClient fakeRestClient;
+	private ModuleItemReader moduleItemReader;
+
+	@Before
+	public void setupData() {
+		moduleItemReader = new ModuleItemImpl(baseUrl, apiVersion, SOME_OAUTH_TOKEN, fakeRestClient, SOME_CONNECT_TIMEOUT, SOME_READ_TIMEOUT, DEFAULT_PAGINATION_PAGE_SIZE, false);
+	}
+
+	@Test
+	public void testListModuleItemsInModule() throws IOException {
+		Long courseId = 1092L;
+		Long moduleId = 1059720L;
+		ListModuleItemsOptions options = new ListModuleItemsOptions(courseId, moduleId);
+		String url = baseUrl + "/api/v1/courses/1092/modules/1059720/items";
+
+		fakeRestClient.addSuccessResponse(url, "SampleJson/ModuleItems.json");
+		List<ModuleItem> moduleItems = moduleItemReader.getModuleItemsInModule(options);
+		Assert.assertNotNull(moduleItems);
+		Assert.assertEquals(4, moduleItems.size());
+		for (ModuleItem moduleItem: moduleItems) { /* Copied from https://github.com/instructure/CanvasAPI/blob/develop/src/test/java/ModuleItemUnitTest.java */
+			Assert.assertTrue(moduleItem.getId() > 0);
+			Assert.assertNotNull(moduleItem.getType());
+			Assert.assertNotNull(moduleItem.getTitle());
+			Assert.assertNotNull(moduleItem.getHtmlUrl());
+			Assert.assertNotNull(moduleItem.getUrl());
+			if (moduleItem.getCompletionRequirement() != null) {
+				Assert.assertNotNull(moduleItem.getCompletionRequirement().getType());
+			}
+		}
+	}
+}

src/test/resources/SampleJson/ModuleItems.json

@@ -0,0 +1,63 @@
+[
+	{
+		"id": 9012239,
+		"indent": 0,
+		"position": 1,
+		"title": "Android 101",
+		"type": "Assignment",
+		"module_id": 1059720,
+		"html_url": "https://mobiledev.instructure.com/courses/833052/modules/items/9012239",
+		"content_id": 2241839,
+		"url": "https://mobiledev.instructure.com/api/v1/courses/833052/assignments/2241839",
+		"completion_requirement": {
+			"type": "must_submit",
+			"completed": true
+		}
+	},
+	{
+		"id": 9012244,
+		"indent": 0,
+		"position": 2,
+		"title": "Favorite App Video",
+		"type": "Assignment",
+		"module_id": 1059720,
+		"html_url": "https://mobiledev.instructure.com/courses/833052/modules/items/9012244",
+		"content_id": 2241864,
+		"url": "https://mobiledev.instructure.com/api/v1/courses/833052/assignments/2241864",
+		"completion_requirement": {
+			"type": "min_score",
+			"min_score": "5",
+			"completed": true
+		}
+	},
+	{
+		"id": 9012248,
+		"indent": 0,
+		"position": 3,
+		"title": "Android vs. iOS",
+		"type": "Discussion",
+		"module_id": 1059720,
+		"html_url": "https://mobiledev.instructure.com/courses/833052/modules/items/9012248",
+		"content_id": 1369942,
+		"url": "https://mobiledev.instructure.com/api/v1/courses/833052/discussion_topics/1369942",
+		"completion_requirement": {
+			"type": "must_contribute",
+			"completed": false
+		}
+	},
+	{
+		"id": 9012251,
+		"indent": 0,
+		"position": 4,
+		"title": "Easy Quiz",
+		"type": "Quiz",
+		"module_id": 1059720,
+		"html_url": "https://mobiledev.instructure.com/courses/833052/modules/items/9012251",
+		"content_id": 757314,
+		"url": "https://mobiledev.instructure.com/api/v1/courses/833052/quizzes/757314",
+		"completion_requirement": {
+			"type": "must_submit",
+			"completed": true
+		}
+	}
+]