agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-30 12:24:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor with deletion and tests.

Browse Source
This commit is contained in:
Winston Li
2015-02-22 23:42:01 +00:00
parent 8993702f69
commit 5a00c84359
33 changed files with 189 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java
View File

@@ -4,7 +4,7 @@ import org.eclipse.jgit.api.errors.GitAPIException;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import uk.ac.ic.wlgitbridge.application.WLGitBridgeApplication;
import uk.ac.ic.wlgitbridge.application.GitBridgeApp;
import uk.ac.ic.wlgitbridge.snapshot.servermock.server.MockSnapshotServer;
import uk.ac.ic.wlgitbridge.snapshot.servermock.state.SnapshotAPIState;
import uk.ac.ic.wlgitbridge.snapshot.servermock.state.SnapshotAPIStateBuilder;
@@ -52,7 +52,7 @@ public class WLGitBridgeIntegrationTest {
MockSnapshotServer server = new MockSnapshotServer(3857, getResource("/canCloneARepository").toFile());
server.start();
server.setState(states.get("canCloneARepository").get("state"));
WLGitBridgeApplication wlgb = new WLGitBridgeApplication(new String[] {
GitBridgeApp wlgb = new GitBridgeApp(new String[] {
makeConfigFile(33857, 3857)
});
wlgb.run();
@@ -70,7 +70,7 @@ public class WLGitBridgeIntegrationTest {
MockSnapshotServer server = new MockSnapshotServer(3858, getResource("/canCloneMultipleRepositories").toFile());
server.start();
server.setState(states.get("canCloneMultipleRepositories").get("state"));
WLGitBridgeApplication wlgb = new WLGitBridgeApplication(new String[] {
GitBridgeApp wlgb = new GitBridgeApp(new String[] {
makeConfigFile(33858, 3858)
});
wlgb.run();
@@ -93,7 +93,7 @@ public class WLGitBridgeIntegrationTest {
MockSnapshotServer server = new MockSnapshotServer(3860, getResource("/canPullADeletedTexFile").toFile());
server.start();
server.setState(states.get("canPullADeletedTexFile").get("base"));
WLGitBridgeApplication wlgb = new WLGitBridgeApplication(new String[] {
GitBridgeApp wlgb = new GitBridgeApp(new String[] {
makeConfigFile(33860, 3860)
});
wlgb.run();
@@ -120,7 +120,7 @@ public class WLGitBridgeIntegrationTest {
MockSnapshotServer server = new MockSnapshotServer(3861, getResource("/cannotCloneAProtectedProject").toFile());
server.start();
server.setState(states.get("cannotCloneAProtectedProject").get("state"));
WLGitBridgeApplication wlgb = new WLGitBridgeApplication(new String[] {
GitBridgeApp wlgb = new GitBridgeApp(new String[] {
makeConfigFile(33861, 3861)
});
wlgb.run();
@@ -151,7 +151,7 @@ public class WLGitBridgeIntegrationTest {
}
private Path getResource(String path) {
return Paths.get("src/servermock/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest" + path);
return Paths.get("src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest" + path);
}
private InputStream getResourceAsStream(String path) {

28
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest.java
View File

@@ -11,50 +11,50 @@ public class FileUtilTest {
@Test
public void returnsTrueWhenFilesAreEqualInBothDirectories() throws URISyntaxException {
Path eq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsTrueWhenFilesAreEqualInBothDirectories/eq1").toURI());
Path eq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsTrueWhenFilesAreEqualInBothDirectories/eq2").toURI());
Path eq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsTrueWhenFilesAreEqualInBothDirectories/eq1").toURI());
Path eq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsTrueWhenFilesAreEqualInBothDirectories/eq2").toURI());
Assert.assertTrue(FileUtil.gitDirectoriesAreEqual(eq1, eq2));
}
@Test
public void returnsTrueWhenRecursiveFilesAreEqualInBothDirectores() throws URISyntaxException {
Path eq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsTrueWhenRecursiveFilesAreEqualInBothDirectories/eq1").toURI());
Path eq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsTrueWhenRecursiveFilesAreEqualInBothDirectories/eq2").toURI());
Path eq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsTrueWhenRecursiveFilesAreEqualInBothDirectories/eq1").toURI());
Path eq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsTrueWhenRecursiveFilesAreEqualInBothDirectories/eq2").toURI());
Assert.assertTrue(FileUtil.gitDirectoriesAreEqual(eq1, eq2));
}
@Test
public void returnsFalseWhenFilesAreNotEqualInBothDirectories() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsFalseWhenFilesAreNotEqualInBothDirectories/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsFalseWhenFilesAreNotEqualInBothDirectories/neq2").toURI());
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsFalseWhenFilesAreNotEqualInBothDirectories/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsFalseWhenFilesAreNotEqualInBothDirectories/neq2").toURI());
Assert.assertFalse(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}
@Test
public void returnsFalseWhenRecursiveFilesAreNotEqualInBothDirectories() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsFalseWhenRecursiveFilesAreNotEqualInBothDirectories/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsFalseWhenRecursiveFilesAreNotEqualInBothDirectories/neq2").toURI());
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsFalseWhenRecursiveFilesAreNotEqualInBothDirectories/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsFalseWhenRecursiveFilesAreNotEqualInBothDirectories/neq2").toURI());
Assert.assertFalse(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}
@Test
public void returnsTrueEvenIfGitDirectoriesAreNotEqual() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsTrueEvenIfGitDirectoriesAreNotEqual/eq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsTrueEvenIfGitDirectoriesAreNotEqual/eq2").toURI());
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsTrueEvenIfGitDirectoriesAreNotEqual/eq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsTrueEvenIfGitDirectoriesAreNotEqual/eq2").toURI());
Assert.assertTrue(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}
@Test
public void returnsFalseIfFileNamesAreNotEqual() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsFalseIfFileNamesAreNotEqual/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsFalseIfFileNamesAreNotEqual/neq2").toURI());
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsFalseIfFileNamesAreNotEqual/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsFalseIfFileNamesAreNotEqual/neq2").toURI());
Assert.assertFalse(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}
@Test
public void returnsFalseIfInnerDirectoryNamesAreNotEqual() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsFalseIfInnerDirectoryNamesAreNotEqual/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/servermock/util/FileUtilTest/returnsFalseIfInnerDirectoryNamesAreNotEqual/neq2").toURI());
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsFalseIfInnerDirectoryNamesAreNotEqual/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/snapshot/servermock/util/FileUtilTest/returnsFalseIfInnerDirectoryNamesAreNotEqual/neq2").toURI());
Assert.assertFalse(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}