Initial large refactor.

This commit is contained in:
Winston Li
2015-02-22 22:49:02 +00:00
parent 79307923ad
commit 8993702f69
144 changed files with 377 additions and 549 deletions

View File

@@ -5,10 +5,10 @@ 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.test.server.MockSnapshotServer;
import uk.ac.ic.wlgitbridge.test.state.SnapshotAPIState;
import uk.ac.ic.wlgitbridge.test.state.SnapshotAPIStateBuilder;
import uk.ac.ic.wlgitbridge.test.util.FileUtil;
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;
import uk.ac.ic.wlgitbridge.snapshot.servermock.util.FileUtil;
import uk.ac.ic.wlgitbridge.util.Util;
import java.io.*;
@@ -151,7 +151,7 @@ public class WLGitBridgeIntegrationTest {
}
private Path getResource(String path) {
return Paths.get("src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest" + path);
return Paths.get("src/servermock/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest" + path);
}
private InputStream getResourceAsStream(String path) {

View File

@@ -1,4 +1,4 @@
package uk.ac.ic.wlgitbridge.writelatex.model.db.sql.update.delete;
package uk.ac.ic.wlgitbridge.data.model.db.sql.update.delete;
import org.junit.Test;
import static org.junit.Assert.*;

View File

@@ -1,4 +1,4 @@
package uk.ac.ic.wlgitbridge.test.util;
package uk.ac.ic.wlgitbridge.snapshot.servermock.util;
import junit.framework.Assert;
import org.junit.Test;
@@ -11,50 +11,50 @@ public class FileUtilTest {
@Test
public void returnsTrueWhenFilesAreEqualInBothDirectories() throws URISyntaxException {
Path eq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsTrueWhenFilesAreEqualInBothDirectories/eq1").toURI());
Path eq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsTrueWhenFilesAreEqualInBothDirectories/eq2").toURI());
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());
Assert.assertTrue(FileUtil.gitDirectoriesAreEqual(eq1, eq2));
}
@Test
public void returnsTrueWhenRecursiveFilesAreEqualInBothDirectores() throws URISyntaxException {
Path eq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsTrueWhenRecursiveFilesAreEqualInBothDirectories/eq1").toURI());
Path eq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsTrueWhenRecursiveFilesAreEqualInBothDirectories/eq2").toURI());
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());
Assert.assertTrue(FileUtil.gitDirectoriesAreEqual(eq1, eq2));
}
@Test
public void returnsFalseWhenFilesAreNotEqualInBothDirectories() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsFalseWhenFilesAreNotEqualInBothDirectories/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsFalseWhenFilesAreNotEqualInBothDirectories/neq2").toURI());
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());
Assert.assertFalse(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}
@Test
public void returnsFalseWhenRecursiveFilesAreNotEqualInBothDirectories() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsFalseWhenRecursiveFilesAreNotEqualInBothDirectories/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsFalseWhenRecursiveFilesAreNotEqualInBothDirectories/neq2").toURI());
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());
Assert.assertFalse(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}
@Test
public void returnsTrueEvenIfGitDirectoriesAreNotEqual() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsTrueEvenIfGitDirectoriesAreNotEqual/eq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsTrueEvenIfGitDirectoriesAreNotEqual/eq2").toURI());
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());
Assert.assertTrue(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}
@Test
public void returnsFalseIfFileNamesAreNotEqual() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsFalseIfFileNamesAreNotEqual/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsFalseIfFileNamesAreNotEqual/neq2").toURI());
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());
Assert.assertFalse(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}
@Test
public void returnsFalseIfInnerDirectoryNamesAreNotEqual() throws URISyntaxException {
Path neq1 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsFalseIfInnerDirectoryNamesAreNotEqual/neq1").toURI());
Path neq2 = Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/test/util/FileUtilTest/returnsFalseIfInnerDirectoryNamesAreNotEqual/neq2").toURI());
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());
Assert.assertFalse(FileUtil.gitDirectoriesAreEqual(neq1, neq2));
}