Commit graph

558 commits

Author SHA1 Message Date
Claudio Maggioni (maggicl)
0ce873dc52 Working on DeviceService tests 2020-05-18 10:52:58 +02:00
Jacob Salvi
0151467b2e Merge branch 'dev' into '75-backend-unit-testing'
# Conflicts:
#   src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
2020-05-17 15:28:14 +02:00
Jacob Salvi
00452d5295 made a couple of tests 2020-05-17 15:20:14 +02:00
6da0800455 Merge branch 'tests' into 'dev'
Tests on Utils and UserResponse

See merge request sa4-2020/the-sanmarinoes/backend!145
2020-05-17 14:00:26 +02:00
Claudio Maggioni (maggicl)
eeec726966 Tests on Utils and UserResponse 2020-05-17 13:56:54 +02:00
590e675811 Merge branch 'tests' into 'dev'
Tests on exception classes

See merge request sa4-2020/the-sanmarinoes/backend!144
2020-05-17 13:30:01 +02:00
Claudio Maggioni (maggicl)
4e35aa4a75 Tests on exception classes 2020-05-17 13:26:51 +02:00
7b606307df Merge branch '75-backend-unit-testing-tommaso' into 'dev'
Resolve "backend-unit-testing"

Closes #75

See merge request sa4-2020/the-sanmarinoes/backend!143
2020-05-17 12:52:37 +02:00
Claudio Maggioni (maggicl)
bc7b30f3ea Fixed lombok in AutomationFastUpdateRequest 2020-05-17 12:49:40 +02:00
fdef45b8c2 Merge branch '75-backend-unit-testing' into 'dev'
Resolve "backend-unit-testing"

Closes #75

See merge request sa4-2020/the-sanmarinoes/backend!142
2020-05-17 12:34:58 +02:00
Matteo Omenetti
18e5f74b90 Merge branch '75-backend-unit-testing-matteo' into 'dev'
Resolve "backend-unit-testing"

Closes #75

See merge request sa4-2020/the-sanmarinoes/backend!141
2020-05-17 11:56:14 +02:00
omenem
c5b3a57faa fix 2020-05-17 11:52:37 +02:00
omenem
940c072711 fix 2020-05-17 11:33:30 +02:00
omenem
0ce6e84380 fix 2020-05-17 11:26:49 +02:00
omenem
5946d0974e fix 2020-05-17 11:16:51 +02:00
omenem
dd1d59a095 fix 2020-05-17 11:13:50 +02:00
Matteo Omenetti
5f692db5f7 Merge branch 'dev' into '75-backend-unit-testing-matteo'
# Conflicts:
#   src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
2020-05-17 10:20:16 +02:00
omenem
198be1f668 more tests 2020-05-17 10:16:12 +02:00
omenem
3f568c77d3 more tests 2020-05-16 18:00:28 +02:00
omenem
7020f0d692 fix 2020-05-15 19:01:28 +02:00
omenem
3d9ddb5ffd some tests 2020-05-15 18:52:57 +02:00
3dcfa584f0 made some fields private 2020-05-14 21:02:49 +02:00
368530de97 automation dto should be tested 2020-05-14 19:00:07 +02:00
0031fe38ea Merge branch 'controller-tests' into 'dev'
Added example tests for SensorController

See merge request sa4-2020/the-sanmarinoes/backend!140
2020-05-13 12:14:20 +02:00
Claudio Maggioni (maggicl)
3ed6102b9f Added example tests for SensorController 2020-05-13 12:10:06 +02:00
Jacob Salvi
b4bf15583a a couple of tests 2020-05-13 09:42:36 +02:00
ba9001a9c8 Merge branch 'sonar-fix' into 'dev'
Degenerified states

See merge request sa4-2020/the-sanmarinoes/backend!139
2020-05-12 18:37:08 +02:00
acec5a0af8 Degenerified states 2020-05-12 18:32:23 +02:00
c9fbffea7a Merge branch 'sonar-fix' into 'dev'
Removed @NotNull from models

See merge request sa4-2020/the-sanmarinoes/backend!138
2020-05-12 17:23:07 +02:00
6223434979 Removed duplication 2020-05-12 17:20:19 +02:00
0d10d759a6 Removed @NotNull from models 2020-05-12 17:14:25 +02:00
74270269ca Merge branch 'sonar-fix' into 'dev'
More lombok-ification

See merge request sa4-2020/the-sanmarinoes/backend!137
2020-05-12 17:02:59 +02:00
582f44581b More lombok-ification 2020-05-12 16:59:46 +02:00
328ad4e882 Merge branch 'sonar-fix' into 'dev'
Added lombok and converted DTOs

See merge request sa4-2020/the-sanmarinoes/backend!136
2020-05-12 15:49:54 +02:00
3bb008517a Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into sonar-fix 2020-05-12 15:46:23 +02:00
87df96760d Added lombok and converted DTOs 2020-05-12 15:44:32 +02:00
Jacob Salvi
c614f96b31 Merge remote-tracking branch 'origin/dev' into dev 2020-05-10 21:54:18 +02:00
6e207a34c9 Merge branch 'sonar-fix' into 'dev'
Degenerified Conditions

See merge request sa4-2020/the-sanmarinoes/backend!135
2020-05-10 21:49:14 +02:00
Claudio Maggioni (maggicl)
c6041e0e0f Degenerified Conditions 2020-05-10 21:44:10 +02:00
c003bd1e87 Merge branch '55-users-can-add-conditions-to-automations' into 'dev'
Resolve "Users can add conditions to automations"

Closes #55

See merge request sa4-2020/the-sanmarinoes/backend!133
2020-05-10 21:30:39 +02:00
Claudio Maggioni (maggicl)
0ba0d10cdc Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 55-users-can-add-conditions-to-automations 2020-05-10 21:26:42 +02:00
d0fa87e9c3 Merge branch 'sonar-fix' into 'dev'
Even another batch of sonar fixes

See merge request sa4-2020/the-sanmarinoes/backend!134
2020-05-10 20:50:22 +02:00
Claudio Maggioni (maggicl)
5e1b07d32f Even another batch of sonar fixes 2020-05-10 20:47:18 +02:00
Jacob Salvi
1b22534f40 room and thermostat tests 2020-05-10 15:17:27 +02:00
fe7e004494 Merge branch 'sonar-fix' into 'dev'
Even another batch of sonar fixes

See merge request sa4-2020/the-sanmarinoes/backend!132
2020-05-10 12:51:23 +02:00
Claudio Maggioni (maggicl)
573a5c6a91 Fixing confirmationTokenRepository and deleted generic parameter on children of trigger 2020-05-10 12:48:41 +02:00
Claudio Maggioni (maggicl)
b64979500b Even another batch of sonar fixes 2020-05-10 12:39:18 +02:00
2976212f18 Merge branch 'sonar-fix' into 'dev'
Even another batch of sonar fixes

See merge request sa4-2020/the-sanmarinoes/backend!131
2020-05-10 12:13:28 +02:00
Claudio Maggioni (maggicl)
9394a8439f Even another batch of sonar fixes 2020-05-10 12:09:53 +02:00
Jacob Salvi
1d422ec420 Merge remote-tracking branch 'origin/dev' into dev 2020-05-10 10:34:46 +02:00