This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 33d08b0 Sort methods.
33d08b0 is described below
commit 33d08b0f2bea417acf872ab6df9fdd1fb3dad28a
Author: Gary Gregory <[email protected]>
AuthorDate: Sun May 31 12:50:21 2020 -0400
Sort methods.
---
.../configuration2/TestBaseConfiguration.java | 54 +++++++++++-----------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git
a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
index 6d52866..0a44658 100644
--- a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
@@ -345,6 +345,33 @@ public class TestBaseConfiguration
}
@Test
+ public void testGetEnum()
+ {
+ config.setProperty("testEnum", EnumFixture.SMALLTALK.name());
+ config.setProperty("testBadEnum", "This is not an enum value.");
+ final EnumFixture enum1 = EnumFixture.SMALLTALK;
+ final EnumFixture defaultValue = EnumFixture.JAVA;
+ //
+ assertEquals("Existing key", enum1, config.getEnum("testEnum",
EnumFixture.class));
+ assertEquals("Existing key with default value", enum1,
config.getEnum("testEnum", EnumFixture.class, defaultValue));
+ assertEquals("Missing key with default value", defaultValue,
config.getEnum("stringNotInConfig", EnumFixture.class, defaultValue));
+ //
+ try {
+ config.getEnum("testBadEnum", EnumFixture.class);
+ fail("Expected " + ConversionException.class);
+ } catch (ConversionException e) {
+ // expected
+ }
+ //
+ try {
+ config.getEnum("testBadEnum", EnumFixture.class, defaultValue);
+ fail("Expected " + ConversionException.class);
+ } catch (ConversionException e) {
+ // expected
+ }
+ }
+
+ @Test
public void testGetFloat()
{
config.setProperty("numberF", "1.0");
@@ -527,33 +554,6 @@ public class TestBaseConfiguration
assertEquals("Missing key with default value", defaultValue,
config.getString("stringNotInConfig", defaultValue));
}
- @Test
- public void testGetEnum()
- {
- config.setProperty("testEnum", EnumFixture.SMALLTALK.name());
- config.setProperty("testBadEnum", "This is not an enum value.");
- final EnumFixture enum1 = EnumFixture.SMALLTALK;
- final EnumFixture defaultValue = EnumFixture.JAVA;
- //
- assertEquals("Existing key", enum1, config.getEnum("testEnum",
EnumFixture.class));
- assertEquals("Existing key with default value", enum1,
config.getEnum("testEnum", EnumFixture.class, defaultValue));
- assertEquals("Missing key with default value", defaultValue,
config.getEnum("stringNotInConfig", EnumFixture.class, defaultValue));
- //
- try {
- config.getEnum("testBadEnum", EnumFixture.class);
- fail("Expected " + ConversionException.class);
- } catch (ConversionException e) {
- // expected
- }
- //
- try {
- config.getEnum("testBadEnum", EnumFixture.class, defaultValue);
- fail("Expected " + ConversionException.class);
- } catch (ConversionException e) {
- // expected
- }
- }
-
/**
* Tests that the first scalar of a list is returned.
*/