Model Control Service Fixement tests

Author: tomeq

pom.xml

@@ -91,6 +91,11 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-core</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/Polodz/controller/MainController.java

@@ -99,24 +99,15 @@ public List<IMember> listAll() {
     }
 
     public void returnItemTo(Long memberIdFrom, Integer indexItemFrom) {
-    	IItem cacheMoveItem = this.findItem(memberIdFrom, indexItemFrom);
+    	IItem cacheMoveItem = this.findItemFromDao(memberIdFrom, indexItemFrom);
     	this.deleteMembersProduct(memberIdFrom, indexItemFrom);
-    	this.insertMemberProduct(cacheMoveItem,(long)this.memberById(new Long(this.getMembersDAO().getALL().length-1)).getId());
-    }
-    
-    private IItem findItem(Long memberId, Integer indexItem) {
-        IMember delatingItemsMember = this.memberById(memberId);
-  		return delatingItemsMember.getItems().get(indexItem);
-    }
-    
-    private IMember memberById(Long memberId) {
-    	return this.membersDAO.getMembersAudience().get(memberId.intValue());
+    	this.insertMemberProduct(cacheMoveItem,(long)this.memberByIdFromDao(new Long(this.getMembersDAO().getALL().length-1)).getId());
     }
 
     @Override
     public void deleteMembersProduct(Long memberId, Integer indexItem) {
-    	IMember delatingItemsMember = this.memberById(memberId);
-        this.getServerResponse("delete"+findItem(memberId,indexItem));
+    	IMember delatingItemsMember = this.memberByIdFromDao(memberId);
+        this.getServerResponse("delete"+findItemFromDao(memberId,indexItem));
         delatingItemsMember.getItems().remove((int) indexItem);
         if (this.membersDAO.getMembersAudience().size()-1==memberId) 
         	this.refreshWeb();
@@ -170,5 +161,14 @@ private void refreshWeb() {
     	this.setRentWebItems(this.membersDAO.getALL()[membersDAO.getMembersAudience().size()-1]
         		.getItems().stream().map (i -> i.getName()).collect (Collectors.joining ("\n")));
     }
+    
+    public IItem findItemFromDao(Long memberId, Integer indexItem) {
+        IMember foundItemsMember = this.memberByIdFromDao(memberId);
+  		return foundItemsMember.getItems().get(indexItem);
+    }
+    
+    public IMember memberByIdFromDao(Long memberId) {
+    	return this.membersDAO.getMembersAudience().get(memberId.intValue());
+    }
 
 }

src/test/java/com/Polodz/GrownApplicationTests.java

@@ -18,6 +18,7 @@
 import com.Polodz.service.ITelnet;
 import com.Polodz.service.TelnetConnector;
 
+import org.apache.hadoop.mapred.gethistory_jsp;
 import org.junit.Assert;
 import static org.mockito.Mockito.*;
 
@@ -50,18 +51,33 @@ public void setup(){
 	public void membersLoad() {
 		this.serverResponse();
 		Assert.assertNotNull(mainControler.getMembersDAO().getMembersAudience());
+		this.listAll();
+	}
+	
+	
+	public void serverResponse() {
+		Assert.assertEquals(mainControler.getServerResponse("list"), "test\ntest1\ntest2\ntest3\ntest4\ntest5");
+	}
+	
+	public void listAll() {
 		Assert.assertEquals(mainControler.listAll().size(), 6);
 		Assert.assertEquals(mainControler.listAll().get(1).getName(), "test1");
 		Assert.assertEquals(mainControler.listAll().get(1).getItems().get(1).getName(),"mtest1");
 	}
 
+	@Test
+	public void returnItemTo() {
+		mainControler.returnItemTo(new Long(0), 2);
+		this.findItem();
+	}
 
-	public void serverResponse() {
-		Assert.assertEquals(mainControler.getServerResponse("list"), "test\ntest1\ntest2\ntest3\ntest4\ntest5");
+	public void findItem() {
+		Integer mainStorId = mainControler.getMembersDAO().getMembersAudience().size() - 1;
+		Assert.assertEquals(mainControler.findItemFromDao(new Long(mainStorId), 6).getId(), new Long(3));
 	}
 
 	@Test
-	public void deleteMemberProduct() {
+	public void MemberDeleteProduct() {
 		Integer idOfFiredMember= mainControler.listAll().size()-1;
 		List<? extends IItem> basket = mainControler.getMembersDAO().getMembersAudience().get(idOfFiredMember).getItems();
 		Integer lastBasketSize = basket.size() - 2;
@@ -70,6 +86,7 @@ public void deleteMemberProduct() {
 		Assert.assertEquals(lastBasketSize,new Integer(basket.size()));
 	}
 
+	
 	@Bean
 	@Primary
     public ITelnet TelnetConnector() {