CheckedInByUser now behaves more like Author

jenkinsci · Sep 13, 2013 · f7da3dd · f7da3dd
1 parent af49749
commit f7da3dd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/main/java/hudson/plugins/tfs/model/ChangeSet.java b/src/main/java/hudson/plugins/tfs/model/ChangeSet.java
@@ -22,7 +22,7 @@ public class ChangeSet extends hudson.scm.ChangeLogSet.Entry {
     private Date date;
     private String comment;
     private List<Item> items;
-	private String checkedInByUser;
+    private String checkedInByUserString;
 
     public ChangeSet() {
         this("", null, "", "");
@@ -108,16 +108,23 @@ public void setComment(String comment) {
         this.comment = comment;
     }
 
-	public void setCheckedInBy(String user) {
-		checkedInByUser = user;
-	}
+    public void setCheckedInBy(String checkedInByUserString) {
+        if (checkedInByUserString != null) {
+            String[] split = checkedInByUserString.split("\\\\");
+            if (split.length == 2) {
+                this.checkedInByUserString = split[1];
+            } else {
+                this.checkedInByUserString = checkedInByUserString;
+            }
+        }
+    }
 
-	public String getCheckedInBy() {
-		return checkedInByUser;
-	}
+    public String getCheckedInBy() {
+        return checkedInByUserString;
+    }
 
     public User getCheckedInByUser() {
-        return User.get(checkedInByUser);
+        return User.get(checkedInByUserString);
     }
 
     @Exported

diff --git a/src/test/java/hudson/plugins/tfs/ChangeSetReaderTest.java b/src/test/java/hudson/plugins/tfs/ChangeSetReaderTest.java
@@ -109,7 +109,7 @@ public void assertParsingOfKeywordCheckedInByIsParsed() throws Exception {
         ChangeLogSet logset = changesetReader.parse(null, reader);
 
         ChangeSet changeset = logset.iterator().next();
-        assertEquals("Checked in by user is incorrect", "snd\\other_user", changeset.getCheckedInBy());
+        assertEquals("Checked in by user is incorrect", "other_user", changeset.getCheckedInBy());
     }
 
 }