updated Fitnesse and Eclipse Project

EclipseProject/src/main/java/clar/SellerFixture.java → EclipseProject/src/main/java/fixture/SellerFixture.java

-package clar;
+package fixture;
 
 import java.util.ArrayList;
 
+import project.Auction;
+import project.Category;
+import project.Image;
+import project.Item;
+import project.Seller;
+
 public class SellerFixture {
 
 	private Seller s;
-	private String title, description;
+	private String title, description, startTime, endTime;
 	private Category category;
 	private ArrayList<Image> images;
-	
+	private ArrayList<Item> sellerItems;
+	private ArrayList<Auction> sellerAuctions;
+	private Item item;
+	private double price, bidIncrement;
+
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+
+	public void setItem(Item item) {
+		this.item = item;
+	}
+
+	public void setPrice(double price) {
+		this.price = price;
+	}
+
+	public void setBidIncrement(double bidIncrement) {
+		this.bidIncrement = bidIncrement;
+	}
+
 	public void setS(Seller s) {
 		this.s = s;
 	}
@@ -29,11 +59,31 @@ public class SellerFixture {
 		this.images = images;
 	}
 
-	public Item addItemFixture() {
+	public Item addItem() {
 
 		s = Seller.getInstance();
 		return s.addItem(title, description, images, category);
 
 	}
 
+	public boolean createAuction() {
+
+		s = Seller.getInstance();
+		s.setMyAuctions(sellerAuctions);
+		return s.createAuction(item, startTime, endTime, price, bidIncrement);
+
+	}
+
+	public ArrayList<Auction> displayMyAuctions() {
+
+		s = Seller.getInstance();
+		return s.getMyAuctions();
+	}
+
+	public ArrayList<Item> displayMyItems() {
+
+		s = Seller.getInstance();
+		s.setMyItems(sellerItems);
+		return s.getMyItems();
+	}
 }

EclipseProject/src/main/java/clar/Category.java → EclipseProject/src/main/java/project/Category.java

-package clar;
+package project;
 
 public class Category {
 

EclipseProject/src/main/java/clar/Image.java → EclipseProject/src/main/java/project/Image.java

-package clar;
+package project;
 
 public class Image {
 

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

-package clar;
+package project;
 
 public class Item {
 

EclipseProject/src/main/java/clar/Seller.java → EclipseProject/src/main/java/project/Seller.java

-package clar;
+package project;
 
 import java.util.ArrayList;
 
 public class Seller {
 
+	private ArrayList<Auction> myAuctions;
+	private ArrayList<Item> myItems;
+
+	public ArrayList<Auction> getMyAuctions() {
+		return myAuctions;
+	}
+
+	public ArrayList<Item> getMyItems() {
+		return myItems;
+	}
+
 	public Item addItem(String title, String description, ArrayList<Image> images, Category category) {
 		// TODO Auto-generated method stub
 		return null;
@@ -14,4 +25,19 @@ public class Seller {
 		return null;
 	}
 
+	public boolean createAuction(Item item, String startTime, String endTime, double price, double bidIncrement) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void setMyItems(ArrayList<Item> sellerItems) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void setMyAuctions(ArrayList<Auction> sellerAuctions) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

FitNesse/FitNesseRoot/RecentChanges.wiki

-|clar||10:11:29 sab, ott 26, 2019|
+|clar||17:02:28 lun, ott 28, 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-26T10:11:31.613):
+Tests failed (first failure was at 2019-10-28T17:02:30.831947):
 
 !see [[clar][.clar]]

FitNesse/FitNesseRoot/clar.wiki

 ---
 Test
 ---
-!contents -R2 -g -p -f -h
-
 !define TEST_SYSTEM {slim}
 !path ..\EclipseProject\target\classes
+#!path ..\EclipseProject\target\classes\fixture
 
-|clar.SellerFixture|
-|title	|description|images	|category	|addItem?				|
-|		|	ehi		|ehi	|ehi		|TitleInvalidException 	|
+|fixture.SellerFixture|
+|item	|startTime	|endTime|price	|bidIncrement	|createAuction?				|
+|		|			|		|		|				|ItemNonExistentException  	|
+|		|			|		|		|				|DateInvalidException   	|
+|		|			|		|		|				|DateInvalidException   	|
+|		|			|		|		|				|DateInvalidException   	|
+|		|			|		|		|				|PriceInvalidException    	|
+|		|			|		|		|				|true					   	|
 
-|clar.UesrFixture|
+|fixture.SellerFixture|
 |title	|description|images	|category	|addItem?				|
-|		|	ehi		|ehi	|ehi		|TitleInvalidException 	|
+|		|			| 		|			|TitleInvalidException 	|
+|		|			| 		|			|TitleInvalidException 	|
+|		|			| 		|			|TitleInvalidException 	|
+|		|			| 		|			|TitleInvalidException 	|
+|		|			| 		|			|DescriptionInvalidException 	|
+|		|			| 		|			|DescriptionInvalidException 	|
+|		|			| 		|			|DescriptionInvalidException 	|
+|		|			| 		|			|ImageInvalidException 	|
+|		|			| 		|			|ImageInvalidException 	|
+|		|			| 		|			|CategoryInvalidException 	|
+|		|			| 		|			|true|
+
+|fixture.SellerFixture							|
+|sellerAuctions	|displayMyAuctions?				|
+|				|"no Auctions already created" 	|
+|				|ArrayList<Auction> 			|
+
+|fixture.SellerFixture						|
+|sellerItems|displayMyItems?				|		
+|			|"no Auctions already created"	|
+|			|ArrayList<Auction> 			|
+
+
+|fixture.UserFixture|
+|username	|email		|password	|login?		|
+|			|			|			|		 	|