Integration tests

Author: 2nolife

src/it/scala/client.scala

@@ -92,13 +92,13 @@ class FtpClient(val ftpstate: FtpState) extends Matchers {
       case _ => throw new IllegalStateException("Failed to receive server reply")
     }
 
-  /** send a file to the server and get the data sent */
-  def <==(filename: String, data: Array[Byte]): (Long, Array[Byte]) = {
+  /** send a data to the server and get the data sent */
+  private def sendData(command: String, data: Array[Byte]): (Long, Array[Byte]) = {
     if (portOrPasv.isEmpty) pasvMode()
     val in = new ByteArrayInputStream(data)
     val ref = system.actorOf(DataConnector.props(this), name = "data")
     val x = dconSuccess(ref ? DataConnector.Send(Channels.newChannel(in), portOrPasv.get))
-    (this <-- s"STOR $filename").code shouldBe 150
+    (this <-- command).code shouldBe 150
     val t = Await.result(x, timeout.duration)
     delay(100 milliseconds)
     replies.head.code shouldBe 226
@@ -107,27 +107,29 @@ class FtpClient(val ftpstate: FtpState) extends Matchers {
   }
 
   /** retrieve a file from the server and get the data retrieved */
-  def <==(filename: String): (Long, Array[Byte]) = {
+  private def readData(command: String): (Long, Array[Byte]) = {
     if (portOrPasv.isEmpty) pasvMode()
     val ref = system.actorOf(DataConnector.props(this), name = "data")
     val x = dconSuccess(ref ? DataConnector.Receive(portOrPasv.get))
-    (this <-- s"RETR $filename").code shouldBe 150
+    (this <-- command).code shouldBe 150
     val t = Await.result(x, timeout.duration)
     delay(100 milliseconds)
     replies.head.code shouldBe 226
     portOrPasv = None
     t
   }
 
+  def <==(filename: String, data: Array[Byte]): (Long, Array[Byte]) =
+    sendData(s"STOR $filename", data)
+
+  def appe(filename: String, data: Array[Byte]): (Long, Array[Byte]) =
+    sendData(s"APPE $filename", data)
+
+  def <==(filename: String): (Long, Array[Byte]) =
+    readData(s"RETR $filename")
+
   def list(command: String): (Long, String) = {
-    if (portOrPasv.isEmpty) pasvMode()
-    val ref = system.actorOf(DataConnector.props(this), name = "data")
-    val x = dconSuccess(ref ? DataConnector.Receive(portOrPasv.get))
-    (this <-- command).code shouldBe 150
-    val t = Await.result(x, timeout.duration)
-    delay(100 milliseconds)
-    replies.head.code shouldBe 226
-    portOrPasv = None
+    val t = readData(command)
     (t._1, new String(t._2))
   }
 }

src/it/scala/simple_scenario_test.scala renamed to src/it/scala/flow_test.scala

@@ -53,8 +53,6 @@ class LoginLogoutSpec extends WordSpec with BeforeAndAfterAll with Matchers {
     }
   }
 
-  //todo RETR, STOR, APPE, REST (with TYPE A/I)
-
   // logout
   "QUIT command" should {
     "log user out and disconnect" in {
@@ -490,48 +488,34 @@ class FileTransferSpec extends WordSpec with BeforeAndAfterAll with Matchers wit
   }
 
   "STOR command" should {
-    "send file with type A" in {
+    "send file with type A (unix server)" in {
       ((client <-- "TYPE A") code) should be (200)
+      val senddata = "\r\nline1\r\nline2\n\nline3\n"
       val expected = "\nline1\nline2\n\nline3\n"
-      client <== ("my-multiline.txt", expected.getBytes)
+      client <== ("my-multiline.txt", senddata.getBytes)
       server.fileData("/my-multiline.txt") should be (expected.getBytes)
     }
     "send file with type I" in {
       ((client <-- "TYPE I") code) should be (200)
-      val expected = "\nline1\nline2\n\nline3\n"
+      val expected = "\r\nline1\r\nline2\n\nline3\n"
       client <== ("my-multiline-2.txt", expected.getBytes)
       server.fileData("/my-multiline-2.txt") should be (expected.getBytes)
     }
   }
 
-}
-
-/*
-class FailedSpec extends WordSpec with BeforeAndAfterAll with Matchers with CreateSampleFiles {
-
-  val server = new FtpServer
-  lazy val client = new FtpClient(server.ftpstate)
-
-  override protected def beforeAll() {
-    server.start()
-    createSampleFiles()
-    client.connect()
-    client.login("myuser", "myuser")
-  }
-
-  override protected def afterAll() {
-    client.disconnect()
-    server.stop()
-  }
-
-  "STOR command" should {
-    "send file with type A" in {
+  "APPE command" should {
+    "error on append with type A" in {
       ((client <-- "TYPE A") code) should be (200)
-      val expected = "\nline1\nline2\n\nline3\n"
-      client.pasvMode()
-      client <== ("my-multiline.txt", expected.getBytes)
+      ((client <-- "APPE /dirA/digits10.dat") code) should be (550)
+    }
+    "send file with type I" in {
+      ((client <-- "TYPE I") code) should be (200)
+      val expected = "1234567890-abc\r\n\n"
+      client appe ("/dirA/digits10.dat", "-abc\r\n\n".getBytes)
+      server.fileData("/dirA/digits10.dat") should be (expected.getBytes)
     }
   }
 
 }
-*/
+
+//todo STAT ABOR QUIT with and without active data connection

src/it/scala/server.scala

@@ -86,6 +86,7 @@ class MemoryFile(val path: String, fs: MemoryFileSystem) extends File {
 
   override def write(append: Boolean): WritableByteChannel = {
     out = new ByteArrayOutputStream
+    if (append) out.write(fdata)
     Channels.newChannel(out)
   }