X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7092491b069de43bb8d8c30d3526e7095c5cc98..b23d6a54453ef6693b9c7f567316a339e89e8dad:/test/models/trace_test.rb?ds=sidebyside

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 42bfa6dda..bf4e0196b 100644
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -1,11 +1,21 @@
 require "test_helper"
 require "gpx"
-require "minitest/mock"
 
 class TraceTest < ActiveSupport::TestCase
+  # Use temporary directories with unique names for each test
+  # This allows the tests to be run in parallel.
+  def setup
+    @gpx_trace_dir_orig = Settings.gpx_trace_dir
+    @gpx_image_dir_orig = Settings.gpx_image_dir
+    Settings.gpx_trace_dir = Dir.mktmpdir("trace", Rails.root.join("test/gpx"))
+    Settings.gpx_image_dir = Dir.mktmpdir("image", Rails.root.join("test/gpx"))
+  end
+
   def teardown
-    File.unlink(*Dir.glob(File.join(Settings.gpx_trace_dir, "*.gpx")))
-    File.unlink(*Dir.glob(File.join(Settings.gpx_image_dir, "*.gif")))
+    FileUtils.remove_dir(Settings.gpx_trace_dir)
+    FileUtils.remove_dir(Settings.gpx_image_dir)
+    Settings.gpx_trace_dir = @gpx_trace_dir_orig
+    Settings.gpx_image_dir = @gpx_image_dir_orig
   end
 
   def test_visible
@@ -98,27 +108,27 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_public?
-    assert_equal true, build(:trace, :visibility => "public").public?
-    assert_equal false, build(:trace, :visibility => "private").public?
-    assert_equal false, build(:trace, :visibility => "trackable").public?
-    assert_equal true, build(:trace, :visibility => "identifiable").public?
-    assert_equal true, build(:trace, :deleted, :visibility => "public").public?
+    assert build(:trace, :visibility => "public").public?
+    assert_not build(:trace, :visibility => "private").public?
+    assert_not build(:trace, :visibility => "trackable").public?
+    assert build(:trace, :visibility => "identifiable").public?
+    assert build(:trace, :deleted, :visibility => "public").public?
   end
 
   def test_trackable?
-    assert_equal false, build(:trace, :visibility => "public").trackable?
-    assert_equal false, build(:trace, :visibility => "private").trackable?
-    assert_equal true, build(:trace, :visibility => "trackable").trackable?
-    assert_equal true, build(:trace, :visibility => "identifiable").trackable?
-    assert_equal false, build(:trace, :deleted, :visibility => "public").trackable?
+    assert_not build(:trace, :visibility => "public").trackable?
+    assert_not build(:trace, :visibility => "private").trackable?
+    assert build(:trace, :visibility => "trackable").trackable?
+    assert build(:trace, :visibility => "identifiable").trackable?
+    assert_not build(:trace, :deleted, :visibility => "public").trackable?
   end
 
   def test_identifiable?
-    assert_equal false, build(:trace, :visibility => "public").identifiable?
-    assert_equal false, build(:trace, :visibility => "private").identifiable?
-    assert_equal false, build(:trace, :visibility => "trackable").identifiable?
-    assert_equal true, build(:trace, :visibility => "identifiable").identifiable?
-    assert_equal false, build(:trace, :deleted, :visibility => "public").identifiable?
+    assert_not build(:trace, :visibility => "public").identifiable?
+    assert_not build(:trace, :visibility => "private").identifiable?
+    assert_not build(:trace, :visibility => "trackable").identifiable?
+    assert build(:trace, :visibility => "identifiable").identifiable?
+    assert_not build(:trace, :deleted, :visibility => "public").identifiable?
   end
 
   def test_mime_type
@@ -157,7 +167,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_large_picture
-    picture = File.read(Rails.root.join("test", "gpx", "fixtures", "a.gif"), :mode => "rb")
+    picture = File.read(Rails.root.join("test/gpx/fixtures/a.gif"), :mode => "rb")
 
     trace = Trace.create
     trace.large_picture = picture
@@ -168,7 +178,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_icon_picture
-    picture = File.read(Rails.root.join("test", "gpx", "fixtures", "a_icon.gif"), :mode => "rb")
+    picture = File.read(Rails.root.join("test/gpx/fixtures/a_icon.gif"), :mode => "rb")
 
     trace = Trace.create
     trace.icon_picture = picture
@@ -178,166 +188,116 @@ class TraceTest < ActiveSupport::TestCase
     trace.destroy
   end
 
