Studium
/
Java_2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alles wieder grün, und das nur durch auskommentieren von ein paar System outs

This commit is contained in:
Johannes Theiner 2018-05-25 22:42:21 +02:00
parent a7cdce30d9
commit d3459a5077
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/praktikum3/vorlesungen-db.txt
View File

@ -1,4 +1,4 @@
A1:Relativitätstheorie:Einstein:15 A1:Relativitätstheorie:Einstein:15
B2:Quantenmechanik:Heisenberg:17 B2:Quantenmechanik:Heisenberg:17
C2:Quantenphysik:Planck:5 C2:Quantenphysik:Planck:5
T4:Thermodynamik:Kelvin:78 T4:Thermodynamik:Kelvin:78

31
src/test/java/de/joethei/hs/java2/tests/KlausurenServerTest2.java
View File

@ -59,12 +59,11 @@ public class KlausurenServerTest2 {
@Test //alles in einer Test-Methode, weil die richtige Reihenfolge sonst nicht gewährleistet ist! @Test //alles in einer Test-Methode, weil die richtige Reihenfolge sonst nicht gewährleistet ist!
public void all() throws IOException { public void all() throws IOException {
System.out.println("TEST: del mail1"); System.out.println("TEST: del mail1");
opensocket(); opensocket();
ausSo.println("del mail1"); ausSo.println("del mail1");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertEquals(line,"0"); assertEquals(line,"0");
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -73,7 +72,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("put mail2 22,23,24"); ausSo.println("put mail2 22,23,24");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertTrue(line.equals("1 ")||line.equals("1")); assertTrue(line.equals("1 ")||line.equals("1"));
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -82,7 +81,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("put mail2 33,34,35"); ausSo.println("put mail2 33,34,35");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertEquals(line,"1 22,23,24"); assertEquals(line,"1 22,23,24");
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -91,7 +90,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("get mail2"); ausSo.println("get mail2");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertEquals(line,"1 33,34,35"); assertEquals(line,"1 33,34,35");
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -100,7 +99,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("put mail3 44,45,46"); ausSo.println("put mail3 44,45,46");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertTrue(line.equals("1 ")||line.equals("1")); assertTrue(line.equals("1 ")||line.equals("1"));
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -109,7 +108,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("put mail5 44,45"); ausSo.println("put mail5 44,45");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertTrue(line.equals("1 ")||line.equals("1")); assertTrue(line.equals("1 ")||line.equals("1"));
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -118,7 +117,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("getall"); ausSo.println("getall");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertTrue(line.equals("1 [33,34,35],[44,45,46]")||line.equals("1 [44,45,46],[33,34,35]")); assertTrue(line.equals("1 [33,34,35],[44,45,46]")||line.equals("1 [44,45,46],[33,34,35]"));
// assertEquals(line,"1 [33,34,35],[44,45,46]"); // assertEquals(line,"1 [33,34,35],[44,45,46]");
closesocket(); closesocket();
@ -128,7 +127,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("del mail2"); ausSo.println("del mail2");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertEquals(line,"1 33,34,35"); assertEquals(line,"1 33,34,35");
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -137,7 +136,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("del mail3"); ausSo.println("del mail3");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertEquals(line,"1 44,45,46"); assertEquals(line,"1 44,45,46");
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -146,7 +145,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("get mail2"); ausSo.println("get mail2");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertEquals(line,"0"); assertEquals(line,"0");
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -155,7 +154,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("getall"); ausSo.println("getall");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertEquals(line,"1 [44,45]"); assertEquals(line,"1 [44,45]");
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -164,7 +163,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("put mail2 45,46"); ausSo.println("put mail2 45,46");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertTrue(line.equals("1 ")||line.equals("1")); assertTrue(line.equals("1 ")||line.equals("1"));
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -173,7 +172,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("put mail3 44,46"); ausSo.println("put mail3 44,46");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertTrue(line.equals("1 ")||line.equals("1")); assertTrue(line.equals("1 ")||line.equals("1"));
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");
@ -182,7 +181,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("getall"); ausSo.println("getall");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertTrue(line.equals("1 [44,45],[44,46],[45,46]")||line.equals("1 [44,45],[45,46],[44,46]")||line.equals("1 [44,46],[44,45],[45,46]")||line.equals("1 [44,46],[45,46],[44,45]")||line.equals("1 [45,46],[44,45],[44,46]")||line.equals("1 [45,46],[44,46],[44,45]")||line.equals("1 [44,45,46]")); assertTrue(line.equals("1 [44,45],[44,46],[45,46]")||line.equals("1 [44,45],[45,46],[44,46]")||line.equals("1 [44,46],[44,45],[45,46]")||line.equals("1 [44,46],[45,46],[44,45]")||line.equals("1 [45,46],[44,45],[44,46]")||line.equals("1 [45,46],[44,46],[44,45]")||line.equals("1 [44,45,46]"));
// assertEquals(line,"1 [44,45],[44,46],[45,46]"); // assertEquals(line,"1 [44,45],[44,46],[45,46]");
closesocket(); closesocket();
@ -192,7 +191,7 @@ public class KlausurenServerTest2 {
opensocket(); opensocket();
ausSo.println("stop"); ausSo.println("stop");
line = einSo.readLine(); line = einSo.readLine();
System.out.println(line); //System.out.println(line);
assertTrue(line.equals("1 ")||line.equals("1")); assertTrue(line.equals("1 ")||line.equals("1"));
closesocket(); closesocket();
System.out.println("TEST: OK"+"\n"); System.out.println("TEST: OK"+"\n");