Merge 98dbe9c10a4a43862c20723f0c31cc534ce15d4d into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

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

@@ -24,6 +24,33 @@ public class MonkeyTypewriter {
         // For each Copier(one safe and one unsafe), create and start 5 monkeys copying the introduction to
         // A Tale Of Two Cities.
 
+        Copier testCopier = new UnsafeCopier(introduction);
+        Thread monkeyThread1 = new Thread(testCopier);
+        Thread monkeyThread2 = new Thread(testCopier);
+        Thread monkeyThread3 = new Thread(testCopier);
+        Thread monkeyThread4 = new Thread(testCopier);
+        Thread monkeyThread5 = new Thread(testCopier);
+
+        monkeyThread1.start();
+        monkeyThread2.start();
+        monkeyThread3.start();
+        monkeyThread4.start();
+        monkeyThread5.start();
+
+        Copier testSafeCopier = new SafeCopier(introduction);
+        Thread monkeyEmille = new Thread(testSafeCopier);
+        Thread monkeyHenry= new Thread(testSafeCopier);
+        Thread monkeyGeorge = new Thread(testSafeCopier);
+        Thread monkeyBob = new Thread(testSafeCopier);
+        Thread monkeyAlex = new Thread(testSafeCopier);
+
+        monkeyEmille.start();
+        monkeyHenry.start();
+        monkeyGeorge.start();
+        monkeyBob.start();
+        monkeyAlex.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.
@@ -34,5 +61,9 @@ public class MonkeyTypewriter {
         }
 
         // Print out the copied versions here.
+        System.out.println("------------UnsafeCopier------------");
+        System.out.println(testCopier.copied);
+        System.out.println("------------SafeCopier--------------");
+        System.out.println(testSafeCopier.copied);
     }
 }

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

@@ -1,8 +1,36 @@
 package io.zipcoder;
 
+import java.util.concurrent.TimeUnit;
+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 {
+    Lock sharedLock = new ReentrantLock();
+    public SafeCopier(String toCopy){
+        super(toCopy);
+    }
+
+    public void run() {
+        boolean keepGoing = true;
+        try {
+            TimeUnit.MILLISECONDS.sleep(30);
+        } catch (InterruptedException e){
+            e.printStackTrace();
+        }
+        while(keepGoing){
+            if(sharedLock.tryLock()){
+                if (stringIterator.hasNext()){
+                    copied += stringIterator.next() + " " + Thread.currentThread().getName() + " ";
+                } else keepGoing = false;
+                sharedLock.unlock();
+            }
+
+        }
+
+
+    }
 }

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

@@ -10,5 +10,9 @@ public class UnsafeCopier extends Copier {
     }
 
     public void run() {
+        while (stringIterator.hasNext()) {
+            copied += stringIterator.next() + " ";
+        }
+
     }
 }

src/test/java/io/zipcoder/SafeCopierTest.java

@@ -0,0 +1,41 @@
+//package io.zipcoder;
+//
+//
+//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 safeCopyRunTest(){
+//        SafeCopier testCopier = new SafeCopier(intro);
+//        String expected = intro;
+//        String actual = testCopier.run();
+//
+//        Assert.assertEquals(expected,actual);
+//
+//    }
+//  YAY learned to make test directory!
+//}