--- a/RegressionTests__ServerSocketTest.st	Tue Apr 09 15:24:28 2013 +0200
+++ b/RegressionTests__ServerSocketTest.st	Tue Apr 09 18:45:10 2013 +0200
@@ -50,22 +50,29 @@
 testServerSocket
     "Tests if we can open a server socket"
 
-    self shouldnt: [
-        |sock|
+    |serverListenSocket serverSocket clientSocket|
+
+    serverListenSocket := Socket newTCPserverAtPort:9998.
+    self assert:serverListenSocket notNil.
+    serverListenSocket listenFor:1.
 
-        sock := Socket newTCPclientToHost:(OperatingSystem getHostName) port:9998.
-        sock isNil ifTrue:[
-            Transcript showCR:'nope'.
-            Error raise.
-        ] ifFalse:[
-            sock buffered:false.
-            Transcript showCR:'client: got it'.
-            'can now do transfer via sock'.
-            Transcript showCR:'sending <hello>'.
-            sock nextPutLine:'hello'.
-            sock close
-        ]
- ] raise:Error.
+    clientSocket := Socket newTCPclientToHost:'localhost' port:9998.
+    self assert:clientSocket notNil. 
+    clientSocket buffered:false.
+    Transcript showCR:'client: socket connected it'.
+    'can now do transfer via sock'.
+    Transcript showCR:'sending <hello>'.
+    clientSocket nextPutLine:'hello'.
+
+    serverSocket := serverListenSocket accept.
+    self assert:serverSocket notNil.
+    self assert:(serverSocket nextLine = 'hello').
+
+    clientSocket close.
+    serverSocket close.
+    serverListenSocket close.
+
+        
 
     "
      self run:#test1
@@ -78,3 +85,4 @@
 version
     ^ '$Header$'
 ! !
+