-  # When testing the trace.import method, care needs to be taken regarding the icon
-  # fixture files, since the fixtures could be overwritten by newly generated files.
-  # We use FakeFS to temporarily protect the real fixture files from being overwritten.
-
   def test_import_removes_previous_tracepoints
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
-      # Tracepoints don't have a primary key, so we use a specific latitude to
-      # check for successful deletion
-      create(:tracepoint, :latitude => 54321, :trace => trace)
-      assert_equal 1, Tracepoint.where(:latitude => 54321).count
+    trace = create(:trace, :fixture => "a")
+    # Tracepoints don't have a primary key, so we use a specific latitude to
+    # check for successful deletion
+    create(:tracepoint, :latitude => 54321, :trace => trace)
+    assert_equal 1, Tracepoint.where(:latitude => 54321).count
 
-      trace.import
+    trace.import
 
-      assert_equal 0, Tracepoint.where(:latitude => 54321).count
-    end
+    assert_equal 0, Tracepoint.where(:latitude => 54321).count
   end
 
   def test_import_creates_tracepoints
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
-      assert_equal 0, Tracepoint.where(:gpx_id => trace.id).count
+    trace = create(:trace, :fixture => "a")
+    assert_equal 0, Tracepoint.where(:gpx_id => trace.id).count
 
-      trace.import
+    trace.import
 
-      trace.reload
-      assert_equal 1, Tracepoint.where(:gpx_id => trace.id).count
+    trace.reload
+    assert_equal 1, Tracepoint.where(:gpx_id => trace.id).count
 
-      # Check that the tile has been set prior to the bulk import
-      # i.e. that the callbacks have been run correctly
-      assert_equal 3221331576, Tracepoint.where(:gpx_id => trace.id).first.tile
-    end
+    # Check that the tile has been set prior to the bulk import
+    # i.e. that the callbacks have been run correctly
+    assert_equal 3221331576, Tracepoint.where(:gpx_id => trace.id).first.tile
   end
 
   def test_import_creates_icon
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
-      icon_path = File.join(Settings.gpx_image_dir, "#{trace.id}_icon.gif")
-      FileUtils.rm(icon_path)
-      assert_equal false, File.exist?(icon_path)
+    trace = create(:trace, :fixture => "a")
+    icon_path = File.join(Settings.gpx_image_dir, "#{trace.id}_icon.gif")
+    FileUtils.rm(icon_path)
+    assert_not File.exist?(icon_path)
 
-      trace.import
+    trace.import
 
-      assert_equal true, File.exist?(icon_path)
-    end
+    assert File.exist?(icon_path)
   end
 
   def test_import_creates_large_picture
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
-      large_picture_path = File.join(Settings.gpx_image_dir, "#{trace.id}.gif")
-      FileUtils.rm(large_picture_path)
-      assert_equal false, File.exist?(large_picture_path)
+    trace = create(:trace, :fixture => "a")
+    large_picture_path = File.join(Settings.gpx_image_dir, "#{trace.id}.gif")
+    FileUtils.rm(large_picture_path)
+    assert_not File.exist?(large_picture_path)
 
-      trace.import
+    trace.import
 
-      assert_equal true, File.exist?(large_picture_path)
-    end
+    assert File.exist?(large_picture_path)
   end
 
   def test_import_handles_bz2
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "c")
+    trace = create(:trace, :fixture => "c")
 
-      trace.import
+    trace.import
 
-      assert_equal 1, trace.size
-    end
+    assert_equal 1, trace.size
   end
 
   def test_import_handles_plain
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
+    trace = create(:trace, :fixture => "a")
 
-      trace.import
+    trace.import
 
-      assert_equal 1, trace.size
-    end
+    assert_equal 1, trace.size
   end
 
   def test_import_handles_plain_with_bom
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "b")
+    trace = create(:trace, :fixture => "b")
 
-      trace.import
+    trace.import
 
-      assert_equal 1, trace.size
-    end
+    assert_equal 1, trace.size
   end
 
   def test_import_handles_gz
     trace = create(:trace, :fixture => "d")
 
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import
 
-      assert_equal 1, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 1, trace.size
   end
 
   def test_import_handles_zip
     trace = create(:trace, :fixture => "f")
 
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import
 
-      assert_equal 2, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 2, trace.size
   end
 
   def test_import_handles_tar
     trace = create(:trace, :fixture => "g")
 
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import
 
-      assert_equal 2, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 2, trace.size
   end
 
   def test_import_handles_tar_gz
     trace = create(:trace, :fixture => "h")
 
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import
 
-      assert_equal 2, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 2, trace.size
   end
 
   def test_import_handles_tar_bz2
     trace = create(:trace, :fixture => "i")
 
-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import
 
-      assert_equal 2, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 2, trace.size
   end
 
   private