Skip to content
This repository was archived by the owner on May 22, 2021. It is now read-only.

Commit 2f7c680

Browse files
JoaoMiguelNevesJoaoMiguelNeves
committed
Merge branch 'develop' of github.com:tecnico-softeng/es18tg_17-project into develop
2 parents 99d209c + 1dede25 commit 2f7c680

37 files changed

+3371
-13
lines changed

‎.gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,11 @@ infer-out
1414
.springBeans
1515
local.dev.yml
1616
.DS_Store
17+
.vscode/settings.json
18+
bank/.factorypath
19+
activity/.factorypath
20+
broker/.factorypath
21+
car/.factorypath
22+
hotel/.factorypath
23+
tax/.factorypath
24+
*.example

‎bin/startservers

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
cd ../tax; mvn clean spring-boot:run &
2-
cd ../bank; mvn clean spring-boot:run &
3-
cd ../hotel; mvn clean spring-boot:run &
4-
cd ../activity; mvn clean spring-boot:run &
5-
cd ../car; mvn clean spring-boot:run &
6-
cd ../broker; mvn clean spring-boot:run &
1+
export MAVEN_OPTS="-Xmx128m"
2+
3+
cd ../tax; mvn clean compile
4+
cd ../bank; mvn clean compile
5+
cd ../hotel; mvn clean compile
6+
cd ../activity; mvn clean compile
7+
cd ../car; mvn clean compile
8+
cd ../broker; mvn clean compile
9+
10+
cd ../tax; mvn spring-boot:run &
11+
cd ../bank; mvn spring-boot:run &
12+
cd ../hotel; mvn spring-boot:run &
13+
cd ../activity; mvn spring-boot:run &
14+
cd ../car; mvn spring-boot:run &
15+
cd ../broker; mvn spring-boot:run &

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

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

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ <h2>
1717
<h3>Create Broker</h3>
1818
<p class="text-danger" th:text="${error}">Error</p>
1919
<form class="form-inline" th:action="@{/brokers}" th:object="${broker}" method="post">
20-
<label>Name: </label> <input class="form-control input-sm" type="text" th:field="*{name}" />
21-
<label>Code: </label> <input class="form-control input-sm" type="text" size="7" th:field="*{code}" />
22-
<label>NifAsSeller: </label> <input class="form-control input-sm" type="text" size="9" th:field="*{nifAsSeller}" />
23-
<label>NifAsBuyer: </label> <input class="form-control input-sm" type="text" size="9" th:field="*{nifAsBuyer}" />
24-
<label>IBAN: </label> <input class="form-control input-sm" type="text" size="12" th:field="*{iban}" />
20+
<label>Name: </label> <input class="form-control input-sm" type="text" th:field="*{name}" />
21+
<label>Code: </label> <input class="form-control input-sm" type="text" size="7" th:field="*{code}" />
22+
<label>NifAsSeller: </label> <input class="form-control input-sm" type="text" size="9" th:field="*{nifAsSeller}" />
23+
<label>NifAsBuyer: </label> <input class="form-control input-sm" type="text" size="9" th:field="*{nifAsBuyer}" />
24+
<label>IBAN: </label> <input class="form-control input-sm" type="text" size="12" th:field="*{iban}" />
2525
<input class="btn btn-primary input-sm" type="submit" value="Submit" />
2626
</form>
2727
<br/>

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AP1234,Mont Vermont,18,70,20

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B100,111111115,2017-05-01,2017-05-01,30,BK124,0.1,false

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B100,111111115,B1001

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BK12,Money Plus

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B100,Joy of Travelling,111111113,111111114,BK124

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B100,BK125,111111115,DC12345,18

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

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
BK12,Broker
2+
BK12,Client
3+
BK12,Activity Provider

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

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
BK12,1
2+
BK12,2
3+
BK12,3

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

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
BK12,1,BK124,100000
2+
BK12,2,BK125,999
3+
BK12,3,BK126,100000

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

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPORT,10
2+
ADVENTURE,10

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AP1234,AP12341,2017-05-01,2017-05-01,1000

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AP1234,Bush Walking,111111111,BK126

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

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Client,Street,111111115,BUYER
2+
BBroker,Street,111111114,BUYER
3+
SBroker,Street,111111113,SELLER
4+
Activity,Street,111111111,SELLER

‎jmeter/tests/integration/unsuccess-sequence-fail-activity/test.jmx

+1,411
Large diffs are not rendered by default.

‎jmeter/tests/integration/unsuccessSequenceFailPayment/activity.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AP1234,Mont Vermont,18,70,20

‎jmeter/tests/integration/unsuccessSequenceFailPayment/adventure.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B100,111111115,2017-05-01,2017-05-02,30,BK126,0.1,true

‎jmeter/tests/integration/unsuccessSequenceFailPayment/adventureId.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B100,111111115,B1001

‎jmeter/tests/integration/unsuccessSequenceFailPayment/bank.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BK12,Money Plus

‎jmeter/tests/integration/unsuccessSequenceFailPayment/broker.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B100,Joy of Travelling,111111113,111111114,BK126

‎jmeter/tests/integration/unsuccessSequenceFailPayment/brokerClient.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B100,BK127,111111115,DC12345,30

‎jmeter/tests/integration/unsuccessSequenceFailPayment/car.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1111111161,12-XX-21,120,60,CAR

‎jmeter/tests/integration/unsuccessSequenceFailPayment/client.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
BK12,Broker
2+
BK12,Client
3+
BK12,Hotel
4+
BK12,Rent a Car
5+
BK12,Activity Provider

‎jmeter/tests/integration/unsuccessSequenceFailPayment/clientId.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
BK12,1
2+
BK12,2
3+
BK12,3
4+
BK12,4
5+
BK12,5

‎jmeter/tests/integration/unsuccessSequenceFailPayment/deposit.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
BK12,1,BK126,100000
2+
BK12,2,BK127,100
3+
BK12,3,BK128,100000
4+
BK12,4,BK129,100000
5+
BK12,5,BK1210,100000

‎jmeter/tests/integration/unsuccessSequenceFailPayment/hotel.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
HT12345,Paris Hotel,111111112,BK128,50,100

‎jmeter/tests/integration/unsuccessSequenceFailPayment/itemtype.txt

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
RENTAL,10
2+
HOUSING,10
3+
SPORT,10
4+
ADVENTURE,10

‎jmeter/tests/integration/unsuccessSequenceFailPayment/offer.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AP1234,AP12341,2017-05-01,2017-05-02,100

‎jmeter/tests/integration/unsuccessSequenceFailPayment/provider.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AP1234,Bush Walking,111111111,BK1210

‎jmeter/tests/integration/unsuccessSequenceFailPayment/rentacar.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Drive Happy,111111116,BK129

‎jmeter/tests/integration/unsuccessSequenceFailPayment/room.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
HT12345,1,SINGLE

‎jmeter/tests/integration/unsuccessSequenceFailPayment/taxpayer.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Client,Street,111111115,BUYER
2+
BBroker,Street,111111114,BUYER
3+
SBroker,Street,111111113,SELLER
4+
Hotel,Street,111111112,SELLER
5+
Car,Street,111111116,SELLER
6+
Activity,Street,111111111,SELLER

0 commit comments

Comments
 (0)