diff --git a/EclipseProject/src/main/java/Main.java b/EclipseProject/src/main/java/Main.java
deleted file mode 100644
index 2b03ada494a229e617f7161f2c6d4d480b4225a5..0000000000000000000000000000000000000000
--- a/EclipseProject/src/main/java/Main.java
+++ /dev/null
@@ -1,16 +0,0 @@
-
-import java.util.ArrayList;
-
-import exceptions.CategoryInvalidException;
-import exceptions.TitleInvalidException;
-import project.Category;
-import project.Item;
-import project.User;
-
-public class Main {
-
- public static void main(String[] args) throws CategoryInvalidException, TitleInvalidException {
-
- }
-
-}
diff --git a/EclipseProject/src/main/java/exceptions/EmailInvalidException.java b/EclipseProject/src/main/java/exceptions/EmailInvalidException.java
index 5b3629c7dee0c4c28325725c807a897dd68b550a..7d040cb72f80c88e4120c8489cd104fc6256a1e9 100644
--- a/EclipseProject/src/main/java/exceptions/EmailInvalidException.java
+++ b/EclipseProject/src/main/java/exceptions/EmailInvalidException.java
@@ -1,8 +1,8 @@
package exceptions;
-public class MailInvalidException extends Exception {
+public class EmailInvalidException extends Exception {
- public MailInvalidException() {
+ public EmailInvalidException() {
super("Error: email not in the right format");
}
diff --git a/EclipseProject/src/main/java/project/Auction.java b/EclipseProject/src/main/java/project/Auction.java
index e74d4dfbdd1825e1469363b4df277056e8f879aa..4872ad9382272904cb40bf286f416d9da8730208 100644
--- a/EclipseProject/src/main/java/project/Auction.java
+++ b/EclipseProject/src/main/java/project/Auction.java
@@ -120,16 +120,21 @@ public class Auction {
}
public void setEnd(Date endDate) {
+
this.end = endDate;
}
public ArrayList<Bid> getBids() {
+
return bids;
+
}
public void setBids(ArrayList<Bid> bids) {
+
this.bids = bids;
+
}
}
diff --git a/EclipseProject/src/main/java/project/Bid.java b/EclipseProject/src/main/java/project/Bid.java
index 2ab5bc6542a0f438580c106ad160913105598a52..202e35a34173dcf491a6c1bf1ae4be8a1dcea8e2 100644
--- a/EclipseProject/src/main/java/project/Bid.java
+++ b/EclipseProject/src/main/java/project/Bid.java
@@ -21,15 +21,21 @@ public class Bid {
}
public Bid getInstance() {
+
return new Bid();
+
}
public int getValue() {
+
return value;
+
}
public Date getDate() {
+
return date;
+
}
-
+
}
diff --git a/EclipseProject/src/main/java/project/Item.java b/EclipseProject/src/main/java/project/Item.java
index 86cc467f1b3daa8da664a5a5b0fe7bf04362c4a1..977b9668937ba39fe74f1eb88f9bd0c3490310c3 100644
--- a/EclipseProject/src/main/java/project/Item.java
+++ b/EclipseProject/src/main/java/project/Item.java
@@ -63,10 +63,14 @@ public class Item {
public boolean addPicture(ArrayList<ItemPicture> picList) throws ImageInvalidException {
if (picList.size() < 1 || picList.size() > 10) {
+
throw new ImageInvalidException();
+
} else {
+
this.setImages(picList);
return true;
+
}
}
@@ -131,11 +135,15 @@ public class Item {
this.setCategory(Category.getCategory(category));
this.setTitle(title);
return true;
+
}
+
}
+
}
public void setDescription(String d) {
+
this.description = d;
}
@@ -143,10 +151,13 @@ public class Item {
public void setId(int i) {
this.id = i;
+
}
public int getId() {
+
return id;
+
}
public void setOwner(int newOwner) {
@@ -185,7 +196,9 @@ public class Item {
}
public ArrayList<ItemPicture> getImages() {
+
return images;
+
}
}
diff --git a/EclipseProject/src/main/java/project/ItemPicture.java b/EclipseProject/src/main/java/project/ItemPicture.java
index a269025c770be10f9bbbc3bffe9fab527134dce3..d434e665f6a6bfabc8165927a4e990e85284ba52 100644
--- a/EclipseProject/src/main/java/project/ItemPicture.java
+++ b/EclipseProject/src/main/java/project/ItemPicture.java
@@ -16,7 +16,7 @@ public class ItemPicture {
this.id = idCounter++;
}
-
+
public ItemPicture(int id) {
pictures.add(this);
this.id = id;
@@ -33,11 +33,16 @@ public class ItemPicture {
public static boolean remove(int i, Item item) {
if (item.getImage(i) != null) {
+
int index = item.getImages().indexOf(item.getImage(i));
item.getImages().remove(index);
+
return true;
+
} else
+
return false;
+
}
public static ItemPicture getItemPicture(int itemPicture) {
@@ -51,13 +56,13 @@ public class ItemPicture {
}
}
-
+
return null;
}
public static ItemPicture getInstance() {
-
+
return new ItemPicture();
}
diff --git a/EclipseProject/src/main/java/project/User.java b/EclipseProject/src/main/java/project/User.java
index b54aaf09759fd7cbd35585d905a6807990bafb6d..72a7c5072ead832a72e6e657baa6fbe4a0a23eb0 100644
--- a/EclipseProject/src/main/java/project/User.java
+++ b/EclipseProject/src/main/java/project/User.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import exceptions.CategoryInvalidException;
import exceptions.LoginInvalidException;
-import exceptions.MailInvalidException;
+import exceptions.EmailInvalidException;
import exceptions.PasswordInvalidException;
import exceptions.PriceInvalidException;
import exceptions.TitleInvalidException;
@@ -63,7 +63,7 @@ public class User {
}
public static boolean login(String username, String email, String password)
- throws UsernameEmailEmptyException, PasswordInvalidException, MailInvalidException, LoginInvalidException {
+ throws UsernameEmailEmptyException, PasswordInvalidException, EmailInvalidException, LoginInvalidException {
if (username.equals("") && email.equals("")) {
@@ -109,7 +109,7 @@ public class User {
} else if (!email.matches("\\S+@\\S+\\.\\S+")) {
- throw new MailInvalidException();
+ throw new EmailInvalidException();
} else {
diff --git a/EclipseProject/src/test/java/fitNesseFixture/UserFixture.java b/EclipseProject/src/test/java/fitNesseFixture/UserFixture.java
index 4bccea32c921642df5a5f33a1e5bb5ec955cb00a..1d2ddc9d365007975638907a5331ed5fdacf3469 100644
--- a/EclipseProject/src/test/java/fitNesseFixture/UserFixture.java
+++ b/EclipseProject/src/test/java/fitNesseFixture/UserFixture.java
@@ -5,9 +5,8 @@ import project.User;
import java.util.ArrayList;
import exceptions.CategoryInvalidException;
-import exceptions.DateInvalidException;
import exceptions.LoginInvalidException;
-import exceptions.MailInvalidException;
+import exceptions.EmailInvalidException;
import exceptions.PasswordInvalidException;
import exceptions.PriceInvalidException;
import exceptions.TitleInvalidException;
@@ -67,7 +66,7 @@ public class UserFixture {
return e.getMessage();
- } catch (MailInvalidException e) {
+ } catch (EmailInvalidException e) {
return e.getMessage();
diff --git a/EclipseProject/src/test/java/unitTest/AuctionManagerUnitTest.java b/EclipseProject/src/test/java/unitTest/AuctionManagerUnitTest.java
index 3596f97d94174ce1bdb76da22f545b805f065c8f..41e1697c1742ff2132227a4053ad3d7fb5ab3f15 100644
--- a/EclipseProject/src/test/java/unitTest/AuctionManagerUnitTest.java
+++ b/EclipseProject/src/test/java/unitTest/AuctionManagerUnitTest.java
@@ -8,28 +8,21 @@ 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 AuctionManagerUnitTest {
diff --git a/EclipseProject/src/test/java/unitTest/UserUnitTest.java b/EclipseProject/src/test/java/unitTest/UserUnitTest.java
index a7de01989d778fd494b226e6ca7410c3d28dc96a..24825d7a5ee6a6ce64b220de3178df90fcc8eab2 100644
--- a/EclipseProject/src/test/java/unitTest/UserUnitTest.java
+++ b/EclipseProject/src/test/java/unitTest/UserUnitTest.java
@@ -41,7 +41,7 @@ public class UserUnitTest {
@Test
public void loginTest()
- throws UsernameEmailEmptyException, PasswordInvalidException, MailInvalidException, LoginInvalidException {
+ throws UsernameEmailEmptyException, PasswordInvalidException, EmailInvalidException, LoginInvalidException {
String username = "mario", password = "password", email = "test@gmail.com";
User u = new User();
@@ -62,7 +62,7 @@ public class UserUnitTest {
public void loginAcceptanceTest() {
assertThrows(UsernameEmailEmptyException.class, () -> User.login("", "", "test"));
- assertThrows(MailInvalidException.class, () -> User.login("", "an.gmail.it", "test"));
+ assertThrows(EmailInvalidException.class, () -> User.login("", "an.gmail.it", "test"));
assertThrows(PasswordInvalidException.class, () -> User.login("", "an.gmail.it", ""));
}