modified methods

EclipseProject/src/main/java/project/Item.java

@@ -13,19 +13,19 @@ public class Item {
 		return null;
 	}
 
-	public boolean delete(int id) {
+	public boolean delete(Item item) {
 		return false;
 		// TODO Auto-generated method stub
 		
 	}
 
-	public boolean addPicture(int itemId, int picId) {
+	public boolean addPicture(Item item, ItemPicture itemPic) {
 		return false;
 		// TODO Auto-generated method stub
 		
 	}
 
-	public ArrayList<Auction> getAuctionHistory(int id) { 
+	public ArrayList<Auction> getAuctionHistory() { 
 		// TODO Auto-generated method stub
 		return null;
 	}

EclipseProject/src/main/java/project/ItemPicture.java

@@ -12,9 +12,9 @@ public class ItemPicture {
 		return false;
 	}
 
-	public static int getItemPicture(ItemPicture picture) {
+	public static ItemPicture getItemPicture(int itemPicture) {
 		// TODO Auto-generated method stub
-		return 0;
+		return null;
 	}
 
 }

EclipseProject/src/test/java/fixture/AuctionBeaterFixture.java

@@ -24,6 +24,10 @@ public class AuctionBeaterFixture {
 		return ab;
 	}
 
+	public void setValue(int value) {
+		this.value = value;
+	}
+
 	public ArrayList<Bid> getBids() {
 		return bids;
 	}

EclipseProject/src/test/java/fixture/AuctionFixture.java

@@ -13,14 +13,12 @@ public class AuctionFixture {
 
 	private Auction a;
 	private Item item;
-	private Timestamp startTime;
-	private Timestamp endTime;
+	private Timestamp startTime, endTime;
 	private ArrayList<User> subscribedUsers;
 	public static ArrayList<Auction> auctions;
 	private Seller Seller;
 	private AuctionBeater auctionbeater;
-	private int currentValue;
-	private int offerValue;
+	private int currentValue, offerValue;
 
 	public boolean subscribe() {
 		a = Auction.getInstance();

EclipseProject/src/test/java/fixture/ItemFixture.java

@@ -10,16 +10,13 @@ import project.ItemPicture;
 public class ItemFixture {
 
 	private Item i;
-	private ArrayList<ItemPicture> image;
-	private ItemPicture picture;
-	private String ID;
+	private int item, picture, category;
 	public static ArrayList<Item> items;
 	private String title, description;
-	private int category;
 	
 	public boolean delete() {
 		i = Item.getInstance();
-		return i.delete(Item.getItem(i));
+		return i.delete(Item.getItem(item));
 		
 	}	
 	
@@ -30,36 +27,12 @@ public class ItemFixture {
 	
 	public boolean addPicture() {
 		i = Item.getInstance();
-		return i.addPicture(Item.getItem(i), ItemPicture.getItemPicture(picture));
+		return i.addPicture(Item.getItem(item), ItemPicture.getItemPicture(picture));
 	}
 	
 	public ArrayList<Auction> getAuctionHistory() {
-		i = Item.getInstance();
-		return i.getAuctionHistory(Item.getItem(i));
-	}
-
-	public Item getI() {
-		return i;
-	}
-
-	public ArrayList<ItemPicture> getImage() {
-		return image;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public String getID() {
-		return ID;
-	}
-
-	public Category getCategory() {
-		return category;
+		i = Item.getItem(item);
+		return i.getAuctionHistory();
 	}
 
 	public static ArrayList<Item> getItems() {
@@ -70,26 +43,26 @@ public class ItemFixture {
 		this.i = i;
 	}
 
-	public void setImage(ArrayList<ItemPicture> image) {
-		this.image = image;
-	}
-
 	public void setDescription(String description) {
 		this.description = description;
 	}
 
-	public void setTitle(String title) {
-		this.title = title;
+	public void setItem(int item) {
+		this.item = item;
 	}
 
-	public void setID(String iD) {
-		ID = iD;
+	public void setPicture(int picture) {
+		this.picture = picture;
 	}
 
-	public void setCategory(Category category) {
+	public void setCategory(int category) {
 		this.category = category;
 	}
 
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
 	public static void setItems(ArrayList<Item> items) {
 		ItemFixture.items = items;
 	}

EclipseProject/src/test/java/fixture/ItemPictureFixture.java

-package fixture;
-
-import project.Item;
-import project.ItemPicture;
-
-public class ItemPictureFixture {
-
-	private ItemPicture i;
-	private int item;
-	
-	public boolean remove() {
-		
-		i = ItemPicture.getInstance();
-		
-		return i.remove(Item.getItem(item));
-		
-		
-	}
-
-	public void setItem(int item) {
-		this.item = item;
-	}
-	
-}

EclipseProject/src/test/java/fixture/SellerFixture.java

@@ -2,10 +2,7 @@ package fixture;
 
 import java.util.ArrayList;
 
-import exceptions.ItemNonExistentException;
-import project.Auction;
 import project.Category;
-import project.Image;
 import project.Item;
 import project.ItemPicture;
 import project.Seller;
@@ -15,8 +12,7 @@ public class SellerFixture {
 	private Seller s;
 	private String title, description, startTime, endTime;
 	private ArrayList<ItemPicture> images;
-	private ArrayList<Item> sellerItems;
-	private ArrayList<Auction> sellerAuctions;
+
 	private int item, category;
 	private double price, bidIncrement;
 
@@ -56,14 +52,6 @@ public class SellerFixture {
 		this.category = category;
 	}
 
-	public void setSellerItems(ArrayList<Item> sellerItems) {
-		this.sellerItems = sellerItems;
-	}
-
-	public void setSellerAuctions(ArrayList<Auction> sellerAuctions) {
-		this.sellerAuctions = sellerAuctions;
-	}
-
 	public void setImages(ArrayList<ItemPicture> images) {
 		this.images = images;
 	}
@@ -82,19 +70,4 @@ public class SellerFixture {
 
 	}
 
-	public ArrayList<Auction> displayMyAuctions() {
-
-		s = Seller.getInstance();
-		s.setMyAuctions(sellerAuctions);
-		return s.displayMyAuctions();
-
-	}
-
-	public ArrayList<Item> displayMyItems() {
-
-		s = Seller.getInstance();
-		s.setMyItems(sellerItems);
-		return s.getMyItems();
-
-	}
 }

EclipseProject/src/test/java/fixture/UserFixture.java

 package fixture;
 
-import java.util.ArrayList;
-
-import project.Auction;
 import project.User;
 import project.Category;
 
@@ -11,33 +8,8 @@ public class UserFixture {
 	private String username, password, email, ssn, title, startTime, endTime;
 	private int category;
 	private User u;
-	private ArrayList<Auction> userAuction;
 	private double price, bidIncrement;
 
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public void setStartTime(String startTime) {
-		this.startTime = startTime;
-	}
-
-	public void setEndTime(String endTime) {
-		this.endTime = endTime;
-	}
-
-	public void setCategory(int category) {
-		this.category = category;
-	}
-
-	public void setPrice(double price) {
-		this.price = price;
-	}
-
-	public void setBidIncrement(double bidIncrement) {
-		this.bidIncrement = bidIncrement;
-	}
-
 	public boolean userLogin() {
 
 		u = User.getInstance();
@@ -45,14 +17,6 @@ public class UserFixture {
 
 	}
 
-	public ArrayList<Auction> retrieveSubscribedAuction() {
-
-		u = User.getInstance();
-		u.setSubscribedAuction(userAuction);
-		return u.retrieveSubscribedAuction();
-
-	}
-
 	public boolean becomeSeller() {
 		
 		u = User.getInstance();
@@ -93,9 +57,28 @@ public class UserFixture {
 	public void setU(User u) {
 		this.u = u;
 	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
 
-	public void setUserAuction(ArrayList<Auction> userAuction) {
-		this.userAuction = userAuction;
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
 	}
-	
+
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+
+	public void setCategory(int category) {
+		this.category = category;
+	}
+
+	public void setPrice(double price) {
+		this.price = price;
+	}
+
+	public void setBidIncrement(double bidIncrement) {
+		this.bidIncrement = bidIncrement;
+	}
+
 }

FitNesse/FitNesseRoot/RecentChanges.wiki

-|clar||19:32:20 mar, ott 29, 2019|
+|clar||10:06:32 mer, ott 30, 2019|
 |FitNesse.UserGuide.WritingAcceptanceTests.SliM.ExceptionHandling||11:49:07 mar, ott 29, 2019|
 |FitNesse.SuiteAcceptanceTests.SuiteSlimTests.TestExceptionIsDisplayed||11:24:26 mar, ott 29, 2019|

FitNesse/FitNesseRoot/RerunLastFailures.wiki

@@ -5,6 +5,6 @@ Suite
 
 !note This page is automatically generated when running tests. It will be overwritten by the next Suite or Test execution.
 
-Tests failed (first failure was at 2019-10-29T19:32:31.925):
+Tests failed (first failure was at 2019-10-30T10:07:23.787717500):
 
 !see [[clar][.clar]]

FitNesse/FitNesseRoot/clar.wiki

@@ -28,17 +28,6 @@ Test
 |		|			| 		|			|EXCEPTION:=~/CategoryInvalidException/ 	|
 |		|			| 		|			|true|
 
-|fixture.SellerFixture							|
-|sellerAuctions	|displayMyAuctions?				|
-|				|EXCEPTION:=~/NoAuctionsAvailableException/  	|
-|ArrayList<Auction>				|ArrayList<Auction> 			|
-
-|fixture.SellerFixture					|
-|sellerItems|displayMyItems?			|		
-|			|EXCEPTION:=~/NoItemsAvailableException/ 	|
-|ArrayList<Item>			|ArrayList<Item> 			|
-
-
 
 |fixture.UserFixture|
 |username	|email		|password	|userLogin?						|
@@ -49,11 +38,6 @@ Test
 |			|			|			|EXCEPTION:=~/LoginInvalidException/	|
 |			|			|			|true	|
 
-|fixture.UserFixture|
-|userAuction	|retrieveSubscribedAuction?			|
-|				|EXCEPTION:=~/NoAuctionsAvailableException/ 		|
-|ArrayList<Auction>		|ArrayList<Auction>					|
-
 |fixture.UserFixture|
 |ssn	|becomeSeller?	|
 |		|EXCEPTION:=~/SSSInvalidException/	|
@@ -84,39 +68,36 @@ Test
 |			|		|		|				|		|			|true| 	
 
 
-|fixture.ItemPictureFixture|
-|item	|remove?	|
-|		|EXCEPTION:=~/ItemNonExistentException/	|
-|		|true	|
-
 |fixture.AuctionFixture|
 |id |subscribe?|
 |	|EXCEPTION:=~/NotAllowedException/|
 |   |true|
 
+
 |fixture.AuctionBeaterFixture|
 |value |placeBid?|
 |	|EXCEPTION:=~/BidNotValidException/|
 |	|EXCEPTION:=~/EndedAuctionException/|
 |   |true|
 
+
 |fixture.ItemFixture|
-|id |delete?|
-|	|EXCEPTION:=~/ItemNotFoundException/|
-|   |true|
+|item 	|delete?|
+|		|EXCEPTION:=~/ItemNotFoundException/|
+|   	|true|
 
 |fixture.ItemFixture|
-|title	|description|images	|category	|modify?|
-|		|			|		|			|EXCEPTION:=~/ItemNotFoundException/	|
-|		|			| 		|			|EXCEPTION:=~/TitleInvalidException/ 	|
-|		|			| 		|			|EXCEPTION:=~/TitleInvalidException/	|
-|		|			| 		|			|EXCEPTION:=~/TitleInvalidException/ 	|
-|		|			| 		|			|EXCEPTION:=~/TitleInvalidException/ 	|
-|		|			| 		|			|EXCEPTION:=~/DescriptionInvalidException/	|
-|		|			| 		|			|EXCEPTION:=~/DescriptionInvalidException/ 	|
-|		|			| 		|			|EXCEPTION:=~/DescriptionInvalidException/ 	|
-|		|			| 		|			|EXCEPTION:=~/CategoryInvalidException/ 	|
-|   	|			|		|			|true|
+|title	|description|category	|modify?|
+|		|			|			|EXCEPTION:=~/ItemNotFoundException/	|
+|		|			|			|EXCEPTION:=~/TitleInvalidException/ 	|
+|		|			|			|EXCEPTION:=~/TitleInvalidException/	|
+|		|			|			|EXCEPTION:=~/TitleInvalidException/ 	|
+|		|			|			|EXCEPTION:=~/TitleInvalidException/ 	|
+|		|			|			|EXCEPTION:=~/DescriptionInvalidException/	|
+|		|			|			|EXCEPTION:=~/DescriptionInvalidException/ 	|
+|		|			|			|EXCEPTION:=~/DescriptionInvalidException/ 	|
+|		|			|			|EXCEPTION:=~/CategoryInvalidException/ 	|
+|   	|			|			|true|
 
 |fixture.ItemFixture|
 |item	|picture	|addPicture?|
@@ -124,9 +105,8 @@ Test
 |		|			|EXCEPTION:=~/ImageInvalidException/ 	|
 |		|			|true|
 
-
 |fixture.ItemFixture|
-|id |getAuctionHistory?|
-|	|EXCEPTION:=~/NotHistoryException/|
-|   |ArrayList<Auction> |
+|item 	|getAuctionHistory?|
+|		|EXCEPTION:=~/NotHistoryException/|
+|   	|ArrayList<Auction> |