Skip to content

Commit 3a407bf

Browse files
clemfavreclemfavre
committed
tests with all packet typs, ⚠️ : precisse up to 6th decimal place only for float
1 parent 748ec20 commit 3a407bf

2 files changed

Lines changed: 60 additions & 19 deletions

File tree

‎Server/src/data_storage.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ int SqliteDB::write_pkt(const Packet pkt) {
5656
case PacketType::AV_UPLINK: {
5757
AV_uplink_pkt* avUpPkt = pkt.av_up_pkt;
5858
if (avUpPkt == NULL) {return 2;}
59-
printf("place av up pkt in buffer\n");
59+
printf(" place av up pkt in buffer\n");
6060
buffer_av_up.emplace_back(*avUpPkt);
6161
if(buffer_av_up.size() >= BATCH_SIZE) {
62-
printf("av up buffer is full --> call flush\n");
62+
printf(" av up buffer is full --> call flush\n");
6363
flushAvUp();
6464
return 1;
6565
}
@@ -68,10 +68,10 @@ int SqliteDB::write_pkt(const Packet pkt) {
6868
case PacketType::AV_DOWNLINK: {
6969
AV_downlink_pkt* avDownPkt = pkt.av_down_pkt;
7070
if (avDownPkt == NULL) {return 2;}
71-
printf("place av down pkt in buffer\n");
71+
printf(" place av down pkt in buffer\n");
7272
buffer_av_down.emplace_back(*avDownPkt);
7373
if(buffer_av_down.size() >= BATCH_SIZE) {
74-
printf("av down buffer is full --> call flush\n");
74+
printf(" av down buffer is full --> call flush\n");
7575
flushAvDown();
7676
return 1;
7777
}
@@ -80,10 +80,10 @@ int SqliteDB::write_pkt(const Packet pkt) {
8080
case PacketType::GSE_DOWNLINK: {
8181
GSE_downlink_pkt* gseDownPkt = pkt.gse_down_pkt;
8282
if (gseDownPkt == NULL) {return 2;}
83-
printf("place gse down pkt in buffer\n");
83+
printf(" place gse down pkt in buffer\n");
8484
buffer_gse_down.emplace_back(*gseDownPkt);
8585
if(buffer_gse_down.size() >= BATCH_SIZE) {
86-
printf("gse down buffer is full --> call flush\n");
86+
printf(" gse down buffer is full --> call flush\n");
8787
flushGseDown();
8888
return 1;
8989
}
@@ -98,7 +98,7 @@ int SqliteDB::read_pkt(uint32_t pkt_id, Packet pkt) {}
9898
int SqliteDB::flushAvUp() {
9999
if (buffer_av_up.empty()) {return 1;}
100100

101-
printf("starting transaction\n");
101+
printf(" starting transaction\n");
102102
this->storage.transaction([this]() -> bool {
103103
for (const auto& pktavup : buffer_av_up) {
104104
this->storage.replace(pktavup);
@@ -112,7 +112,7 @@ int SqliteDB::flushAvUp() {
112112
int SqliteDB::flushAvDown() {
113113
if (buffer_av_down.empty()) {return 1;}
114114

115-
printf("starting transaction\n");
115+
printf(" starting transaction\n");
116116
this->storage.transaction([this]() -> bool {
117117
for (const auto& pktavdown : buffer_av_down) {
118118
this->storage.replace(pktavdown);
@@ -126,7 +126,7 @@ int SqliteDB::flushAvDown() {
126126
int SqliteDB::flushGseDown() {
127127
if (buffer_gse_down.empty()) {return 1;}
128128

129-
printf("starting transaction\n");
129+
printf(" starting transaction\n");
130130
this->storage.transaction([this]() -> bool {
131131
for (const auto& pktgsedown : buffer_gse_down) {
132132
this->storage.replace(pktgsedown);

‎Server/tests/data_storage_tests.cpp‎

Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,74 @@ TEST(exampleTest, failureTest) {
88

99

1010

11-
/*
1211
int main(int argc, char *argv[]) {
1312
printf("starting data-storage tests\n");
1413

15-
//create db
14+
printf("creating db\n");
1615
SqliteDB* db = new SqliteDB;
17-
printf("db created\n");
1816

17+
printf("creating test packets\n");
1918
//create first av up pkt
2019
AV_uplink_pkt* avup1 = new AV_uplink_pkt;
21-
*avup1 = {.id=1, .ts=4, .order_id=2, .order_value=3};
20+
*avup1 = {.id=1, .ts=2, .order_id=3, .order_value=4};
2221
Packet* pkt1 = new Packet;
2322
*pkt1 = {AV_UPLINK, avup1, NULL, NULL};
2423

2524
//create second av up pkt
2625
AV_uplink_pkt* avup2 = new AV_uplink_pkt;
27-
*avup2 = {.id=2, .ts=4, .order_id=2, .order_value=3};
26+
*avup2 = {.id=2, .ts=5, .order_id=6, .order_value=7};
2827
Packet* pkt2 = new Packet;
2928
*pkt2 = {AV_UPLINK, avup2, NULL, NULL};
3029

30+
//create first av dw pkt
31+
AV_downlink_pkt* avdw1 = new AV_downlink_pkt;
32+
*avdw1 = {.id=3, .ts=8, .packet_nbr=9, .gnss_lon=10,
33+
.gnss_lat=11, .gnss_alt=12, .gnss_vertical_speed=13,
34+
.N2_pressure=14, .fuel_pressure=15, .LOX_pressure=16,
35+
.fuel_level=17, .LOX_level=18, .N2_temp=19, .LOX_temp=20,
36+
.LOX_inj_temp=21, .lpb_voltage=22, .hpb_voltage=23,
37+
.av_fc_temp=24, .ambient_temp=25, .engine_state=26,
38+
.av_state=27, .cam_rec=28};
39+
Packet* pkt3 = new Packet;
40+
*pkt3 = {AV_DOWNLINK, NULL, avdw1, NULL};
41+
42+
//create second av dw pkt
43+
AV_downlink_pkt* avdw2 = new AV_downlink_pkt;
44+
*avdw2 = {.id=4, .ts=5, .packet_nbr=10, .gnss_lon=11,
45+
.gnss_lat=12, .gnss_alt=13, .gnss_vertical_speed=14,
46+
.N2_pressure=15, .fuel_pressure=16, .LOX_pressure=17,
47+
.fuel_level=18, .LOX_level=19, .N2_temp=20, .LOX_temp=21,
48+
.LOX_inj_temp=22, .lpb_voltage=23, .hpb_voltage=24,
49+
.av_fc_temp=25, .ambient_temp=26, .engine_state=27,
50+
.av_state=28, .cam_rec=29};
51+
Packet* pkt4 = new Packet;
52+
*pkt4 = {AV_DOWNLINK, NULL, avdw2, NULL};
53+
54+
//create first gse dw pkt
55+
GSE_downlink_pkt* gsdw1 = new GSE_downlink_pkt;
56+
*gsdw1 = {.id=5, .ts=5, .tankPressure=11.1, .tankTemperature=11.2,
57+
.fillingPressure=11.3, .fillingN2O=12, .vent=13,
58+
.disconnectActive=true, .loadcell_raw=14};
59+
Packet* pkt5 = new Packet;
60+
*pkt5 = {GSE_DOWNLINK, NULL, NULL, gsdw1};
61+
62+
//create second gse dw pkt
63+
GSE_downlink_pkt* gsdw2 = new GSE_downlink_pkt;
64+
*gsdw2 = {.id=6, .ts=5, .tankPressure=12.1, .tankTemperature=12.2,
65+
.fillingPressure=12.3, .fillingN2O=13, .vent=14,
66+
.disconnectActive=false, .loadcell_raw=15};
67+
Packet* pkt6 = new Packet;
68+
*pkt6 = {GSE_DOWNLINK, NULL, NULL, gsdw2};
69+
3170
//write pkt
32-
printf("write 1st pkt\n");
33-
if (db->write_pkt(*pkt1) != 0) {printf("write return != 0\n");}
34-
printf("write 2nd pkt\n");
35-
if (db->write_pkt(*pkt2) != 1) {printf("write retrn != 1\n");}
71+
printf("writing packets\n");
72+
if (db->write_pkt(*pkt1) != 0) {printf("write return != 0 (pkt1)\n");}
73+
if (db->write_pkt(*pkt2) != 1) {printf("write retrn != 1 (pkt2)\n");}
74+
if (db->write_pkt(*pkt3) != 0) {printf("write return != 0 (pkt3)\n");}
75+
if (db->write_pkt(*pkt4) != 1) {printf("write retrn != 1 (pkt4)\n");}
76+
if (db->write_pkt(*pkt5) != 0) {printf("write return != 0 (pkt5)\n");}
77+
if (db->write_pkt(*pkt6) != 1) {printf("write retrn != 1 (pkt6)\n");}
3678

3779
printf("end of data-storage tests\n");
3880
return 0;
3981
}
40-
*/

0 commit comments

Comments
 (0)