Merge pull request #17 from aphextinez/software-testing

Fix delete() in Entity.java with tx.success(), add portfolio functions

src/app/Cli.java

@@ -198,15 +198,17 @@ public Result addToPorfolio( String session_id, String description, String resou
 
 	@Command
 	public Result removeFromPorfolio( String session_id, String cit ) {
-
+		try(Transaction tx = GraphDatabase.get().beginTx()) {
 			Result res = validateSession( session_id );
 			if( !res.success ){
 
 				return res;
 			}
 			Citation c = new Citation(new Token(cit));
-
+			c.delete();
+			tx.success();
 			return null;
+		}
 	}
 
 	@Command

src/app/Entity.java

@@ -52,6 +52,7 @@ public void delete() {
 				r.delete();
 			}
 			internalNode.delete();
+			tx.success();
 		}
 	}
 

src/test/integrate/Portfolio.java

@@ -46,4 +46,30 @@ public void check_addToPortfolio() {
 		}
 	}
 
+	@Test
+	public void check_addAndDeletePortfolio() {
+		try(Transaction tx = app.GraphDatabase.get().beginTx()) {
+			String uemail = "[email protected]";
+			String upass = "password";
+			app.Email email = new app.Email(uemail);
+			app.User user = new app.User();
+			user.setPassword(upass);
+			user.addEmail(email);
+			app.Citation[] array = new app.Citation[] { new app.Citation("blah", "bloo"), new app.Citation("boppidee", "bbbb"),
+				new app.Citation("hehe", "haha"), new app.Citation("heehaw", "meemaw")};
+			for (app.Citation c : array) {
+				user.addToPortfolio(c);
+			}
+			Iterator<app.Citation> iterator = user.viewPortfolio().iterator();
+			assertTrue(iterator.hasNext());
+			while (iterator.hasNext() ) {
+				app.Citation cGet = iterator.next();
+				user.removeFromPortfolio(cGet);
+			}
+			Iterator<app.Citation> iteratorCheck = user.viewPortfolio().iterator();
+			assertFalse(iteratorCheck.hasNext());
+			tx.success();
+		}
+	}
+
 }