From 535792390e29e4505fdce4071e041adb4d2853bd Mon Sep 17 00:00:00 2001 From: "Ivan C. Acha" Date: Sun, 25 Feb 2024 09:00:45 -0500 Subject: [PATCH] Changed line break behaviour. (#5562) Added line breaks to PageContentsCreator.java, CategoryEditHelperUnitTests.kt, and MediaDetailFragmentUnitTests.kt following the example given on issue #5523. --- .../fr/free/nrw/commons/upload/PageContentsCreator.java | 5 +++-- .../nrw/commons/category/CategoryEditHelperUnitTests.kt | 2 +- .../free/nrw/commons/media/MediaDetailFragmentUnitTests.kt | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java b/app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java index 46d4c015f..fb71da3c7 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java @@ -44,7 +44,6 @@ public class PageContentsCreator { .append("}}"); } buffer - .append("\n") .append("|source=").append("{{own}}\n") .append("|author=[[User:").append(media.getAuthor()).append("|") .append(media.getAuthor()).append("]]\n"); @@ -68,7 +67,9 @@ public class PageContentsCreator { Utils.getWikiLovesMonumentsYear(Calendar.getInstance()), contribution.getCountryCode())); } - buffer.append("== {{int:license-header}} ==\n") + buffer + .append("\n") + .append("== {{int:license-header}} ==\n") .append(licenseTemplateFor(media.getLicense())).append("\n\n") .append("{{Uploaded from Mobile|platform=Android|version=") .append(ConfigUtils.getVersionNameWithSha(context)).append("}}\n"); diff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt index 43f4de0e9..2f25c815c 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt @@ -87,12 +87,12 @@ class CategoryEditHelperUnitTests { helper.makeCategoryEdit(context, media, listOf("Test"), "== {{int:filedesc}} ==\n" + "{{Information\n" + "|description=\n" + - "\n" + "|source={{own}}\n" + "|author=[[User:UserForthBeta|UserForthBeta]]\n" + "|date={{According to Exif data|2022-03-06}}\n" + "}}\n" + "{{Location|22.538830555555556|114.08847222222222}}\n" + + "\n" + "== {{int:license-header}} ==\n" + "{{self|cc-zero}}\n" + "\n" + diff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt index a62d3400f..d711e52a8 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt @@ -383,7 +383,7 @@ class MediaDetailFragmentUnitTests { "|other versions=\n" + "}}\n" + "{{Location|27.043186|88.267003}}\n" + - "{{Assessments|featured=1}}" + "{{Assessments|featured=1}}\n" val map = linkedMapOf("en" to "Antique cash register in a cafe, Darjeeling") Assert.assertEquals(map, method.invoke(fragment, s)) } @@ -429,7 +429,7 @@ class MediaDetailFragmentUnitTests { "|Other fields = {{Credit line |Author = © [[User:Colin]] | Other = Wikimedia Commons |License = CC-BY-SA-4.0}}\n" + "}}\n" + "{{Location|51.519003|-0.138353}}\n" + - "{{Assessments|featured=1}}" + "{{Assessments|featured=1}}\n" val map = linkedMapOf("en" to "[[:en:Fitzrovia Chapel|Fitzrovia Chapel]] ceiling
\n") Assert.assertEquals(map, method.invoke(fragment, s)) } @@ -487,7 +487,7 @@ class MediaDetailFragmentUnitTests { "|Date =2015-02-17\n" + "|Permission ={{Diliff/Licensing}}\n" + "|other_versions=\n" + - "}}" + "}}\n" val map = linkedMapOf("en" to "The interior of Sacred Heart RC Church, Wimbledon, London.") Assert.assertEquals(map, method.invoke(fragment, s)) }