Tests: improve patch.lua tests

5 files changed, 180 insertions, 81 deletions

diff --git a/spec/fixtures/invalid_patch.patch b/spec/fixtures/invalid_patch.patch
deleted file mode 100644
index 75d05c58..00000000
--- a/spec/fixtures/invalid_patch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lao 2002-02-21 23:30:39.942229878 -0800
-+++ tzu 2002-02-21 23:30:50.442260588 -0800
-@@ -1,7 +1,6 @@
--The Way that can be told of is not the eternal Way;
--The name that can be named is not the eternal name.
- The Nameless is the origin of Heaven and Earth;
--The Named is the mother of all things.
-+The named is the mother of all things.
-+
-?
- Therefore let there always be non-being,
-   so we may see their subtlety,
- And let there always be being,
-@@ -9,3 +8,7 @@
- The two are the same,
- But after they are produced,
-   they have different names.
-+They both may be called deep and profound.
-+Deeper and more profound,
-+The door of all subtleties!
diff --git a/spec/fixtures/lao b/spec/fixtures/lao
deleted file mode 100644
index 635ef2c4..00000000
--- a/spec/fixtures/lao
+++ /dev/null
@@ -1,11 +0,0 @@
-The Way that can be told of is not the eternal Way;
-The name that can be named is not the eternal name.
-The Nameless is the origin of Heaven and Earth;
-The Named is the mother of all things.
-Therefore let there always be non-being,
-  so we may see their subtlety,
-And let there always be being,
-  so we may see their outcome.
-The two are the same,
-But after they are produced,
-  they have different names.
diff --git a/spec/fixtures/tzu b/spec/fixtures/tzu
deleted file mode 100644
index 5af88a8f..00000000
--- a/spec/fixtures/tzu
+++ /dev/null
@@ -1,13 +0,0 @@
-The Nameless is the origin of Heaven and Earth;
-The named is the mother of all things.
-
-Therefore let there always be non-being,
-  so we may see their subtlety,
-And let there always be being,
-  so we may see their outcome.
-The two are the same,
-But after they are produced,
-  they have different names.
-They both may be called deep and profound.
-Deeper and more profound,
-The door of all subtleties!
diff --git a/spec/fixtures/valid_patch.patch b/spec/fixtures/valid_patch.patch
deleted file mode 100644
index 042c7d22..00000000
--- a/spec/fixtures/valid_patch.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lao 2002-02-21 23:30:39.942229878 -0800
-+++ tzu 2002-02-21 23:30:50.442260588 -0800
-@@ -1,7 +1,6 @@
--The Way that can be told of is not the eternal Way;
--The name that can be named is not the eternal name.
- The Nameless is the origin of Heaven and Earth;
--The Named is the mother of all things.
-+The named is the mother of all things.
-+
- Therefore let there always be non-being,
-   so we may see their subtlety,
- And let there always be being,
-@@ -9,3 +8,6 @@
- The two are the same,
- But after they are produced,
-   they have different names.
-+They both may be called deep and profound.
-+Deeper and more profound,
-+The door of all subtleties!
diff --git a/spec/tools_spec.lua b/spec/tools_spec.lua
index 7717be08..8805d703 100644
--- a/spec/tools_spec.lua
+++ b/spec/tools_spec.lua
@@ -1,12 +1,149 @@
 local test_env = require("spec.util.test_env")
-local testing_paths = test_env.testing_paths
 local get_tmp_path = test_env.get_tmp_path
+local testing_paths = test_env.testing_paths
 local write_file = test_env.write_file
 
 test_env.unload_luarocks()
 local fs = require("luarocks.fs")
 local patch = package.loaded["luarocks.tools.patch"]
 
