0
@@ -7,7 +7,7 @@
0
 
0
       def run(wcdir)
0
         working_copy = guess_wc(wcdir)
0
-        raise Piston::WorkingCopy::NotWorkingCopy if !working_copy.exist? || !working_copy.pistonized?
0
+        working_copy.validate!
0
         working_copy.info.to_yaml
0
       end
0
     end

0
@@ -7,7 +7,7 @@
0
 
0
       def run(wcdir, lock)
0
         working_copy = guess_wc(wcdir)
0
-        raise Piston::WorkingCopy::NotWorkingCopy if !working_copy.exist? || !working_copy.pistonized?
0
+        working_copy.validate!
0
 
0
         values = working_copy.recall
0
         values["lock"] = lock

0
@@ -7,6 +7,7 @@
0
       # +to+ is the new target revision we want to be at after update returns.
0
       def run(wcdir, to)
0
         working_copy = guess_wc(wcdir)
0
+        working_copy.validate!
0
 
0
         logger.debug {"Recalling previously saved values"}
0
         values = working_copy.recall

0
@@ -54,6 +54,10 @@
0
       yaml_path.exist? && yaml_path.file?
0
     end
0
 
0
+    def validate!
0
+      raise NotWorkingCopy unless self.exist? && self.pistonized?
0
+    end
0
+
0
     # Creates the initial working copy for pistonizing a new repository.
0
     def create
0
       logger.debug {"Creating working copy at #{path}"}

0
@@ -5,29 +5,19 @@
0
     @values = {"lock" => false}
0
     @wcdir = "tmp/wcdir"
0
     @wc = mock("WorkingCopy")
0
+    @wc.stubs(:validate!)
0
   end
0
   
0
   def test_info
0
     run_and_verify do
0
-      @wc.expects(:exist?).returns(true)
0
-      @wc.expects(:pistonized?).returns(true)
0
       @wc.expects(:info)
0
     end
0
   end
0
 
0
-  def test_run_when_directory_not_exist
0
+  def test_validates_working_copy_before_working
0
     assert_raise(Piston::WorkingCopy::NotWorkingCopy) do
0
       run_and_verify do
0
-        @wc.expects(:exist?).returns(false)
0
-      end
0
-    end
0
-  end
0
-  
0
-  def test_run_when_directory_exist_but_yml_not_exit
0
-    assert_raise(Piston::WorkingCopy::NotWorkingCopy) do
0
-      run_and_verify do
0
-        @wc.expects(:exist?).returns(true)
0
-        @wc.expects(:pistonized?).returns(false)
0
+        @wc.expects(:validate!).raises(Piston::WorkingCopy::NotWorkingCopy)
0
       end
0
     end
0
   end

0
@@ -5,12 +5,11 @@
0
     @values = {"lock" => false}
0
     @wcdir = "tmp/wcdir"
0
     @wc = mock("WorkingCopy")
0
+    @wc.stubs(:validate!)
0
   end
0
-  
0
+
0
   def test_lock_working_copy
0
     run_and_verify(true) do
0
-      @wc.expects(:exist?).returns(true)
0
-      @wc.expects(:pistonized?).returns(true)
0
       @wc.expects(:recall).returns(@values)
0
       @wc.expects(:finalize).returns(@values)
0
       @wc.expects(:remember).with(@values.merge("lock" => true), @values["handler"]).returns(@values)
0
0
0
@@ -19,27 +18,16 @@
0
 
0
   def test_unlock_working_copy
0
     run_and_verify(false) do
0
-      @wc.expects(:exist?).returns(true)
0
-      @wc.expects(:pistonized?).returns(true)
0
       @wc.expects(:recall).returns(@values)
0
       @wc.expects(:finalize).returns(@values)
0
       @wc.expects(:remember).with(@values.merge("lock" => false), @values["handler"]).returns(@values)
0
     end
0
   end
0
-  
0
-  def test_run_when_directory_not_exist
0
+
0
+  def test_validates_working_copy_before_working
0
     assert_raise(Piston::WorkingCopy::NotWorkingCopy) do
0
       run_and_verify do
0
-        @wc.expects(:exist?).returns(false)
0
-      end
0
-    end
0
-  end
0
-  
0
-  def test_run_when_directory_exist_but_yml_not_exit
0
-    assert_raise(Piston::WorkingCopy::NotWorkingCopy) do
0
-      run_and_verify do
0
-        @wc.expects(:exist?).returns(true)
0
-        @wc.expects(:pistonized?).returns(false)
0
+        @wc.expects(:validate!).raises(Piston::WorkingCopy::NotWorkingCopy)
0
       end
0
     end
0
   end