From cd7877e02ef9737b279153c6a8935da339df6ca9 Mon Sep 17 00:00:00 2001 From: Winston Li Date: Sun, 11 Jan 2015 16:01:56 +0000 Subject: [PATCH] Added the rest of the test. --- .../ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java index 379c7f78bc..e908ca78a9 100644 --- a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java +++ b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java @@ -99,13 +99,16 @@ public class WLGitBridgeIntegrationTest { wlgb.run(); folder.create(); File git = folder.newFolder(); - Git.cloneRepository() + Git base = Git.cloneRepository() .setURI("http://127.0.0.1:33859/testproj.git") .setDirectory(git) - .call() - .close(); - wlgb.stop(); + .call(); assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canPullAModifiedTexFile/base/testproj"), git.toPath())); + server.setState(states.get("canPullAModifiedTexFile").get("withModifiedTexFile")); + base.pull().call(); + base.close(); + wlgb.stop(); + assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canPullAModifiedTexFile/withModifiedTexFile/testproj"), git.toPath())); } private String makeConfigFile(int port, int apiPort) throws IOException {