瀏覽代碼

Added the rest of the test.

Winston Li 11 年之前
父節點
當前提交
cd7877e02e

+ 7 - 4
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java

@@ -99,13 +99,16 @@ public class WLGitBridgeIntegrationTest {
         wlgb.run();
         wlgb.run();
         folder.create();
         folder.create();
         File git = folder.newFolder();
         File git = folder.newFolder();
-        Git.cloneRepository()
+        Git base = Git.cloneRepository()
                 .setURI("http://127.0.0.1:33859/testproj.git")
                 .setURI("http://127.0.0.1:33859/testproj.git")
                 .setDirectory(git)
                 .setDirectory(git)
-                .call()
-                .close();
-        wlgb.stop();
+                .call();
         assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canPullAModifiedTexFile/base/testproj"), git.toPath()));
         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 {
     private String makeConfigFile(int port, int apiPort) throws IOException {