IntegrationTest.java

EclipseProject/src/test/java/integrationTest/AuctionManagerIntegrationTest.java

+package integrationTest;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.function.Executable;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import exceptions.BidBelowZeroException;
+import project.Auction;
+import project.AuctionManager;
+import project.User;
+
+public class AuctionManagerIntegrationTest {
+
+	@TestFactory
+	public Collection<DynamicTest> externalAddBidTestFalse() {
+
+		Auction auction = Auction.getInstance();
+		User user = User.getInstance();
+		AuctionManager manager = AuctionManager.getInstance();
+		ArrayList<Integer> values = new ArrayList<Integer>();
+
+		manager.setAuction(auction);
+
+		for (int i = 1; i < 6; i++) {
+			values.add(i);
+		}
+
+		Collection<DynamicTest> dynamicTests = new ArrayList<DynamicTest>();
+
+		for (int e = 0; e < 5; e++) {
+
+			DynamicTest dTest;
+			auction.setPrice(10);
+			int toCheck = values.get(e);
+
+			Executable exec = () -> assertFalse(manager.placeBid(user, toCheck));
+			dTest = DynamicTest.dynamicTest("Lower bid than current auction price", exec);
+
+			dynamicTests.add(dTest);
+		}
+
+		return dynamicTests;
+
+	}
+
+	@ParameterizedTest
+	@ValueSource(ints = { 2, 3, 4, 5, 6 })
+	public void externalAddBidTrue(int toCheck) throws BidBelowZeroException, ParseException {
+
+		Auction auction = Auction.getInstance();
+		User user = User.getInstance();
+		AuctionManager manager = AuctionManager.getInstance();
+
+		auction.setPrice(1);
+		manager.setAuction(auction);
+
+		assertTrue(manager.placeBid(user, toCheck));
+
+	}
+}

EclipseProject/src/test/java/unitTest/AuctionManagerIntegrationTest.java → EclipseProject/src/test/java/unitTest/AuctionManagerUnitTest.java

@@ -8,31 +8,24 @@ import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
-import java.util.Random;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.function.Executable;
-import org.junit.jupiter.api.function.ThrowingConsumer;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import exceptions.BidBelowZeroException;
-import exceptions.ImageInvalidException;
 import project.Auction;
 import project.AuctionManager;
 import project.Bid;
 import project.Category;
 import project.Item;
-import project.ItemPicture;
 import project.User;
 
-public class AuctionManagerIntegrationTest {
+public class AuctionManagerUnitTest {
 
 	@BeforeEach
 	public void reset() {
@@ -198,53 +191,5 @@ public class AuctionManagerIntegrationTest {
 
 		return dynamicTests;
 	}
-	
-	@TestFactory
-	public Collection<DynamicTest> externalAddBidTestFalse() {
-		
-		Auction auction = Auction.getInstance();
-		User user = User.getInstance();
-		AuctionManager manager = AuctionManager.getInstance();
-		ArrayList<Integer> values = new ArrayList<Integer>();
-		
-		manager.setAuction(auction);
-		
-		for(int i = 1; i < 6; i++) {
-			values.add(i);	
-		}
-		
-		Collection<DynamicTest> dynamicTests = new ArrayList<DynamicTest>();
-
-		for (int e = 0; e < 5; e++) {
-
-			DynamicTest dTest;
-			auction.setPrice(10);
-			int toCheck = values.get(e);
-
-			Executable exec = () -> assertFalse(manager.placeBid(user, toCheck));
-			dTest = DynamicTest.dynamicTest("Lower bid than current auction price", exec);
-
-			dynamicTests.add(dTest);
-		}
-
-		return dynamicTests;
-		
-	}
-	
-
-	@ParameterizedTest
-	@ValueSource(ints = { 2, 3, 4, 5, 6 })
-	public void externalAddBidTrue(int toCheck) throws BidBelowZeroException, ParseException {
-
-		Auction auction = Auction.getInstance();
-		User user = User.getInstance();
-		AuctionManager manager = AuctionManager.getInstance();
-		
-		auction.setPrice(1);
-		manager.setAuction(auction);
-
-		assertTrue(manager.placeBid(user, toCheck));
-
-	}
 
 }