Skip to content

Commit 513589b

Browse files
DokyeongyunDokyeongyun
authored
Merge pull request #253 from Dokyeongyun/ft-220521-commonModuleTest
Ft 220521 common module test
2 parents f92f9c1 + b10551a commit 513589b

File tree

11 files changed

+547
-86
lines changed

11 files changed

+547
-86
lines changed

‎Common/.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/build/
2-
/bin/
2+
/bin/
3+
4+
/src/test/resources/dbconfig.txt

‎Common/src/main/java/root/common/database/contracts/AbstractDatabase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ public interface AbstractDatabase {
4444
* Rollback transaction
4545
* @return true when succeeded, false when failed
4646
*/
47-
public boolean rollback(Connection conn);
47+
public boolean rollbackTransaction(Connection conn);
4848

4949
}

‎Common/src/main/java/root/common/database/implement/JdbcDatabase.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.sql.SQLException;
55
import java.sql.Statement;
66

7-
import lombok.Data;
87
import root.common.database.contracts.AbstractDatabase;
98

109
// TODO Builder Pattern �����ϱ�
@@ -14,7 +13,6 @@
1413
* @author DKY
1514
*
1615
*/
17-
@Data
1816
public class JdbcDatabase implements AbstractDatabase {
1917
private JdbcConnectionInfo jdbc;
2018
private JdbcDatabaseConnectionPool connPool = null;
@@ -62,7 +60,8 @@ public boolean setAutoCommit(Connection conn, boolean val) {
6260
try {
6361
conn.setAutoCommit(val);
6462
return true;
65-
} catch (SQLException se) {
63+
} catch (NullPointerException | SQLException e) {
64+
e.printStackTrace();
6665
return false;
6766
}
6867
}
@@ -72,8 +71,8 @@ public boolean beginTransaction(Connection conn) {
7271
try {
7372
conn.setAutoCommit(false);
7473
return true;
75-
} catch (SQLException se) {
76-
se.printStackTrace();
74+
} catch (NullPointerException | SQLException e) {
75+
e.printStackTrace();
7776
return false;
7877
}
7978
}
@@ -84,20 +83,20 @@ public boolean commitTransaction(Connection conn) {
8483
conn.commit();
8584
conn.setAutoCommit(false);
8685
return true;
87-
} catch (SQLException se) {
88-
se.printStackTrace();
86+
} catch (NullPointerException | SQLException e) {
87+
e.printStackTrace();
8988
return false;
9089
}
9190
}
9291

