diff --git a/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java b/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
index 0de4121..a6edb98 100644
--- a/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
+++ b/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
@@ -36,18 +36,18 @@ import azkaban.utils.PropsUtils;
public class JdbcProjectLoaderTest {
private static boolean testDBExists;
//@TODO remove this and turn into local host.
- private static final String host = "rpark-ld.linkedin.biz";
+ private static final String host = "localhost";
private static final int port = 3306;
private static final String database = "test";
private static final String user = "azkaban";
private static final String password = "azkaban";
private static final int numConnections = 10;
-
+
@BeforeClass
public static void setupDB() {
DataSource dataSource = DataSourceUtils.getMySQLDataSource(host, port, database, user, password, numConnections);
testDBExists = true;
-
+
Connection connection = null;
try {
connection = dataSource.getConnection();
@@ -86,7 +86,7 @@ public class JdbcProjectLoaderTest {
DbUtils.closeQuietly(connection);
return;
}
-
+
try {
runner.query(connection, "SELECT COUNT(1) FROM project_files", countHandler);
} catch (SQLException e) {
@@ -95,7 +95,7 @@ public class JdbcProjectLoaderTest {
DbUtils.closeQuietly(connection);
return;
}
-
+
try {
runner.query(connection, "SELECT COUNT(1) FROM project_flows", countHandler);
} catch (SQLException e) {
@@ -104,7 +104,7 @@ public class JdbcProjectLoaderTest {
DbUtils.closeQuietly(connection);
return;
}
-
+
try {
runner.query(connection, "SELECT COUNT(1) FROM project_properties", countHandler);
} catch (SQLException e) {
@@ -113,12 +113,12 @@ public class JdbcProjectLoaderTest {
DbUtils.closeQuietly(connection);
return;
}
-
+
DbUtils.closeQuietly(connection);
-
+
clearDB();
}
-
+
private static void clearDB() {
if (!testDBExists) {
return;
@@ -138,7 +138,7 @@ public class JdbcProjectLoaderTest {
QueryRunner runner = new QueryRunner();
try {
runner.update(connection, "DELETE FROM projects");
-
+
} catch (SQLException e) {
e.printStackTrace();
testDBExists = false;
@@ -154,7 +154,7 @@ public class JdbcProjectLoaderTest {
DbUtils.closeQuietly(connection);
return;
}
-
+
try {
runner.update(connection, "DELETE FROM project_permissions");
} catch (SQLException e) {
@@ -172,7 +172,7 @@ public class JdbcProjectLoaderTest {
DbUtils.closeQuietly(connection);
return;
}
-
+
try {
runner.update(connection, "DELETE FROM project_flows");
} catch (SQLException e) {
@@ -181,7 +181,7 @@ public class JdbcProjectLoaderTest {
DbUtils.closeQuietly(connection);
return;
}
-
+
try {
runner.update(connection, "DELETE FROM project_properties");
} catch (SQLException e) {
@@ -190,11 +190,11 @@ public class JdbcProjectLoaderTest {
DbUtils.closeQuietly(connection);
return;
}
-
-
+
+
DbUtils.closeQuietly(connection);
}
-
+
@Test
public void testCreateProject() throws ProjectManagerException {
if (!isTestSetup()) {
@@ -205,7 +205,7 @@ public class JdbcProjectLoaderTest {
String projectName = "mytestProject";
String projectDescription = "This is my new project";
User user = new User("testUser");
-
+
Project project = loader.createNewProject(projectName, projectDescription, user);
Assert.assertTrue("Project Id set", project.getId() > -1);
Assert.assertEquals("Project name", projectName, project.getName());
@@ -215,7 +215,7 @@ public class JdbcProjectLoaderTest {
Project project2 = loader.fetchProjectById(project.getId());
assertProjectMemberEquals(project, project2);
}
-
+
@Test
public void testRemoveProject() throws ProjectManagerException {
if (!isTestSetup()) {
@@ -226,25 +226,25 @@ public class JdbcProjectLoaderTest {
String projectName = "testRemoveProject";
String projectDescription = "This is my new project";
User user = new User("testUser");
-
+
Project project = loader.createNewProject(projectName, projectDescription, user);
Assert.assertTrue("Project Id set", project.getId() > -1);
Assert.assertEquals("Project name", projectName, project.getName());
Assert.assertEquals("Project description", projectDescription, project.getDescription());
-
+
Project project2 = loader.fetchProjectById(project.getId());
assertProjectMemberEquals(project, project2);
loader.removeProject(project, user.getUserId());
-
+
Project project3 = loader.fetchProjectById(project.getId());
Assert.assertFalse(project3.isActive());
-
+
List<Project> projList = loader.fetchAllActiveProjects();
for (Project proj: projList) {
Assert.assertTrue(proj.getId() != project.getId());
}
}
-
+
@Test
public void testAddRemovePermissions() throws ProjectManagerException {
if (!isTestSetup()) {
@@ -255,7 +255,7 @@ public class JdbcProjectLoaderTest {
String projectName = "mytestProject1";
String projectDescription = "This is my new project";
User user = new User("testUser");
-
+
Project project = loader.createNewProject(projectName, projectDescription, user);
Assert.assertTrue("Project Id set", project.getId() > -1);
Assert.assertEquals("Project name", projectName, project.getName());
@@ -265,42 +265,42 @@ public class JdbcProjectLoaderTest {
loader.updatePermission(project, user.getUserId(), new Permission(0x2), false);
loader.updatePermission(project, "group1", new Permission(0x2), true);
Assert.assertEquals(perm, project.getUserPermission(user.getUserId()));
-
+
Permission permOverride = new Permission(0x6);
loader.updatePermission(project, user.getUserId(), permOverride, false);
Assert.assertEquals(permOverride, project.getUserPermission(user.getUserId()));
-
+
Project project2 = loader.fetchProjectById(project.getId());
assertProjectMemberEquals(project, project2);
Assert.assertEquals(permOverride, project2.getUserPermission(user.getUserId()));
}
-
+
@Test
public void testProjectEventLogs() throws ProjectManagerException {
if (!isTestSetup()) {
return;
}
-
+
ProjectLoader loader = createLoader();
String projectName = "testProjectEventLogs";
String projectDescription = "This is my new project";
User user = new User("testUser");
-
+
String message = "My message";
EventType type = EventType.USER_PERMISSION;
Project project = loader.createNewProject(projectName, projectDescription, user);
loader.postEvent(project, type, user.getUserId(), message);
-
+
List<ProjectLogEvent> events = loader.getProjectEvents(project, 10, 0);
Assert.assertTrue(events.size() == 1);
-
+
ProjectLogEvent event = events.get(0);
Assert.assertEquals(event.getProjectId(), project.getId());
Assert.assertEquals(event.getUser(), user.getUserId());
Assert.assertEquals(event.getMessage(), message);
Assert.assertEquals(event.getType(), type);
}
-
+
@Test
public void testFlowUpload() throws ProjectManagerException {
ProjectLoader loader = createLoader();
@@ -308,23 +308,23 @@ public class JdbcProjectLoaderTest {
String projectName = "mytestFlowUpload1";
String projectDescription = "This is my new project";
User user = new User("testUser");
-
+
Project project = loader.createNewProject(projectName, projectDescription, user);
-
+
Flow flow = new Flow("MyNewFlow");
flow.addNode(new Node("A"));
flow.addNode(new Node("B"));
flow.addNode(new Node("C"));
flow.addNode(new Node("D"));
-
+
flow.addEdge(new Edge("A", "B"));
flow.addEdge(new Edge("A", "C"));
flow.addEdge(new Edge("B", "D"));
flow.addEdge(new Edge("C", "D"));
-
+
flow.initialize();
-
+
loader.uploadFlow(project, 4, flow);
project.setVersion(4);
Flow newFlow = loader.fetchFlow(project, flow.getId());
@@ -333,7 +333,7 @@ public class JdbcProjectLoaderTest {
Assert.assertEquals(flow.getEdges().size(), newFlow.getEdges().size());
Assert.assertEquals(flow.getNodes().size(), newFlow.getNodes().size());
}
-
+
@Test
public void testFlowUploadPlain() throws ProjectManagerException {
ProjectLoader loader = createLoader();
@@ -341,23 +341,23 @@ public class JdbcProjectLoaderTest {
String projectName = "mytestFlowUpload2";
String projectDescription = "This is my new project";
User user = new User("testUser");
-
+
Project project = loader.createNewProject(projectName, projectDescription, user);
-
+
Flow flow = new Flow("MyNewFlow2");
flow.addNode(new Node("A1"));
flow.addNode(new Node("B1"));
flow.addNode(new Node("C1"));
flow.addNode(new Node("D1"));
-
+
flow.addEdge(new Edge("A1", "B1"));
flow.addEdge(new Edge("A1", "C1"));
flow.addEdge(new Edge("B1", "D1"));
flow.addEdge(new Edge("C1", "D1"));
-
+
flow.initialize();
-
+
loader.uploadFlow(project, 4, flow);
project.setVersion(4);
Flow newFlow = loader.fetchFlow(project, flow.getId());
@@ -365,11 +365,11 @@ public class JdbcProjectLoaderTest {
Assert.assertEquals(flow.getId(), newFlow.getId());
Assert.assertEquals(flow.getEdges().size(), newFlow.getEdges().size());
Assert.assertEquals(flow.getNodes().size(), newFlow.getNodes().size());
-
+
List<Flow> flows = loader.fetchAllProjectFlows(project);
Assert.assertTrue(flows.size() == 1);
}
-
+
@Test
public void testProjectProperties() throws ProjectManagerException {
ProjectLoader loader = createLoader();
@@ -377,7 +377,7 @@ public class JdbcProjectLoaderTest {
String projectName = "testProjectProperties";
String projectDescription = "This is my new project";
User user = new User("testUser");
-
+
Project project = loader.createNewProject(projectName, projectDescription, user);
project.setVersion(5);
Props props = new Props();
@@ -386,14 +386,14 @@ public class JdbcProjectLoaderTest {
props.put("c", "cde");
props.setSource("mysource");
loader.uploadProjectProperty(project, props);
-
+
Props retProps = loader.fetchProjectProperty(project, "mysource");
Assert.assertEquals(retProps.getSource(), props.getSource());
Assert.assertEquals(retProps.getKeySet(), props.getKeySet());
Assert.assertEquals(PropsUtils.toStringMap(retProps, true), PropsUtils.toStringMap(props, true));
}
-
+
@Test
public void testProjectFilesUpload() throws ProjectManagerException {
if (!isTestSetup()) {
@@ -404,7 +404,7 @@ public class JdbcProjectLoaderTest {
String projectName = "testProjectFilesUpload1";
String projectDescription = "This is my new project";
User user = new User("testUser");
-
+
Project project = loader.createNewProject(projectName, projectDescription, user);
Assert.assertTrue("Project Id set", project.getId() > -1);
Assert.assertEquals("Project name", projectName, project.getName());
@@ -413,7 +413,7 @@ public class JdbcProjectLoaderTest {
File testDir = new File("unit/project/testjob/testjob.zip");
loader.uploadProjectFile(project, 1, "zip", "testjob.zip", testDir, user.getUserId());
-
+
ProjectFileHandler handler = loader.getUploadedFile(project, 1);
Assert.assertEquals(handler.getProjectId(), project.getId());
Assert.assertEquals(handler.getFileName(), "testjob.zip");
@@ -428,7 +428,7 @@ public class JdbcProjectLoaderTest {
Assert.assertTrue(handler.getLocalFile() == null);
Assert.assertFalse(file.exists());
}
-
+
// Custom equals for what I think is important
private void assertProjectMemberEquals(Project p1, Project p2) {
Assert.assertEquals(p1.getId(), p2.getId());
@@ -439,17 +439,17 @@ public class JdbcProjectLoaderTest {
Assert.assertEquals(p1.getVersion(), p2.getVersion());
Assert.assertEquals(p1.isActive(), p2.isActive());
Assert.assertEquals(p1.getLastModifiedUser(), p2.getLastModifiedUser());
-
+
assertUserPermissionsEqual(p1, p2);
assertGroupPermissionsEqual(p1, p2);
}
-
+
private void assertUserPermissionsEqual(Project p1, Project p2) {
List<Pair<String, Permission>> perm1 = p1.getUserPermissions();
List<Pair<String, Permission>> perm2 = p2.getUserPermissions();
-
+
Assert.assertEquals(perm1.size(), perm2.size());
-
+
{
HashMap<String, Permission> perm1Map = new HashMap<String, Permission>();
for (Pair<String, Permission> p: perm1) {
@@ -461,7 +461,7 @@ public class JdbcProjectLoaderTest {
Assert.assertEquals(perm, p.getSecond());
}
}
-
+
{
HashMap<String, Permission> perm2Map = new HashMap<String, Permission>();
for (Pair<String, Permission> p: perm2) {
@@ -474,13 +474,13 @@ public class JdbcProjectLoaderTest {
}
}
}
-
+
private void assertGroupPermissionsEqual(Project p1, Project p2) {
List<Pair<String, Permission>> perm1 = p1.getGroupPermissions();
List<Pair<String, Permission>> perm2 = p2.getGroupPermissions();
-
+
Assert.assertEquals(perm1.size(), perm2.size());
-
+
{
HashMap<String, Permission> perm1Map = new HashMap<String, Permission>();
for (Pair<String, Permission> p: perm1) {
@@ -492,7 +492,7 @@ public class JdbcProjectLoaderTest {
Assert.assertEquals(perm, p.getSecond());
}
}
-
+
{
HashMap<String, Permission> perm2Map = new HashMap<String, Permission>();
for (Pair<String, Permission> p: perm2) {
@@ -505,31 +505,31 @@ public class JdbcProjectLoaderTest {
}
}
}
-
+
private ProjectLoader createLoader() {
Props props = new Props();
props.put("database.type", "mysql");
-
- props.put("mysql.host", host);
+
+ props.put("mysql.host", host);
props.put("mysql.port", port);
props.put("mysql.user", user);
props.put("mysql.database", database);
props.put("mysql.password", password);
props.put("mysql.numconnections", numConnections);
-
+
return new JdbcProjectLoader(props);
}
-
+
private boolean isTestSetup() {
if (!testDBExists) {
System.err.println("Skipping DB test because Db not setup.");
return false;
}
-
+
System.out.println("Running DB test because Db setup.");
return true;
}
-
+
public static class CountHandler implements ResultSetHandler<Integer> {
@Override
public Integer handle(ResultSet rs) throws SQLException {
@@ -537,8 +537,8 @@ public class JdbcProjectLoaderTest {
while (rs.next()) {
val++;
}
-
+
return val;
}
}
-}
\ No newline at end of file
+}
