[Git][java-team/xmlgraphics-commons][master] 3 commits: d/patches: Fix CorruptImagesTestCase.testCorruptPNG

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch master at Debian Java Maintainers / xmlgraphics-commons


Commits:
c02d6fe7 by Mathieu Malaterre at 2023-01-04T15:39:06+01:00
d/patches: Fix CorruptImagesTestCase.testCorruptPNG

- - - - -
2671e94a by Mathieu Malaterre at 2023-01-04T15:39:41+01:00
d/control: Bump Std-Vers to 4.6.2 no changes needed

- - - - -
db06c890 by Mathieu Malaterre at 2023-01-04T15:40:22+01:00
d/changelog: Upload 2.8-2 to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/XGC-133.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+xmlgraphics-commons (2.8-2) unstable; urgency=medium
+
+  * d/patches: Fix CorruptImagesTestCase.testCorruptPNG
+  * d/control: Bump Std-Vers to 4.6.2 no changes needed
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 04 Jan 2023 15:40:17 +0100
+
 xmlgraphics-commons (2.8-1) unstable; urgency=medium
 
   * New upstream version 2.8


=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends:
  libmockito-java,
  libxml-commons-resolver1.1-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/xmlgraphics-commons.git
 Vcs-Browser: https://salsa.debian.org/java-team/xmlgraphics-commons
 Homepage: http://xmlgraphics.apache.org/commons/


=====================================
debian/patches/XGC-133.patch
=====================================
@@ -0,0 +1,27 @@
+Description: XGC-133: Fix test for Java 11
+Author: Simon Steiner <simonsteiner1984 at gmail.com>
+Bug: https://issues.apache.org/jira/browse/XGC-133
+Reviewed-By: Mathieu Malaterre <malat at debian.org>
+
+Index: xmlgraphics-commons/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
+===================================================================
+--- xmlgraphics-commons.orig/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
++++ xmlgraphics-commons/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
+@@ -36,9 +36,14 @@ public class CorruptImagesTestCase {
+ 
+         ImageSessionContext sessionContext = imageContext.newSessionContext();
+         ImageManager manager = imageContext.getImageManager();
+-
+-        ImageInfo imageInfo = manager.preloadImage(uri, sessionContext);
+-        assertEquals(imageInfo.getMimeType(), "image/png");
++        try {
++            ImageInfo imageInfo = manager.preloadImage(uri, sessionContext);
++            //IOException should continue to raw png
++            assertEquals(imageInfo.getMimeType(), "image/png");
++        } catch (Exception e) {
++            //Otherwise should throw exception
++            assertEquals(e.getMessage(), "pos < flushedPos!");
++        }
+     }
+ 
+ }


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001-XMPSchemaAdapter.java-Use-UTC-timezone-when-SOURCE_D.patch
+XGC-133.patch



View it on GitLab: https://salsa.debian.org/java-team/xmlgraphics-commons/-/compare/9a09640da1e400b5184378b9f5e401bdf0f173a8...db06c8903a6194fdf66c8705f952544ce3701f00

-- 
View it on GitLab: https://salsa.debian.org/java-team/xmlgraphics-commons/-/compare/9a09640da1e400b5184378b9f5e401bdf0f173a8...db06c8903a6194fdf66c8705f952544ce3701f00
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230104/23b84c03/attachment.htm>