working on first version that really works in Android

Author: thsc42

src/net/sharksystem/asp3/ASP3Engine.java

@@ -92,7 +92,8 @@ private String getLogStart() {
     } 
 
     @Override
-    public void handleConnection(InputStream is, OutputStream os) {
+    public void handleConnection(InputStream is, OutputStream os,
+            ASP3ReceivedChunkListener listener) {
 
         DataInputStream dis = new DataInputStream(is);
         DataOutputStream dos = new DataOutputStream(os);

src/net/sharksystem/asp3/ASP3ProtocolEngine.java

@@ -9,6 +9,6 @@
  * @author thsc
  */
 interface ASP3ProtocolEngine {
-    public void handleConnection(InputStream is, OutputStream os) 
-            throws IOException;
+    public void handleConnection(InputStream is, OutputStream os,
+            ASP3ReceivedChunkListener listener) throws IOException;
 }

src/net/sharksystem/asp3/ASP3ReceivedChunkListener.java

@@ -0,0 +1,9 @@
+package net.sharksystem.asp3;
+
+/**
+ *
+ * @author thsc
+ */
+public interface ASP3ReceivedChunkListener {
+    public void chunkReceived(String sender, String Uri, int era);
+}

test/ASP3ChunkReceiverTester.java

@@ -0,0 +1,35 @@
+
+import net.sharksystem.asp3.ASP3ReceivedChunkListener;
+
+/**
+ *
+ * @author thsc
+ */
+public class ASP3ChunkReceiverTester implements ASP3ReceivedChunkListener {
+    private String sender = null;
+    private String uri = null;
+    private int era;
+
+    @Override
+    public void chunkReceived(String sender, String Uri, int era) {
+        this.sender = sender;
+        this.uri = Uri;
+        this.era = era;
+    }
+    
+    public boolean chunkReceived() {
+        return this.sender != null;
+    }
+
+    String getSender() {
+        return this.sender;
+    }
+    
+    String getUri() {
+        return this.uri;
+    }
+    
+    int getEra() {
+        return this.era;
+    }
+}

test/ASP3EngineThread.java

@@ -1,7 +1,11 @@
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import net.sharksystem.asp3.ASP3Engine;
+import net.sharksystem.asp3.ASP3ReceivedChunkListener;
 
 /**
  *
@@ -12,15 +16,19 @@ public class ASP3EngineThread extends Thread {
     private final ASP3Engine engine;
     private final InputStream is;
     private final OutputStream os;
+    private ASP3ReceivedChunkListener listener;
 
-    ASP3EngineThread(ASP3Engine engine, InputStream is, OutputStream os) {
+    ASP3EngineThread(ASP3Engine engine, InputStream is, 
+            OutputStream os, ASP3ReceivedChunkListener listener) {
+        
         this.engine = engine;
         this.is = is;
         this.os = os;
+        this.listener = listener;
     }
 
     @Override
     public void run() {
-        this.engine.handleConnection(is, os);
+            this.engine.handleConnection(this.is, this.os, this.listener);
     }
 }

test/BasicTests.java

@@ -6,12 +6,15 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import net.sharksystem.asp3.ASP3Chunk2Send;
 import net.sharksystem.asp3.ASP3Engine;
 import net.sharksystem.asp3.ASP3EngineFS;
 import net.sharksystem.asp3.ASP3Exception;
 import net.sharksystem.util.localloop.TCPChannel;
 import org.junit.Test;
 import net.sharksystem.asp3.ASP3ChunkStorage;
+import net.sharksystem.asp3.ASP3ReceivedChunkListener;
+import net.sharksystem.asp3.ASP3Storage;
 import org.junit.Assert;
 
 /**
@@ -94,14 +97,15 @@ public void usage() throws IOException, ASP3Exception, InterruptedException {
        aliceChannel.waitForConnection();
        bobChannel.waitForConnection();
 
-       // twist and run
+       // run
        ASP3EngineThread aliceEngineThread = new ASP3EngineThread(aliceEngine, 
                aliceChannel.getInputStream(),
-               aliceChannel.getOutputStream());
+               aliceChannel.getOutputStream(), null);
 
        aliceEngineThread.start();
 
-       bobEngine.handleConnection(bobChannel.getInputStream(), bobChannel.getOutputStream());
+       bobEngine.handleConnection(bobChannel.getInputStream(), 
+               bobChannel.getOutputStream(), null);
 
        Thread.sleep(10000);
 
@@ -124,7 +128,7 @@ public void usage() throws IOException, ASP3Exception, InterruptedException {
     }
 
     @Test
-    public void androidUsage() throws IOException, ASP3Exception {
+    public void androidUsage() throws IOException, ASP3Exception, InterruptedException {
        this.removeDirectory(ALICE_FOLDER); // clean previous version before
        this.removeDirectory(BOB_FOLDER); // clean previous version before
 
@@ -145,18 +149,63 @@ public void androidUsage() throws IOException, ASP3Exception {
 
         ASP3Engine bobEngine = ASP3EngineFS.getASP3Engine("Bob", BOB_FOLDER);
 
-        /*
+        ASP3ChunkReceiverTester aliceListener = new ASP3ChunkReceiverTester();
+        ASP3ChunkReceiverTester bobListener = new ASP3ChunkReceiverTester();
+
+        // create connections for both sides
         TCPChannel aliceChannel = new TCPChannel(7777, true, "a2b");
         TCPChannel bobChannel = new TCPChannel(7777, false, "b2a");
 
         aliceChannel.start();
         bobChannel.start();
 
+        // wait to connect
         aliceChannel.waitForConnection();
         bobChannel.waitForConnection();
-*/
-       
+        
+        // run engine as thread
+        ASP3EngineThread aliceEngineThread = new ASP3EngineThread(aliceEngine, 
+                aliceChannel.getInputStream(),
+                aliceChannel.getOutputStream(),
+                aliceListener);
+
+        aliceEngineThread.start();
+
+        // and better debugging - no new thread
+        bobEngine.handleConnection(bobChannel.getInputStream(), 
+                bobChannel.getOutputStream(), bobListener);
+
+        // wait until communication end
+        Thread.sleep(10000);
+        
+        // listener must have been informed about new messages
+        Assert.assertTrue(aliceListener.chunkReceived());
+        Assert.assertTrue(bobListener.chunkReceived());
+
+        // get message alice received
+        ASP3Storage aliceSenderStored = 
+                aliceStorage.getReceivedChunkStorage(aliceListener.getSender());
+        
+        ASP3Chunk2Send aliceReceivedChunk = 
+                aliceSenderStored.getChunk(aliceListener.getUri(), 
+                        aliceListener.getEra());
+        
+        CharSequence aliceReceivedMessage = 
+                aliceReceivedChunk.getMessages().next();
+        
+        Assert.assertEquals(BOB2ALICE_MESSAGE, aliceReceivedMessage);
 
+        // get message bob received
+        ASP3Storage bobSenderStored = 
+                bobStorage.getReceivedChunkStorage(bobListener.getSender());
+        
+        ASP3Chunk2Send bobReceivedChunk = 
+                bobSenderStored.getChunk(bobListener.getUri(), 
+                        bobListener.getEra());
+        
+        CharSequence bobReceivedMessage = 
+                bobReceivedChunk.getMessages().next();
 
+        Assert.assertEquals(ALICE2BOB_MESSAGE, bobReceivedMessage);
     }
 }