Merge pull request #251 from tecnico-softeng/unsuccessSequenceFailAct…

…ivity

Adding unsuccess sequence fail activity integration test (references #232)

.gitignore

@@ -14,3 +14,11 @@ infer-out
 .springBeans
 local.dev.yml
 .DS_Store
+.vscode/settings.json
+bank/.factorypath
+activity/.factorypath
+broker/.factorypath
+car/.factorypath
+hotel/.factorypath
+tax/.factorypath
+*.example

bin/startservers

@@ -1,6 +1,15 @@
-cd ../tax; mvn clean spring-boot:run &
-cd ../bank; mvn clean spring-boot:run &
-cd ../hotel; mvn clean spring-boot:run &
-cd ../activity; mvn clean spring-boot:run &
-cd ../car; mvn clean spring-boot:run &
-cd ../broker; mvn clean spring-boot:run &
+export MAVEN_OPTS="-Xmx128m"
+
+cd ../tax; mvn clean compile
+cd ../bank; mvn clean compile
+cd ../hotel; mvn clean compile
+cd ../activity; mvn clean compile
+cd ../car; mvn clean compile
+cd ../broker; mvn clean compile
+
+cd ../tax; mvn spring-boot:run &
+cd ../bank; mvn spring-boot:run &
+cd ../hotel; mvn spring-boot:run &
+cd ../activity; mvn spring-boot:run &
+cd ../car; mvn spring-boot:run &
+cd ../broker; mvn spring-boot:run &

broker/src/main/resources/templates/adventures.html

@@ -72,7 +72,7 @@ <h3>Adventures</h3>
 					<td th:text="${adventure.roomCancellation}">Room Cancellation</td>
 					<td th:text="${adventure.activityConfirmation}">Activity Confirmation</td>
 					<td th:text="${adventure.activityCancellation}">Activity Cancellation</td>
-					<td> <form class="form-inline" th:action="@{/brokers/{code}/adventures/{id}/process(code=${client.brokerCode},id=${adventure.id})}" method="post">
+					<td> <form class="form-inline" th:action="@{adventures/{id}/process(id=${adventure.id})}" method="post">
 						 <input class="btn btn-primary" type="submit" value="Submit" />
 					</form></td>
 				</tr>

broker/src/main/resources/templates/brokers.html

@@ -17,11 +17,11 @@ <h2>
 		<h3>Create Broker</h3>
 		<p class="text-danger" th:text="${error}">Error</p>
 		<form class="form-inline" th:action="@{/brokers}" th:object="${broker}" method="post">
-			<label>Name: </label> <input class="form-control input-sm" type="text" th:field="*{name}" /> 
-			<label>Code: </label> <input class="form-control input-sm" type="text" size="7" th:field="*{code}" /> 
-			<label>NifAsSeller: </label> <input class="form-control input-sm" type="text" size="9" th:field="*{nifAsSeller}" /> 
-			<label>NifAsBuyer: </label> <input class="form-control input-sm" type="text" size="9" th:field="*{nifAsBuyer}" /> 
-			<label>IBAN: </label> <input class="form-control input-sm" type="text" size="12" th:field="*{iban}" /> 
+			<label>Name: </label> <input class="form-control input-sm" type="text" th:field="*{name}" />
+			<label>Code: </label> <input class="form-control input-sm" type="text" size="7" th:field="*{code}" />
+			<label>NifAsSeller: </label> <input class="form-control input-sm" type="text" size="9" th:field="*{nifAsSeller}" />
+			<label>NifAsBuyer: </label> <input class="form-control input-sm" type="text" size="9" th:field="*{nifAsBuyer}" />
+			<label>IBAN: </label> <input class="form-control input-sm" type="text" size="12" th:field="*{iban}" />
 			<input class="btn btn-primary input-sm" type="submit" value="Submit" />
 		</form>
 		<br/>

jmeter/tests/integration/unsuccess-sequence-fail-activity/activity.txt

@@ -0,0 +1 @@
+AP1234,Mont Vermont,18,70,20

jmeter/tests/integration/unsuccess-sequence-fail-activity/adventure.txt

@@ -0,0 +1 @@
+B100,111111115,2017-05-01,2017-05-01,30,BK124,0.1,false

jmeter/tests/integration/unsuccess-sequence-fail-activity/adventureId.txt

@@ -0,0 +1 @@
+B100,111111115,B1001

jmeter/tests/integration/unsuccess-sequence-fail-activity/bank.txt

@@ -0,0 +1 @@
+BK12,Money Plus

jmeter/tests/integration/unsuccess-sequence-fail-activity/broker.txt

@@ -0,0 +1 @@
+B100,Joy of Travelling,111111113,111111114,BK124

jmeter/tests/integration/unsuccess-sequence-fail-activity/brokerClient.txt

@@ -0,0 +1 @@
+B100,BK125,111111115,DC12345,18

jmeter/tests/integration/unsuccess-sequence-fail-activity/client.txt

@@ -0,0 +1,3 @@
+BK12,Broker
+BK12,Client
+BK12,Activity Provider

jmeter/tests/integration/unsuccess-sequence-fail-activity/clientId.txt

@@ -0,0 +1,3 @@
+BK12,1
+BK12,2
+BK12,3

jmeter/tests/integration/unsuccess-sequence-fail-activity/deposit.txt

@@ -0,0 +1,3 @@
+BK12,1,BK124,100000
+BK12,2,BK125,999
+BK12,3,BK126,100000

jmeter/tests/integration/unsuccess-sequence-fail-activity/itemtype.txt

@@ -0,0 +1,2 @@
+SPORT,10
+ADVENTURE,10

jmeter/tests/integration/unsuccess-sequence-fail-activity/offer.txt

@@ -0,0 +1 @@
+AP1234,AP12341,2017-05-01,2017-05-01,1000

jmeter/tests/integration/unsuccess-sequence-fail-activity/provider.txt

@@ -0,0 +1 @@
+AP1234,Bush Walking,111111111,BK126

jmeter/tests/integration/unsuccess-sequence-fail-activity/taxpayer.txt

@@ -0,0 +1,4 @@
+Client,Street,111111115,BUYER
+BBroker,Street,111111114,BUYER
+SBroker,Street,111111113,SELLER
+Activity,Street,111111111,SELLER