+local lao = 
+[[The Nameless is the origin of Heaven and Earth;
+The named is the mother of all things.
+
+Therefore let there always be non-being,
+  so we may see their subtlety,
+And let there always be being,
+  so we may see their outcome.
+The two are the same,
+But after they are produced,
+  they have different names.
+They both may be called deep and profound.
+Deeper and more profound,
+The door of all subtleties!]]
+
+local tzu = 
+[[The Way that can be told of is not the eternal Way;
+The name that can be named is not the eternal name.
+The Nameless is the origin of Heaven and Earth;
+The Named is the mother of all things.
+Therefore let there always be non-being,
+  so we may see their subtlety,
+And let there always be being,
+  so we may see their outcome.
+The two are the same,
+But after they are produced,
+  they have different names.]]
+
+local valid_patch1 = 
+[[--- lao       2002-02-21 23:30:39.942229878 -0800
++++ tzu 2002-02-21 23:30:50.442260588 -0800
+@@ -1,7 +1,6 @@
+-The Way that can be told of is not the eternal Way;
+-The name that can be named is not the eternal name.
+ The Nameless is the origin of Heaven and Earth;
+-The Named is the mother of all things.
++The named is the mother of all things.
++
+ Therefore let there always be non-being,
+   so we may see their subtlety,
+ And let there always be being,
+@@ -9,3 +8,6 @@
+ The two are the same,
+ But after they are produced,
+   they have different names.
++They both may be called deep and profound.
++Deeper and more profound,
++The door of all subtleties!]]
+
+local valid_patch2 = 
+[[--- /dev/null 1969-02-21 23:30:39.942229878 -0800
++++ tzu 2002-02-21 23:30:50.442260588 -0800
+@@ -1,7 +1,6 @@
+-The Way that can be told of is not the eternal Way;
+-The name that can be named is not the eternal name.
+ The Nameless is the origin of Heaven and Earth;
+-The Named is the mother of all things.
++The named is the mother of all things.
++
+ Therefore let there always be non-being,
+   so we may see their subtlety,
+ And let there always be being,
+@@ -9,3 +8,6 @@
+ The two are the same,
+ But after they are produced,
+   they have different names.
++They both may be called deep and profound.
++Deeper and more profound,
++The door of all subtleties!]]
+
+local invalid_patch1 = 
+[[--- lao       2002-02-21 23:30:39.942229878 -0800
++++ tzu 2002-02-21 23:30:50.442260588 -0800
+@@ -1,7 +1,6 @@
+-The Way that can be told of is not the eternal Way;
+-The name that can be named is not the eternal name.
+ The Nameless is the origin of Heaven and Earth;
+-The Named is the mother of all things.
+--- Extra
++The named is the mother of all things.
++
+ Therefore let there always be non-being,
+   so we may see their subtlety,
+ And let there always be being,
+--- Extra
+@@ -9,3 +8,7 @@
+ The two are the same,
+ But after they are produced,
+   they have different names.
++They both may be called deep and profound.
++Deeper and more profound,
++The door of all subtleties!]]
+
+local invalid_patch2 = 
+[[--- lao       2002-02-21 23:30:39.942229878 -0800
++++   tzu       2002-02-21 23:30:50.442260588 -0800
+@@ -1,7 +1,6 @@
+-The Way that can be told of is not the eternal Way;
+-The name that can be named is not the eternal name.
+ The Nameless is the origin of Heaven and Earth;
+-The Named is the mother of all things.
++The named is the mother of all things.
++
+ Therefore let there always be non-being,
+   so we may see their subtlety,
+ And let there always be being,
+@@ -9,3 +8,6 @@
+ The two are the same,
+ But after they are produced,
+   they have different names.
++They both may be called deep and profound.
++Deeper and more profound,
+? ...
++The door of all subtleties!]]
+
+local invalid_patch3 = 
+[[---     lao   2002-02-21 23:30:39.942229878 -0800
++++ tzu 2002-02-21 23:30:50.442260588 -0800
+@@ -1,7 +1,6 @@
+-The Way that can be told of is not the eternal Way;
+-The name that can be named is not the eternal name.
+ The Nameless is the origin of Heaven and Earth;
+-The Named is the mother of all things.
++The named is the mother of all things.
++
+ Therefore let there always be non-being,
+   so we may see their subtlety,
+ And let there always be being,
+@@ -9,3 +8,6 @@
+ The two are the same,
+ But after they are produced,
+   they have different names.
++They both may be called deep and profound.
++Deeper and more profound,
+? ...
++The door of all subtleties!]]
+
 describe("Luarocks patch test #unit", function()
    local runner
    
@@ -24,11 +161,25 @@ describe("Luarocks patch test #unit", function()
       it("returns a table with the patch file info and the result of parsing the file", function()
          local t, result
          
-         t, result = patch.read_patch(testing_paths.fixtures_dir .. "/valid_patch.patch")
+         write_file("test.patch", valid_patch1, finally)
+         t, result = patch.read_patch("test.patch")
          assert.truthy(result)
+         assert.truthy(t)
+         
+         write_file("test.patch", invalid_patch1, finally)
+         t, result = patch.read_patch("test.patch")
+         assert.falsy(result)
+         assert.truthy(t)
+         
+         write_file("test.patch", invalid_patch2, finally)
+         t, result = patch.read_patch("test.patch")
+         assert.falsy(result)
+         assert.truthy(t)
          
-         t, result = patch.read_patch(testing_paths.fixtures_dir .. "/invalid_patch.patch")
+         write_file("test.patch", invalid_patch3, finally)
+         t, result = patch.read_patch("test.patch")
          assert.falsy(result)
+         assert.truthy(t)
       end)
    end)
    
@@ -42,15 +193,8 @@ describe("Luarocks patch test #unit", function()
          lfs.mkdir(tmpdir)
          lfs.chdir(tmpdir)
          
-         local fd = assert(io.open(testing_paths.fixtures_dir .. "/lao"))
-         local laocontent = assert(fd:read("*a"))
-         fd:close()
-         write_file("lao", laocontent, finally)
-         
-         fd = assert(io.open(testing_paths.fixtures_dir .. "/tzu"))
-         local tzucontent = assert(fd:read("*a"))
-         fd:close()
-         write_file("tzu", tzucontent, finally)
+         write_file("lao", tzu, finally)
+         write_file("tzu", lao, finally)
       end)
       
       after_each(function()
@@ -62,22 +206,40 @@ describe("Luarocks patch test #unit", function()
          end
       end)
       
-      it("applies the given patch and returns true if the patch is valid", function()
-         local p = patch.read_patch(testing_paths.fixtures_dir .. "/valid_patch.patch")
+      it("applies the given patch and returns the result of patching", function()
+         write_file("test.patch", valid_patch1, finally)
+         local p = patch.read_patch("test.patch")
          local result = patch.apply_patch(p)
          assert.truthy(result)
       end)
       
-      it("returns false if the files to be patched are not valid or doesn't exist", function()
+      it("applies the given patch with custom arguments and returns the result of patching", function()
+         write_file("test.patch", valid_patch2, finally)
+         local p = patch.read_patch("test.patch")
+         local result = patch.apply_patch(p, nil, true)
+         assert.truthy(result)
+      end)
+      
+      it("fails if the patch file is invalid", function()
+         write_file("test.patch", invalid_patch1, finally)
+         local p = patch.read_patch("test.patch")
+         local result = pcall(patch.apply_patch, p)
+         assert.falsy(result)
+      end)
+      
+      it("returns false if the files from the patch doesn't exist", function()
          os.remove("lao")
          os.remove("tzu")
-         local p = patch.read_patch(testing_paths.fixtures_dir .. "/invalid_patch.patch")
+         
+         write_file("test.patch", valid_patch1, finally)
+         local p = patch.read_patch("test.patch")
          local result = patch.apply_patch(p)
          assert.falsy(result)
       end)
       
-      it("returns false if the target file is already patched", function()
-         local p = patch.read_patch(testing_paths.fixtures_dir .. "/valid_patch.patch")
+      it("returns false if the target file was already patched", function()
+         write_file("test.patch", valid_patch1, finally)
+         local p = patch.read_patch("test.patch")
          local result = patch.apply_patch(p)
          assert.truthy(result)