9392
@Override
94-
public boolean rollback(Connection conn) {
93+
public boolean rollbackTransaction(Connection conn) {
9594
try {
9695
conn.rollback();
9796
conn.setAutoCommit(true);
9897
return true;
99-
} catch (SQLException se) {
100-
se.printStackTrace();
98+
} catch (NullPointerException | SQLException e) {
99+
e.printStackTrace();
101100
return false;
102101
}
103102
}
@@ -107,19 +106,20 @@ public boolean rollback(Connection conn) {
107106
*
108107
* @param conn the connection instance to check
109108
* @param validationQuery the query to be executed with the connection
110-
* @return 1 if valid, else return -1
109+
* @return true if valid, else return false
111110
*/
112111
public static boolean validateConn(Connection conn, String validationQuery) {
113112
if (conn == null) {
114113
return false;
115114
}
116115

117116
try (Statement statement = conn.createStatement()) {
118-
if (conn.isClosed() || !conn.isValid(3)) {
117+
if (!conn.isValid(3)) {
119118
return false;
120119
}
121120
statement.execute(validationQuery);
122121
} catch (SQLException e) {
122+
e.printStackTrace();
123123
return false;
124124
}
125125

‎Common/src/main/java/root/common/database/implement/JdbcDatabaseConnectionPool.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public void createPool() {
6565
try {
6666
conn = DriverManager.getConnection(jdbc.getJdbcUrl(), jdbc.getJdbcId(), jdbc.getJdbcPw());
6767
} catch (SQLException e) {
68+
e.printStackTrace();
6869
log.error("Database getConnection Failed");
6970
}
7071
cm = new ConnMap(conn);

‎Common/src/main/java/root/common/server/implement/JschConnectionInfo.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,10 @@ public JschConnectionInfo(String serverName, ServerOS serverOS, String host, int
2727
this.alc = new AlertLogCommand();
2828
}
2929

30-
public JschConnectionInfo(String serverName, ServerOS serverOS, String host, String port, String userName,
31-
String password) {
32-
this(serverName, serverOS, host, 22, userName, password);
33-
this.setPort(port);
34-
}
35-
36-
public JschConnectionInfo(String serverName, ServerOS serverOS, String host, int port, String userName,
37-
String password, AlertLogCommand alc) {
38-
this(serverName, serverOS, host, port, userName, password);
39-
this.alc = alc;
40-
}
41-
4230
public JschConnectionInfo(String serverName, ServerOS serverOS, String host, String port, String userName,
4331
String password, AlertLogCommand alc) {
44-
this(serverName, serverOS, host, 22, userName, password, alc);
32+
this(serverName, serverOS, host, 22, userName, password);
33+
this.setAlc(alc);
4534
this.setPort(port);
4635
}
4736

@@ -58,7 +47,11 @@ public void setPort(String portString) {
5847
try {
5948
this.port = Integer.parseInt(portString);
6049
} catch (NumberFormatException e) {
61-
this.port = 22; // �⺻��
50+
this.port = 22;
6251
}
6352
}
53+
54+
public void setPort(int port) {
55+
this.port = port;
56+
}
6457
}

‎Common/src/test/java/root/common/database/implement/JdbcConnectionInfoTest.java‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
package root.common.database.implement;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertFalse;
5+
import static org.junit.jupiter.api.Assertions.assertTrue;
6+
7+
import org.junit.jupiter.api.Test;
8+
9+
public class JdbcConnectionInfoTest {
10+
11+
public static String jdbcDBName = "Test";
12+
public static String jdbcDriver = "oracle.jdbc.driver.OracleDriver";
13+
public static String jdbcUrl = "jdbc:oracle:thin:@111.111.111.111:1521/DBSID";
14+
public static String jdbcId = "dbid";
15+
public static String jdbcPw = "dbpw";
16+
public static String jdbcValidation = "select 1 from dual";
17+
public static int jdbcConnections = 10;
18+
19+
public static String jdbcSID = "SID";
20+
public static String jdbcHost = "111.111.111.111";
21+
public static String jdbcPort = "1521";
22+
public static String jdbcOracleDriver = "oracle.jdbc.driver.OracleDriver";
23+
24+
@Test
25+
public void testConstructor1() {
26+
new JdbcConnectionInfo();
27+
}
28+
29+
@Test
30+
public void testConstructor2() {
31+
new JdbcConnectionInfo(jdbcDriver, jdbcUrl, jdbcId, jdbcPw, jdbcValidation, jdbcConnections);
32+
}
33+
34+
@Test
35+
public void testConstructor3() {
36+
new JdbcConnectionInfo(jdbcDBName, jdbcDriver, jdbcUrl, jdbcId, jdbcPw, jdbcValidation, jdbcConnections);
37+
}
38+
39+
@Test
40+
public void testGetterSetter() {
41+
JdbcConnectionInfo jdbc = new JdbcConnectionInfo();
42+
jdbc.setJdbcDBName(jdbcDBName);
43+
jdbc.setJdbcDriver(jdbcDriver);
44+
jdbc.setJdbcUrl(jdbcUrl);
45+
jdbc.setJdbcId(jdbcId);
46+
jdbc.setJdbcPw(jdbcPw);
47+
jdbc.setJdbcValidation(jdbcValidation);
48+
jdbc.setJdbcConnections(jdbcConnections);
49+
jdbc.setJdbcSID(jdbcSID);
50+
jdbc.setJdbcHost(jdbcHost);
51+
jdbc.setJdbcPort(jdbcPort);
52+
jdbc.setJdbcOracleDriver(jdbcOracleDriver);
53+
54+
assertEquals(jdbcDBName, jdbc.getJdbcDBName());
55+
assertEquals(jdbcDriver, jdbc.getJdbcDriver());
56+
assertEquals(jdbcUrl, jdbc.getJdbcUrl());
57+
assertEquals(jdbcId, jdbc.getJdbcId());
58+
assertEquals(jdbcPw, jdbc.getJdbcPw());
59+
assertEquals(jdbcValidation, jdbc.getJdbcValidation());
60+
assertEquals(jdbcConnections, jdbc.getJdbcConnections());
61+
assertEquals(jdbcSID, jdbc.getJdbcSID());
62+
assertEquals(jdbcHost, jdbc.getJdbcHost());
63+
assertEquals(jdbcPort, jdbc.getJdbcPort());
64+
assertEquals(jdbcOracleDriver, jdbc.getJdbcOracleDriver());
65+
}
66+
67+
@Test
68+
public void testToString() {
69+
JdbcConnectionInfo jdbc = new JdbcConnectionInfo(jdbcDBName, jdbcDriver, jdbcUrl, jdbcId, jdbcPw,
70+
jdbcValidation, jdbcConnections);
71+
String expected = "JdbcConnectionInfo(jdbcDBName=" + jdbc.getJdbcDBName() + ", jdbcDriver="
72+
+ jdbc.getJdbcDriver() + ", jdbcUrl=" + jdbc.getJdbcUrl() + ", jdbcId=" + jdbc.getJdbcId() + ", jdbcPw="
73+
+ jdbc.getJdbcPw() + ", jdbcValidation=" + jdbc.getJdbcValidation() + ", jdbcConnections="
74+
+ jdbc.getJdbcConnections() + ", jdbcSID=" + jdbc.getJdbcSID() + ", jdbcHost=" + jdbc.getJdbcHost()
75+
+ ", jdbcPort=" + jdbc.getJdbcPort() + ", jdbcOracleDriver=" + jdbc.getJdbcOracleDriver() + ")";
76+
assertEquals(expected, jdbc.toString());
77+
}
78+
79+
@Test
80+
public void testEquals() {
81+
JdbcConnectionInfo jdbc1 = new JdbcConnectionInfo(jdbcDBName, jdbcDriver, jdbcUrl, jdbcId, jdbcPw,
82+
jdbcValidation, jdbcConnections);
83+
JdbcConnectionInfo jdbc2 = new JdbcConnectionInfo(jdbcDBName, jdbcDriver, jdbcUrl, jdbcId, jdbcPw,
84+
jdbcValidation, jdbcConnections);
85+
assertTrue(jdbc1.equals(jdbc1));
86+
assertTrue(jdbc1.equals(jdbc2));
87+
assertFalse(jdbc1.equals(new Object()));
88+
89+
jdbc1 = null;
90+
assertFalse(jdbc2.equals(jdbc1));
91+
assertFalse(jdbc2.equals(new Object()));
92+
}
93+
94+
@Test
95+
public void testHashCode() {
96+
JdbcConnectionInfo jdbc = new JdbcConnectionInfo(jdbcDBName, jdbcDriver, jdbcUrl, jdbcId, jdbcPw,
97+
jdbcValidation, jdbcConnections);
98+
jdbc.hashCode();
99+
}
100+
}

0 commit comments

Comments
 (0)