From 5c780b387f5d2da42885907a58b6829f0f825263 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 14 Apr 2010 18:39:19 -0700 Subject: [PATCH] Fix unit tests using MockSystemReader with user configuation Since cc905e7d4be "Make Repository.getConfig aware of changed config" its invalid to have a null result from FileBasedConfig.getFile(), as the path is used to stat the location on disk before returning the Config object from Repository.getConfig(). Mock out the isOutdated() method to return false all of the time in the mock test environment, so we don't crash with an NPE when this mock user configuration is being called. Change-Id: I0b4d9cbd346d5dc225ec12674da905c35457fa7c Signed-off-by: Shawn O. Pearce --- .../src/org/eclipse/jgit/junit/MockSystemReader.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index 306d432e6..b4f0b7e90 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -70,7 +70,13 @@ public MockSystemReader() { @Override public void load() throws IOException, ConfigInvalidException { // Do nothing - }}; + } + + @Override + public boolean isOutdated() { + return false; + } + }; } private void init(final String n) {