FELIX-3959 Make PrinterMode.valueOf(String) case insensitive
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1453914 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java b/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java
index 52ceac9..26981c8 100644
--- a/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java
+++ b/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java
@@ -42,15 +42,15 @@
public static PrinterMode valueOf(final String m)
{
- if (TEXT.name().equals(m))
+ if (TEXT.name().equalsIgnoreCase(m))
{
return TEXT;
}
- else if (HTML_FRAGMENT.name().equals(m))
+ else if (HTML_FRAGMENT.name().equalsIgnoreCase(m))
{
return HTML_FRAGMENT;
}
- else if (JSON.name().equals(m))
+ else if (JSON.name().equalsIgnoreCase(m))
{
return JSON;
}
diff --git a/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java b/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java
index 0f72ac6..aa192fe 100644
--- a/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java
+++ b/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java
@@ -29,6 +29,14 @@
TestCase.assertSame(PrinterMode.JSON, PrinterMode.valueOf("JSON"));
TestCase.assertSame(PrinterMode.HTML_FRAGMENT, PrinterMode.valueOf("HTML_FRAGMENT"));
+ TestCase.assertSame(PrinterMode.TEXT, PrinterMode.valueOf("text"));
+ TestCase.assertSame(PrinterMode.JSON, PrinterMode.valueOf("json"));
+ TestCase.assertSame(PrinterMode.HTML_FRAGMENT, PrinterMode.valueOf("html_fragment"));
+
+ TestCase.assertSame(PrinterMode.TEXT, PrinterMode.valueOf("Text"));
+ TestCase.assertSame(PrinterMode.JSON, PrinterMode.valueOf("Json"));
+ TestCase.assertSame(PrinterMode.HTML_FRAGMENT, PrinterMode.valueOf("HTML_Fragment"));
+
TestCase.assertNull(PrinterMode.valueOf("unsupported_name"));
}