Test

src/Test/Java/zipcoder/SafeCopierTest.java

@@ -1,4 +1,57 @@
 package zipcoder;
 
+import io.zipcoder.SafeCopier;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 public class SafeCopierTest {
+    String intro;
+        @Before
+        public void setUp() {
+            intro = "It was the best of times,\n" +
+                    "it was the blurst of times,\n" +
+                    "it was the age of wisdom,\n" +
+                    "it was the age of foolishness,\n" +
+                    "it was the epoch of belief,\n" +
+                    "it was the epoch of incredulity,\n" +
+                    "it was the season of Light,\n" +
+                    "it was the season of Darkness,\n" +
+                    "it was the spring of hope,\n" +
+                    "it was the winter of despair,\n" +
+                    "we had everything before us,\n" +
+                    "we had nothing before us,\n" +
+                    "we were all going direct to Heaven,\n" +
+                    "we were all going direct the other way--\n" +
+                    "in short, the period was so far like the present period, that some of\n" +
+                    "its noisiest authorities insisted on its being received, for good or for\n" +
+                    "evil, in the superlative degree of comparison only. ";
+    }
+
+    @Test
+    public void safeTest() {
+        SafeCopier safeCopierTest = new SafeCopier(intro);
+
+        Thread monkey = new Thread(safeCopierTest);
+        Thread monkey1 = new Thread(safeCopierTest);
+        Thread monkey2 = new Thread(safeCopierTest);
+        Thread monkey3 = new Thread(safeCopierTest);
+        Thread monkey4 = new Thread(safeCopierTest);
+
+        monkey.start();
+        monkey1.start();
+        monkey2.start();
+        monkey3.start();
+        monkey4.start();
+
+        try {
+            Thread.sleep(1000);
+        } catch(InterruptedException e) {
+            System.out.println("MAIN INTERRUPTED");
+        }
+
+        String testString = safeCopierTest.copied;
+
+        Assert.assertEquals(intro, testString);
+    }
 }

src/main/java/io/zipcoder/MonkeyTypewriter.java

@@ -1,7 +1,9 @@
 package io.zipcoder;
 
 public class MonkeyTypewriter {
+
     public static void main(String[] args) {
+
         String introduction = "It was the best of times,\n" +
                 "it was the blurst of times,\n" +
                 "it was the age of wisdom,\n" +
@@ -25,18 +27,40 @@ public class MonkeyTypewriter {
         // A Tale Of Two Cities.
 
         UnsafeCopier unsafeCopier = new UnsafeCopier(introduction);
+        SafeCopier safeCopier = new SafeCopier(introduction);
+
+        Thread[] unsafeMonkey = new Thread[5];
+        Thread[] safeMonkey = new Thread[5];
+
+        for (int i = 0; i < unsafeMonkey.length; i++) {
+            unsafeMonkey[i] = new Thread(unsafeCopier);
+            safeMonkey[i] = new Thread(safeCopier);
+        }
+
+        for (Thread thread : unsafeMonkey) {
+                thread.start();
+            }
+            for (Thread thread : safeMonkey) {
+                thread.start();
+            }
 
-        Thread monkey = new Thread(unsafeCopier);
-        Thread monkey1 = new Thread(unsafeCopier);
-        Thread monkey2 = new Thread(unsafeCopier);
-        Thread monkey3 = new Thread(unsafeCopier);
-        Thread monkey4 = new Thread(unsafeCopier);
+//       while ( unsafeCopier.stringIterator.hasNext() || safeCopier.stringIterator.hasNext()) {
+//
+//            for (int i = 0; i < unsafeMonkey.length; i++) {
+//                unsafeMonkey[i] = new Thread(unsafeCopier);
+//                safeMonkey[i] = new Thread(safeCopier);
+//            }
+//
+//            for (Thread thread : unsafeMonkey) {
+//                thread.start();
+//            }
+//            for (Thread thread : safeMonkey) {
+//                thread.start();
+//            }
+//
+//
+//        }
 
-        monkey.start();
-        monkey1.start();
-        monkey2.start();
-        monkey3.start();
-        monkey4.start();
 
         // This wait is here because main is still a thread and we want the main method to print the finished copies
         // after enough time has passed.
@@ -45,9 +69,15 @@ public class MonkeyTypewriter {
         } catch(InterruptedException e) {
             System.out.println("MAIN INTERRUPTED");
         }
-
+        System.out.println("_________________________UNSAFE_TEST__________________________________");
         System.out.println(unsafeCopier.copied);
 
+        System.out.println("_________________________SAFE_TEST____________________________________");
+        System.out.println(safeCopier.copied);
+
+
+
+
         // Print out the copied versions here.
     }
 }

src/main/java/io/zipcoder/SafeCopier.java

@@ -1,8 +1,37 @@
 package io.zipcoder;
 
+import sun.nio.ch.ThreadPool;
+
+import java.util.NoSuchElementException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * Make this extend the Copier like `UnsafeCopier`, except use locks to make sure that the actual intro gets printed
  * correctly every time.  Make the run method thread safe.
  */
-public class SafeCopier {
+public class SafeCopier extends Copier{
+
+    private Lock sharedLock = new ReentrantLock();
+
+    public SafeCopier(String toCopy) {
+
+        super(toCopy);
+    }
+
+    public void run() {
+
+
+        while (stringIterator.hasNext()) {
+            sharedLock.lock();
+            try {
+                copied += (stringIterator.next()) + " " ;
+            } catch (NoSuchElementException e) {
+
+            } finally {
+                sharedLock.unlock();
+            }
+        }
+
+    }
 }

src/main/java/io/zipcoder/UnsafeCopier.java

@@ -10,7 +10,7 @@ public class UnsafeCopier extends Copier {
         super(toCopy);
 
     }
-    @Override
+
     public void run() {
 
         while(stringIterator.hasNext()) {