diff --git a/core/src/main/java/hudson/model/UserProperty.java b/core/src/main/java/hudson/model/UserProperty.java index 0f0958d95c..48198a28eb 100644 --- a/core/src/main/java/hudson/model/UserProperty.java +++ b/core/src/main/java/hudson/model/UserProperty.java @@ -58,7 +58,7 @@ public abstract class UserProperty implements ReconfigurableDescribable fileLines = FileUtils.readLines(testFile); + assertThat(fileLines, hasSize(1)); + + j.configRoundtrip(user); + + user = User.get("nestedUserReference", false, Collections.emptyMap()); + assertThat("nested reference should exist after user configuration change", user, nestedUserSet()); + + testFile = new File(j.getInstance().getRootDir() + "/users/nesteduserreference/" + TEST_FILE); + fileLines = FileUtils.readLines(testFile); + assertThat(fileLines, hasSize(1)); + } + + public static Matcher nestedUserSet() { + return new BaseMatcher() { + @Override + public boolean matches(Object item) { + User user = (User) item; + assertThat(user, notNullValue()); + final SetUserUserProperty prop = user.getProperty(SetUserUserProperty.class); + assertThat(prop, notNullValue()); + assertThat(prop.getOwner(), notNullValue()); + assertThat(prop.getOwner(), is(user)); + + final InnerUserClass innerUserClass = prop.getInnerUserClass(); + assertThat(innerUserClass, notNullValue()); + final User innerUser = innerUserClass.getUser(); + assertThat(innerUser, notNullValue()); + assertThat(innerUser, is(user)); + return true; + } + + @Override + public void describeTo(Description description) { + description.appendText("User object should contain initialised inner fields"); + } + }; + } + + /** + * User property that need update User object reference for InnerUserClass. + */ + public static class SetUserUserProperty extends UserProperty { + private InnerUserClass innerUserClass = new InnerUserClass(); + + @DataBoundConstructor + public SetUserUserProperty() { + } + + public InnerUserClass getInnerUserClass() { + return innerUserClass; + } + + public User getOwner() { + return user; + } + + @Override + protected void setUser(User u) { + super.setUser(u); + innerUserClass.setUser(u); + } + + public Object readResolve() { + if (innerUserClass == null) { + innerUserClass = new InnerUserClass(); + } + return this; + } + + @TestExtension + public static class DescriptorImpl extends UserPropertyDescriptor { + @Override + public UserProperty newInstance(User user) { + if (user.getId().equals("nesteduserreference")) { + return new SetUserUserProperty(); + } + return null; + } + } + } + + /** + * Class that should get setUser(User) object reference update. + */ + public static class InnerUserClass extends AbstractDescribableImpl { + public static final String TEST_FILE = "test.txt"; + private transient User user; + + @DataBoundConstructor + public InnerUserClass() { + } + + public User getUser() { + return user; + } + + /** + * Should be initialised separately. + */ + public void setUser(User user) { + this.user = user; + try { + writeStringToFile(getUserFile(), String.valueOf(currentTimeMillis()), true); + } catch (IOException e) { + Throwables.propagate(e); + } + } + + private File getUserFile() throws IOException { + final File usersRootDir = new File(Jenkins.getInstance().getRootDir(), "users"); + final File userDir = new File(usersRootDir, idStrategy().filenameOf(user.getId())); + final File userFile = new File(userDir, TEST_FILE); + if (!userFile.exists()) { + userFile.createNewFile(); + } + return userFile; + } + + @Override + public DescriptorImpl getDescriptor() { + return (DescriptorImpl) super.getDescriptor(); + } + + @TestExtension + public static class DescriptorImpl extends Descriptor { + } + } + } diff --git a/test/src/test/resources/hudson/model/UserPropertyTest/SetUserUserProperty/config.jelly b/test/src/test/resources/hudson/model/UserPropertyTest/SetUserUserProperty/config.jelly new file mode 100644 index 0000000000..a25eb2344a --- /dev/null +++ b/test/src/test/resources/hudson/model/UserPropertyTest/SetUserUserProperty/config.jelly @@ -0,0 +1,2 @@ + + diff --git a/test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/config.xml b/test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/config.xml new file mode 100644 index 0000000000..b302226802 --- /dev/null +++ b/test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/config.xml @@ -0,0 +1,3 @@ + + + diff --git a/test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/nestedUserReference/config.xml b/test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/nestedUserReference/config.xml new file mode 100644 index 0000000000..75d0d6330c --- /dev/null +++ b/test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/nestedUserReference/config.xml @@ -0,0 +1,9 @@ + + + nesteduserreference + + + + + +