Skip to content

Preserve inherited properties without local entries #1087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PHJ2000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve inherited properties without local entries #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/json/Property.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static JSONObject toJSONObject(java.util.Properties properties) throws JS
// can't use the new constructor for Android support
// JSONObject jo = new JSONObject(properties == null ? 0 : properties.size());
JSONObject jo = new JSONObject();
if (properties != null && !properties.isEmpty()) {
if (properties != null) {
Enumeration<?> enumProperties = properties.propertyNames();
while(enumProperties.hasMoreElements()) {
String name = (String)enumProperties.nextElement();
Expand Down
29 changes: 28 additions & 1 deletion src/test/java/org/json/junit/PropertyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,33 @@
*/
public class PropertyTest {

@Test
public void shouldIncludeInheritedPropertiesWithoutLocalEntries() {
Properties defaults = new Properties();
defaults.setProperty("timeout", "30");
Properties properties = new Properties(new Properties(defaults));

JSONObject jsonObject = Property.toJSONObject(properties);

assertEquals(1, jsonObject.length());
assertEquals("30", jsonObject.getString("timeout"));
}

@Test
public void shouldPreferLocalPropertiesOverDefaults() {
Properties defaults = new Properties();
defaults.setProperty("timeout", "30");
defaults.setProperty("host", "localhost");
Properties properties = new Properties(defaults);
properties.setProperty("timeout", "60");

JSONObject jsonObject = Property.toJSONObject(properties);

assertEquals(2, jsonObject.length());
assertEquals("60", jsonObject.getString("timeout"));
assertEquals("localhost", jsonObject.getString("host"));
}

/**
* JSONObject from null properties object should
* result in an empty JSONObject.
Expand Down Expand Up @@ -99,4 +126,4 @@ public void shouldHandleJSONProperty() {
assertTrue("property objects should match",
properties.equals(jsonProperties));
}
}
}
Loading