summaryrefslogtreecommitdiff
path: root/i/simulotron/src/gs/test_gs.cc
diff options
context:
space:
mode:
Diffstat (limited to 'i/simulotron/src/gs/test_gs.cc')
-rw-r--r--i/simulotron/src/gs/test_gs.cc44
1 files changed, 18 insertions, 26 deletions
diff --git a/i/simulotron/src/gs/test_gs.cc b/i/simulotron/src/gs/test_gs.cc
index 0dc557a..a2d8724 100644
--- a/i/simulotron/src/gs/test_gs.cc
+++ b/i/simulotron/src/gs/test_gs.cc
@@ -89,7 +89,7 @@ int main(void)
<< std::endl;
return 1;
}
- std::cout << "String OK" << std::endl;
+ gsm.clear();
// Un char
if (gst.getGS(gsm) != 0)
throw std::runtime_error ("CHIER!! Reception mal passé");
@@ -102,11 +102,11 @@ int main(void)
<< std::endl;
return 1;
}
- std::cout << "Char OK" << std::endl;
+ gsm.clear();
// Un short
if (gst.getGS(gsm) != 0)
throw std::runtime_error ("CHIER!! Reception mal passé");
- gsm.readGS(&s2, sizeof(char));
+ gsm.readGS(&s2, sizeof(short));
if ( s1 != s2)
{
std::cout << "CHIER Short altéré\n"
@@ -115,11 +115,11 @@ int main(void)
<< std::endl;
return 1;
}
- std::cout << "Short OK" << std::endl;
+ gsm.clear();
// Un int positif
if (gst.getGS(gsm) != 0)
throw std::runtime_error ("CHIER!! Reception mal passé");
- gsm.readGS(&i2, sizeof(char));
+ gsm.readGS(&i2, sizeof(int));
if ( i1 != i2)
{
std::cout << "CHIER int positif altéré\n"
@@ -128,11 +128,11 @@ int main(void)
<< std::endl;
return 1;
}
- std::cout << "int positif OK" << std::endl;
+ gsm.clear();
// Un int negatif
if (gst.getGS(gsm) != 0)
throw std::runtime_error ("CHIER!! Reception mal passé");
- gsm.readGS(&i4, sizeof(char));
+ gsm.readGS(&i4, sizeof(int));
if ( i3 != i4)
{
std::cout << "CHIER int negatif altéré\n"
@@ -141,11 +141,11 @@ int main(void)
<< std::endl;
return 1;
}
- std::cout << "int negatif OK" << std::endl;
+ gsm.clear();
// Un Long
if (gst.getGS(gsm) != 0)
throw std::runtime_error ("CHIER!! Reception mal passé");
- gsm.readGS(&l2, sizeof(char));
+ gsm.readGS(&l2, sizeof(long));
if ( l1 != l2)
{
std::cout << "CHIER long altéré\n"
@@ -154,7 +154,7 @@ int main(void)
<< std::endl;
return 1;
}
- std::cout << "int positif OK" << std::endl;
+ gsm.clear();
// Un gros message
if (gst.getGS(gsm) != 0)
throw std::runtime_error ("CHIER!! Reception mal passé");
@@ -185,7 +185,6 @@ int main(void)
<< std::endl;
return 1;
}
- std::cout << "Gros message OK" << std::endl;
//On attend le thread client
pthread_join(threadId, &retour);
stateTh = (int) retour;
@@ -208,28 +207,21 @@ void * testGSClient(void * CaSertARien)
GSMessage g1,g2,g3,g4,g5,g6,g7;
g1.writeGS(strDepart.data(), strDepart.size());
gst.putGS(g1);
- g2.writeGS(&s1, sizeof(short));
+ g2.writeGS(&a, sizeof(char));
gst.putGS(g2);
- g3.writeGS(&i1, sizeof(int));
+ g3.writeGS(&s1, sizeof(short));
gst.putGS(g3);
- g4.writeGS(&i3, sizeof(int));
+ g4.writeGS(&i1, sizeof(int));
gst.putGS(g4);
- g5.writeGS(&l1, sizeof(long));
+ g5.writeGS(&i3, sizeof(int));
gst.putGS(g5);
-
- g6.writeGS(&s1, sizeof(short));
g6.writeGS(&l1, sizeof(long));
- g6.writeGS(&i3, sizeof(int));
gst.putGS(g6);
- std::cout << "Et pouf" << std::endl;
-
- /*//tv
- timeval tv;
- tv.tv_sec = 20;
- tv.tv_usec = 0;
- select(1,NULL,NULL,NULL,&tv);
- */
+ g7.writeGS(&s1, sizeof(short));
+ g7.writeGS(&l1, sizeof(long));
+ g7.writeGS(&i3, sizeof(int));
+ gst.putGS(g7);
}
catch(std::exception & chier)
{