Change test pictures

The previous pictures were labeled as public domain, but are actually a collage of pictures under other licenses.

I now replaced them with a jpeg of simply a white pixel.

7 files changed, 21 insertions, 29 deletions

diff --git a/test/fixtures/image_with_caption-abstract.jpg b/test/fixtures/image_with_caption-abstract.jpg
new file mode 100644
index 000000000..f982ffa81
--- /dev/null
+++ b/test/fixtures/image_with_caption-abstract.jpg
diff --git a/test/fixtures/image_with_imagedescription_and_caption-abstract.jpg b/test/fixtures/image_with_imagedescription_and_caption-abstract.jpg
new file mode 100644
index 000000000..c82a269ef
--- /dev/null
+++ b/test/fixtures/image_with_imagedescription_and_caption-abstract.jpg
diff --git a/test/fixtures/image_with_no_description.jpg b/test/fixtures/image_with_no_description.jpg
new file mode 100644
index 000000000..ec6fc4be8
--- /dev/null
+++ b/test/fixtures/image_with_no_description.jpg
diff --git a/test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg b/test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg
deleted file mode 100644
index f5fe63999..000000000
--- a/test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg
+++ /dev/null
diff --git a/test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg b/test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg
deleted file mode 100644
index 0b8b85754..000000000
--- a/test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg
+++ /dev/null
diff --git a/test/fixtures/portrait_of_owls_no_description_tmp.jpg b/test/fixtures/portrait_of_owls_no_description_tmp.jpg
deleted file mode 100644
index d63d40af8..000000000
--- a/test/fixtures/portrait_of_owls_no_description_tmp.jpg
+++ /dev/null
diff --git a/test/pleroma/upload/filter/exiftool/read_description_test.exs b/test/pleroma/upload/filter/exiftool/read_description_test.exs
index 0e97b424b..0b358215c 100644
--- a/test/pleroma/upload/filter/exiftool/read_description_test.exs
+++ b/test/pleroma/upload/filter/exiftool/read_description_test.exs
@@ -7,26 +7,21 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
   alias Pleroma.Upload.Filter
 
   @uploads %Pleroma.Upload{
-    name: "portrait_of_owls_imagedescription_and_caption-abstract.jpg",
+    name: "image_with_imagedescription_and_caption-abstract.jpg",
     content_type: "image/jpeg",
-    path:
-      Path.absname("test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract.jpg"),
-    tempfile:
-      Path.absname("test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg"),
+    path: Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
+    tempfile: Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
     description: nil
   }
 
   test "keeps description when not empty" do
     uploads = %Pleroma.Upload{
-      name: "portrait_of_owls_imagedescription_and_caption-abstract.jpg",
+      name: "image_with_imagedescription_and_caption-abstract.jpg",
       content_type: "image/jpeg",
-      path:
-        Path.absname("test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract.jpg"),
+      path: Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
       tempfile:
-        Path.absname(
-          "test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg"
-        ),
-      description: "Eight different owls"
+        Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
+      description: "Some description"
     }
 
     assert Filter.Exiftool.ReadDescription.filter(uploads) ==
@@ -35,15 +30,12 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
 
   test "otherwise returns ImageDescription when present" do
     uploads_after = %Pleroma.Upload{
-      name: "portrait_of_owls_imagedescription_and_caption-abstract.jpg",
+      name: "image_with_imagedescription_and_caption-abstract.jpg",
       content_type: "image/jpeg",
-      path:
-        Path.absname("test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract.jpg"),
+      path: Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
       tempfile:
-        Path.absname(
-          "test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg"
-        ),
-      description: "Pictures of eight different owls"
+        Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
+      description: "a descriptive white pixel"
     }
 
     assert Filter.Exiftool.ReadDescription.filter(@uploads) ==
@@ -52,19 +44,19 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
 
   test "otherwise returns iptc:Caption-Abstract when present" do
     upload = %Pleroma.Upload{
-      name: "portrait_of_owls_caption-abstract.jpg",
+      name: "image_with_caption-abstract.jpg",
       content_type: "image/jpeg",
-      path: Path.absname("test/fixtures/portrait_of_owls_caption-abstract.jpg"),
-      tempfile: Path.absname("test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg"),
+      path: Path.absname("test/fixtures/image_with_caption-abstract.jpg"),
+      tempfile: Path.absname("test/fixtures/image_with_caption-abstract.jpg"),
       description: nil
     }
 
     upload_after = %Pleroma.Upload{
-      name: "portrait_of_owls_caption-abstract.jpg",
+      name: "image_with_caption-abstract.jpg",
       content_type: "image/jpeg",
-      path: Path.absname("test/fixtures/portrait_of_owls_caption-abstract.jpg"),
-      tempfile: Path.absname("test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg"),
-      description: "Pictures of eight different owls - iptc"
+      path: Path.absname("test/fixtures/image_with_caption-abstract.jpg"),
+      tempfile: Path.absname("test/fixtures/image_with_caption-abstract.jpg"),
+      description: "an abstract white pixel"
     }
 
     assert Filter.Exiftool.ReadDescription.filter(upload) ==
@@ -73,10 +65,10 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
 
   test "otherwise returns nil" do
     uploads = %Pleroma.Upload{
-      name: "portrait_of_owls_no_description-abstract.jpg",
+      name: "image_with_no_description.jpg",
       content_type: "image/jpeg",
-      path: Path.absname("test/fixtures/portrait_of_owls_no_description.jpg"),
-      tempfile: Path.absname("test/fixtures/portrait_of_owls_no_description_tmp.jpg"),
+      path: Path.absname("test/fixtures/image_with_no_description.jpg"),
+      tempfile: Path.absname("test/fixtures/image_with_no_description.jpg"),
       description: nil
     }