Fix StateMachine to properly inherit from BatchActor

Remove WsClient.close

6 files changed, 7 insertions, 9 deletions

diff --git a/cask/util/src/cask/util/BatchActor.scala b/cask/util/src/cask/util/BatchActor.scala
index fd4861e..4985fc3 100644
--- a/cask/util/src/cask/util/BatchActor.scala
+++ b/cask/util/src/cask/util/BatchActor.scala
@@ -36,9 +36,9 @@ abstract class BatchActor[T]()(implicit ec: ExecutionContext,
   }
 }
 
-abstract class StateMachine[T]()
-                              (implicit ec: ExecutionContext,
-                               log: Logger) {
+abstract class StateMachineActor[T]()
+                                   (implicit ec: ExecutionContext,
+                                    log: Logger) extends BatchActor[T](){
   class State(val run: T => State)
   protected[this] def initialState: State
   protected[this] var state: State = initialState
diff --git a/cask/util/src/cask/util/WsClient.scala b/cask/util/src/cask/util/WsClient.scala
index 6ba039e..fbde444 100644
--- a/cask/util/src/cask/util/WsClient.scala
+++ b/cask/util/src/cask/util/WsClient.scala
@@ -13,8 +13,6 @@ class WsClient(impl: WebsocketBase)
     case Ws.Close(_, _) => impl.close()
     case Ws.ChannelClosed() => impl.close()
   }
-    
-  def close(code: Int = 1005, reason: String = "") = this.send(Ws.Close(code, reason))
 }
 
 object WsClient{
diff --git a/example/websockets/app/test/src/ExampleTests.scala b/example/websockets/app/test/src/ExampleTests.scala
index 413937d..4ab6688 100644
--- a/example/websockets/app/test/src/ExampleTests.scala
+++ b/example/websockets/app/test/src/ExampleTests.scala
@@ -46,7 +46,7 @@ object ExampleTests extends TestSuite{
         }
         assert(ex.getMessage.contains("403"))
 
-      }finally ws.close()
+      }finally ws.send(cask.Ws.Close())
     }
 
     test("Websockets2000") - withServer(Websockets){ host =>
diff --git a/example/websockets2/app/test/src/ExampleTests.scala b/example/websockets2/app/test/src/ExampleTests.scala
index 61038c5..4d70f28 100644
--- a/example/websockets2/app/test/src/ExampleTests.scala
+++ b/example/websockets2/app/test/src/ExampleTests.scala
@@ -42,7 +42,7 @@ object ExampleTests extends TestSuite{
           }
         )
         assert(ex.getMessage.contains("403"))
-      }finally ws.close()
+      }finally ws.send(cask.Ws.Close())
     }
 
     test("Websockets2000") - withServer(Websockets2){ host =>
diff --git a/example/websockets3/app/test/src/ExampleTests.scala b/example/websockets3/app/test/src/ExampleTests.scala
index ed1242d..00665d5 100644
--- a/example/websockets3/app/test/src/ExampleTests.scala
+++ b/example/websockets3/app/test/src/ExampleTests.scala
@@ -43,7 +43,7 @@ object ExampleTests extends TestSuite{
           }
         )
         assert(ex.getMessage.contains("403"))
-      }finally ws.close()
+      }finally ws.send(cask.Ws.Close())
     }
   }
 }
diff --git a/example/websockets4/app/test/src/ExampleTests.scala b/example/websockets4/app/test/src/ExampleTests.scala
index f122228..a2c793b 100644
--- a/example/websockets4/app/test/src/ExampleTests.scala
+++ b/example/websockets4/app/test/src/ExampleTests.scala
@@ -43,7 +43,7 @@ object ExampleTests extends TestSuite{
           }
         )
         assert(ex.getMessage.contains("403"))
-      }finally ws.close()
+      }finally ws.send(cask.Ws.Close())
     }
   }
 }