Skip to content

Commit 77a9f3d

Browse files
committed
update
Sprint0 finito
1 parent a64370e commit 77a9f3d

File tree

19 files changed

+768
-14
lines changed

19 files changed

+768
-14
lines changed
Binary file not shown.
Binary file not shown.

Sprint0/Sprint0_RequirementAnalysis/.idea/modules/unibo.demo_system_overview_v0.test.iml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sprint0/Sprint0_RequirementAnalysis/Test Results - TestInteractions.html

Lines changed: 729 additions & 0 deletions
Large diffs are not rendered by default.

Sprint0/Sprint0_RequirementAnalysis/build2022.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ eclipse {
105105

106106
application {
107107
// Define the main class for the application.
108-
mainClass = 'it.unibo.ctx_test_storerequest.MainCtx_test_storerequestKt'
108+
mainClass = 'it.unibo.ctx_basicrobot.MainCtx_basicrobotKt'
109109
}
110110

111111
jar {
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rootProject.name = "unibo.test_storerequest"
1+
rootProject.name = "unibo.demo_system_overview_v0"

Sprint0/Sprint0_RequirementAnalysis/test/it/unibo/wasteservice/sprint0/TestInteractions.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ private void setupWasteService() {
6868

6969

7070
@Test
71-
public void testLoadAccepted1() {
71+
public void testLoadAcceptedPlastic() {
7272
try {
73-
IApplMessage msg = MsgUtil.buildRequest("testPlasticOK(1)", "storerequest", "storerequest(" + WasteType.PLASTIC + ", " + (Constants.MAXPB / 3) + ")", actorName);
73+
IApplMessage msg = MsgUtil.buildRequest("testPlasticOK", "storerequest", "storerequest(" + WasteType.PLASTIC + ", " + (Constants.MAXPB / 3) + ")", actorName);
7474
ColorsOut.outappl("[Test_SmartDevice] " + msg.toString(), ColorsOut.MAGENTA);
7575

7676
String reply = interaction.request(msg.toString());
@@ -85,9 +85,9 @@ public void testLoadAccepted1() {
8585
}
8686

8787
@Test
88-
public void testLoadAccepted2() {
88+
public void testLoadRejectedPlastic() {
8989
try {
90-
IApplMessage msg = MsgUtil.buildRequest("testPlasticOK(2)", "storerequest", "storerequest(" + WasteType.PLASTIC + ", " + (Constants.MAXPB / 2) + ")", actorName);
90+
IApplMessage msg = MsgUtil.buildRequest("testPlasticFAIL", "storerequest", "storerequest(" + WasteType.GLASS + ", " + (Constants.MAXGB / 2) + ")", actorName);
9191
ColorsOut.outappl("[Test_SmartDevice] " + msg.toString(), ColorsOut.MAGENTA);
9292

9393
String reply = interaction.request(msg.toString());
@@ -102,9 +102,9 @@ public void testLoadAccepted2() {
102102
}
103103

104104
@Test
105-
public void testLoadRejected1() {
105+
public void testLoadAcceptedGlass() {
106106
try {
107-
IApplMessage msg = MsgUtil.buildRequest("testPlasticFAIL", "storerequest", "storerequest(" + WasteType.PLASTIC + ", " + (Constants.MAXPB + 10.0f) + ")", actorName);
107+
IApplMessage msg = MsgUtil.buildRequest("testGlassOK", "storerequest", "storerequest(" + WasteType.PLASTIC + ", " + (Constants.MAXPB + 10.0f) + ")", actorName);
108108
ColorsOut.outappl("[Test_SmartDevice] " + msg.toString(), ColorsOut.MAGENTA);
109109

110110
String reply = interaction.request(msg.toString());
@@ -120,7 +120,7 @@ public void testLoadRejected1() {
120120

121121
@Test
122122
@Order(4)
123-
public void testLoadRejected2() {
123+
public void testLoadRejectedGlass() {
124124
try {
125125
IApplMessage msg = MsgUtil.buildRequest("testGlassFAIL", "storerequest", "storerequest(" + WasteType.GLASS + ", " + (Constants.MAXGB + 23.3f) + ")", actorName);
126126
ColorsOut.outappl("[Test_SmartDevice] " + msg.toString(), ColorsOut.MAGENTA);

Sprint0/resources/styles/templateISS.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ table, th, td {
165165
border-collapse: collapse;
166166
}
167167

168+
li:first-child {
169+
margin-top: 5px;
170+
}
171+
168172
ol, ul, li {
169173
margin: 0;
170174
margin-left: 10px;

Sprint0/resources/userDocs/conclusions.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h2 id="Summary">Summary</h2>
4949
This first Sprint (<a href="../../index.html">Sprint0</a>) outlined the following macro elements of the project:
5050
<div class="remark">
5151
<ol>
52-
<li><ksi>Core-business</ksi>: involves the smart device, waste service</li>
52+
<li><ksi>Core-business</ksi>: involves the chain of the main nodes of the system (smart device, waste service, transport trolley, basic robot)</li>
5353
<li><ksi>Monitoring</ksi>: involves the GUI</li>
5454
<li><ksi>Alarm</ksi>: involves the raspberry device</li>
5555
</ol>
@@ -58,14 +58,20 @@ <h2 id="Summary">Summary</h2>
5858
<h2 id="Work-Plan">Work Plan</h2>
5959
<h3 id="Sprint1">Sprint1 - <b>Core Business</b></h3>
6060

61-
The <a href="">Sprint1</a> will focus on the <i>first requirement</i> and is going to include:
61+
The <a href="">Sprint1</a> will focus on the <i>Core business</i>, which is also the first requirement, and is going to include:
62+
<ul>
63+
<li>Dummy simulator of TruckDriver + SmartDevice.</li>
64+
<li>WasteService: problem analysis regarding a model for "advanced" interactions, waste service area in-depth analysis, project and implementation of a prototype.</li>
65+
<li>TransportTrolley: problem analysis, project and prototyping of the element that will control the robot movements.</li>
66+
<li>BasicRobot: the software is ready and serviceable, so it just has to be integrated in the project.</li>
67+
</ul>
6268

6369
<h3 id="Sprint2">Sprint2 - <b>Monitoring</b></h3>
6470

6571
<h3 id="Sprint3">Sprint3 - <b>Alarm</b></h3>
6672
<br/>
6773
<br/>
68-
Tenere presente che per la realizzazione dei prodotti, potranno essere utilizzate o specializzate le applicazioni realizzate dalla nostra software house, nel corso dell'anno corrente: Applicazioni22.
74+
<!--Tenere presente che per la realizzazione dei prodotti, potranno essere utilizzate o specializzate le applicazioni realizzate dalla nostra software house, nel corso dell'anno corrente: Applicazioni22.-->
6975
</div>
7076

7177
<!--<footer>

Sprint0/resources/userDocs/requirement_analysis.html

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,19 @@ <h3 id="Logical-Architecture">Logical Architecture</h3>
769769

770770
<h2 id="Test-Plans">Test Plans</h2>
771771
<h4>Interaction: SmartDevice &rarr; WasteService</h4>
772-
The
773-
Executable Models
772+
Simulation that involves the issuing of multiple <a href="#Messages">storeRequest</a> from the SmartDevice.
773+
The test aims to check how the system should behave when receiving different types of requests:
774+
<ul>
775+
<li>Store request of Plastic, if there is enough space (loadaccepted);</li>
776+
<li>Store request of Plastic, if there is not enough space (loadrejected);</li>
777+
<li>Store request of Glass, if there is enough space (loadaccepted);</li>
778+
<li>Store request of Glass, if there is not enough space (loadrejected);</li>
779+
</ul>
780+
781+
<b>File</b>: <a href="../../Sprint0_RequirementAnalysis/test/it/unibo/wasteservice/sprint0/TestInteractions.java">TestInteractions.java</a> (Executable)
782+
<br/>
783+
<b>Results</b>: <a href="../../Sprint0_RequirementAnalysis/build/reports/tests/test/index.html">Gradle test report</a> (Generated automatically)
784+
<br/><br/><br/><br/>
774785
</div>
775786
</body>
776787
</html>

0 commit comments

Comments
 (0)