Repaired the movement of Test files to their corresponding package.

Author: ProgrammingKiddo

.classpath

@@ -13,27 +13,28 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

pom.xml

@@ -3,6 +3,7 @@
   <groupId>es.uca.dss.cruca</groupId>
   <artifactId>projectcruca</artifactId>
   <version>0.0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
   <name>CRUCA</name>
   <description>Management software for the restaurants and cafes at UCA.</description>
 

src/main/java/coreapi/Cafeteria.java

@@ -11,7 +11,7 @@ public class Cafeteria
 	public ArrayList<Order> dailyOrders;
 	public OrderFactory ordFact;
 
-	Cafeteria()
+	public Cafeteria()
 	{
 		productStock = new LinkedHashMap<Product, Integer>();
 		ordFact = new OrderFactory();

src/main/java/coreapi/OrderFactory.java

@@ -22,10 +22,11 @@ public static int getOrderCount()
 	 */
 	public static Order createOrder()
 	{
-		// We are increasing the number so that they are correlative
-		return new OrderImpl(orderCount++, new Date(System.currentTimeMillis()));
-		
+		return createOrder(new Date(System.currentTimeMillis()));
 	}
 
-	
+	public static Order createOrder(Date creationDate)
+	{
+		return new OrderImpl(orderCount++, creationDate);
+	}
 }

src/test/java/CoffeShopTestSuite.java …java/coreapiTest/CoffeShopTestSuite.javasrc/test/java/CoffeShopTestSuite.java renamed to src/test/java/coreapiTest/CoffeShopTestSuite.java src/test/java/CoffeShopTestSuite.java renamed to src/test/java/coreapiTest/CoffeShopTestSuite.java

@@ -1,4 +1,6 @@
-package coreapi;
+package coreapiTest;
+
+import coreapi.*;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

src/test/java/MenuTest.java src/test/java/coreapiTest/MenuTest.javasrc/test/java/MenuTest.java renamed to src/test/java/coreapiTest/MenuTest.java

@@ -1,13 +1,16 @@
-package coreapi;
-
-import org.junit.Assert;
+package coreapiTest;
 
 import java.util.List;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import coreapi.Menu;
+import coreapi.Product;
+import coreapi.ProductCatalog;
+
 
 public class MenuTest
 {

src/test/java/OrderFactoryTest.java …t/java/coreapiTest/OrderFactoryTest.javasrc/test/java/OrderFactoryTest.java renamed to src/test/java/coreapiTest/OrderFactoryTest.java src/test/java/OrderFactoryTest.java renamed to src/test/java/coreapiTest/OrderFactoryTest.java

@@ -1,4 +1,7 @@
-package coreapi;
+package coreapiTest;
+
+import coreapi.Cafeteria;
+import coreapi.Order;
 
 import org.junit.Assert.*;
 

src/test/java/OrderImplTest.java …test/java/coreapiTest/OrderImplTest.javasrc/test/java/OrderImplTest.java renamed to src/test/java/coreapiTest/OrderImplTest.java src/test/java/OrderImplTest.java renamed to src/test/java/coreapiTest/OrderImplTest.java

@@ -1,5 +1,6 @@
-package coreapi;
+package coreapiTest;
 
+import coreapi.*;
 import org.junit.Assert;
 
 import java.util.List;

src/test/java/OrderServiceTest.java …t/java/coreapiTest/OrderServiceTest.javasrc/test/java/OrderServiceTest.java renamed to src/test/java/coreapiTest/OrderServiceTest.java src/test/java/OrderServiceTest.java renamed to src/test/java/coreapiTest/OrderServiceTest.java

@@ -1,5 +1,6 @@
-package coreapi;
+package coreapiTest;
 
+import coreapi.*;
 import java.util.Date;
 
 import org.junit.After;
@@ -28,9 +29,9 @@ protected void setUp()
 	{
 		coffe = new Cafeteria();
 		date = new Date(System.currentTimeMillis());
-		ord1 = new OrderImpl(17, date);
-		ord2 = new OrderImpl(18, date);
-		ord3 = new OrderImpl(19, date);
+		ord1 = (OrderImpl) OrderFactory.createOrder(date);
+		ord2 = (OrderImpl) OrderFactory.createOrder(date);
+		ord3 = (OrderImpl) OrderFactory.createOrder(date);
 		ordSer = new OrderService();
 
 		// We introduce products from the catalog to the cafeteria with a certain stock

src/test/java/ProductImplTest.java …st/java/coreapiTest/ProductImplTest.javasrc/test/java/ProductImplTest.java renamed to src/test/java/coreapiTest/ProductImplTest.java src/test/java/ProductImplTest.java renamed to src/test/java/coreapiTest/ProductImplTest.java

@@ -1,4 +1,7 @@
-package coreapi;
+package coreapiTest;
+
+import coreapi.ProductImpl;
+import coreapi.ProductCatalog;
 
 import org.junit.Assert;