You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2018/04/13 09:22:34 UTC
svn commit: r1829045 - in /xmlgraphics/commons/trunk/src:
main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
test/java/org/apache/xmlgraphics/xmp/XMPPropertyTestCase.java
Author: ssteiner
Date: Fri Apr 13 09:22:33 2018
New Revision: 1829045
URL: http://svn.apache.org/viewvc?rev=1829045&view=rev
Log:
XGC-111: Improve error message when language is empty
Modified:
xmlgraphics/commons/trunk/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/xmp/XMPPropertyTestCase.java
Modified: xmlgraphics/commons/trunk/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java?rev=1829045&r1=1829044&r2=1829045&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java (original)
+++ xmlgraphics/commons/trunk/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java Fri Apr 13 09:22:33 2018
@@ -73,7 +73,7 @@ public class XMPSchemaAdapter {
*/
private void addStringToArray(String propName, String value, XMPArrayType arrayType) {
if (value == null || value.length() == 0) {
- throw new IllegalArgumentException("Value must not be empty");
+ throw new IllegalArgumentException("'" + propName + "' value must not be empty");
}
addObjectToArray(propName, value, arrayType);
}
@@ -86,7 +86,7 @@ public class XMPSchemaAdapter {
*/
protected void addObjectToArray(String propName, Object value, XMPArrayType arrayType) {
if (value == null) {
- throw new IllegalArgumentException("Value must not be null");
+ throw new IllegalArgumentException("'" + propName + "' value must not be null");
}
QName name = getQName(propName);
XMPProperty prop = meta.getProperty(name);
Modified: xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/xmp/XMPPropertyTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/xmp/XMPPropertyTestCase.java?rev=1829045&r1=1829044&r2=1829045&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/xmp/XMPPropertyTestCase.java (original)
+++ xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/xmp/XMPPropertyTestCase.java Fri Apr 13 09:22:33 2018
@@ -195,4 +195,23 @@ public class XMPPropertyTestCase {
assertEquals(3, basic.getIdentifiers().length);
}
+ @Test
+ public void testEmptyPropertyValue() {
+ Metadata xmp = new Metadata();
+ DublinCoreAdapter dc = DublinCoreSchema.getAdapter(xmp);
+ String ex = "";
+ try {
+ dc.addLanguage("");
+ } catch (IllegalArgumentException e) {
+ ex = e.getMessage();
+ }
+ assertEquals(ex, "'language' value must not be empty");
+
+ try {
+ dc.addSubject("");
+ } catch (IllegalArgumentException e) {
+ ex = e.getMessage();
+ }
+ assertEquals(ex, "'subject' value must not be empty");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org