From 3364a8c8a971f17b0483f2c9161b4fe814607a9c Mon Sep 17 00:00:00 2001 From: "xiaochun.liu" Date: Sat, 8 Feb 2020 21:22:20 +0800 Subject: [PATCH 1/3] add script runner ut --- .../common/utils/ScriptRunnerTest.java | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java new file mode 100644 index 0000000000..165b3ed50f --- /dev/null +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java @@ -0,0 +1,78 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.dolphinscheduler.common.utils; +import org.junit.Assert; +import org.junit.Test; +import org.mockito.Mockito; +import java.io.StringReader; +import java.sql.*; + +public class ScriptRunnerTest { + @Test + public void testRunScript() { + //connection is null + Exception exception = null; + ScriptRunner s = new ScriptRunner(null, true, true); + try { + s.runScript(new StringReader("select 1")); + } catch (Exception e) { + exception = e; + } + Assert.assertNotNull(exception); + + //connect is not null + try { + Connection conn = Mockito.mock(Connection.class); + Mockito.when(conn.getAutoCommit()).thenReturn(true); + PreparedStatement st = Mockito.mock(PreparedStatement.class); + Mockito.when(conn.createStatement()).thenReturn(st); + ResultSet rs = Mockito.mock(ResultSet.class); + Mockito.when(st.getResultSet()).thenReturn(rs); + ResultSetMetaData md = Mockito.mock(ResultSetMetaData.class); + Mockito.when(rs.getMetaData()).thenReturn(md); + Mockito.when(md.getColumnCount()).thenReturn(1); + Mockito.when(rs.next()).thenReturn(true, false); + ScriptRunner s2 = new ScriptRunner(conn, true, true); + s2.runScript(new StringReader("select 1;")); + Mockito.verify(md).getColumnLabel(0); + } catch(Exception e) { + Assert.assertNotNull(e); + } + } + + @Test + public void testRunScriptWithDbName() { + //connect is not null + try { + Connection conn = Mockito.mock(Connection.class); + Mockito.when(conn.getAutoCommit()).thenReturn(true); + PreparedStatement st = Mockito.mock(PreparedStatement.class); + Mockito.when(conn.createStatement()).thenReturn(st); + ResultSet rs = Mockito.mock(ResultSet.class); + Mockito.when(st.getResultSet()).thenReturn(rs); + ResultSetMetaData md = Mockito.mock(ResultSetMetaData.class); + Mockito.when(rs.getMetaData()).thenReturn(md); + Mockito.when(md.getColumnCount()).thenReturn(1); + Mockito.when(rs.next()).thenReturn(true, false); + ScriptRunner s = new ScriptRunner(conn, true, true); + s.runScript(new StringReader("select 1;"), "test_db"); + Mockito.verify(md).getColumnLabel(0); + } catch(Exception e) { + Assert.assertNotNull(e); + } + } +} From bd10b78e292c12995e17fee32f068075a1c9e268 Mon Sep 17 00:00:00 2001 From: "xiaochun.liu" Date: Sun, 9 Feb 2020 10:09:31 +0800 Subject: [PATCH 2/3] delete dup code --- .../common/utils/ScriptRunnerTest.java | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java index 165b3ed50f..a36253f8ef 100644 --- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java @@ -36,41 +36,34 @@ public class ScriptRunnerTest { //connect is not null try { - Connection conn = Mockito.mock(Connection.class); - Mockito.when(conn.getAutoCommit()).thenReturn(true); - PreparedStatement st = Mockito.mock(PreparedStatement.class); - Mockito.when(conn.createStatement()).thenReturn(st); - ResultSet rs = Mockito.mock(ResultSet.class); - Mockito.when(st.getResultSet()).thenReturn(rs); - ResultSetMetaData md = Mockito.mock(ResultSetMetaData.class); - Mockito.when(rs.getMetaData()).thenReturn(md); - Mockito.when(md.getColumnCount()).thenReturn(1); - Mockito.when(rs.next()).thenReturn(true, false); - ScriptRunner s2 = new ScriptRunner(conn, true, true); + ScriptRunner s2 = getScriptRunner(); s2.runScript(new StringReader("select 1;")); - Mockito.verify(md).getColumnLabel(0); } catch(Exception e) { Assert.assertNotNull(e); } } + private ScriptRunner getScriptRunner() throws SQLException { + Connection conn = Mockito.mock(Connection.class); + Mockito.when(conn.getAutoCommit()).thenReturn(true); + PreparedStatement st = Mockito.mock(PreparedStatement.class); + Mockito.when(conn.createStatement()).thenReturn(st); + ResultSet rs = Mockito.mock(ResultSet.class); + Mockito.when(st.getResultSet()).thenReturn(rs); + ResultSetMetaData md = Mockito.mock(ResultSetMetaData.class); + Mockito.when(rs.getMetaData()).thenReturn(md); + Mockito.when(md.getColumnCount()).thenReturn(1); + Mockito.when(rs.next()).thenReturn(true, false); + ScriptRunner s2 = new ScriptRunner(conn, true, true); + Mockito.verify(md).getColumnLabel(0); + } + @Test public void testRunScriptWithDbName() { //connect is not null try { - Connection conn = Mockito.mock(Connection.class); - Mockito.when(conn.getAutoCommit()).thenReturn(true); - PreparedStatement st = Mockito.mock(PreparedStatement.class); - Mockito.when(conn.createStatement()).thenReturn(st); - ResultSet rs = Mockito.mock(ResultSet.class); - Mockito.when(st.getResultSet()).thenReturn(rs); - ResultSetMetaData md = Mockito.mock(ResultSetMetaData.class); - Mockito.when(rs.getMetaData()).thenReturn(md); - Mockito.when(md.getColumnCount()).thenReturn(1); - Mockito.when(rs.next()).thenReturn(true, false); - ScriptRunner s = new ScriptRunner(conn, true, true); + ScriptRunner s = getScriptRunner(); s.runScript(new StringReader("select 1;"), "test_db"); - Mockito.verify(md).getColumnLabel(0); } catch(Exception e) { Assert.assertNotNull(e); } From 2f33a9e2ab33598850766e749e2dabf18bbc8e64 Mon Sep 17 00:00:00 2001 From: "xiaochun.liu" Date: Sun, 9 Feb 2020 10:20:18 +0800 Subject: [PATCH 3/3] delete dup code --- .../common/utils/ScriptRunnerTest.java | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java index a36253f8ef..0eb1cce950 100644 --- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ScriptRunnerTest.java @@ -35,37 +35,36 @@ public class ScriptRunnerTest { Assert.assertNotNull(exception); //connect is not null + runScript(""); + } + + private void runScript(String dbName) { try { - ScriptRunner s2 = getScriptRunner(); - s2.runScript(new StringReader("select 1;")); + Connection conn = Mockito.mock(Connection.class); + Mockito.when(conn.getAutoCommit()).thenReturn(true); + PreparedStatement st = Mockito.mock(PreparedStatement.class); + Mockito.when(conn.createStatement()).thenReturn(st); + ResultSet rs = Mockito.mock(ResultSet.class); + Mockito.when(st.getResultSet()).thenReturn(rs); + ResultSetMetaData md = Mockito.mock(ResultSetMetaData.class); + Mockito.when(rs.getMetaData()).thenReturn(md); + Mockito.when(md.getColumnCount()).thenReturn(1); + Mockito.when(rs.next()).thenReturn(true, false); + ScriptRunner s = new ScriptRunner(conn, true, true); + if (dbName.isEmpty()) { + s.runScript(new StringReader("select 1;")); + } else { + s.runScript(new StringReader("select 1;"), dbName); + } + Mockito.verify(md).getColumnLabel(0); } catch(Exception e) { Assert.assertNotNull(e); } } - private ScriptRunner getScriptRunner() throws SQLException { - Connection conn = Mockito.mock(Connection.class); - Mockito.when(conn.getAutoCommit()).thenReturn(true); - PreparedStatement st = Mockito.mock(PreparedStatement.class); - Mockito.when(conn.createStatement()).thenReturn(st); - ResultSet rs = Mockito.mock(ResultSet.class); - Mockito.when(st.getResultSet()).thenReturn(rs); - ResultSetMetaData md = Mockito.mock(ResultSetMetaData.class); - Mockito.when(rs.getMetaData()).thenReturn(md); - Mockito.when(md.getColumnCount()).thenReturn(1); - Mockito.when(rs.next()).thenReturn(true, false); - ScriptRunner s2 = new ScriptRunner(conn, true, true); - Mockito.verify(md).getColumnLabel(0); - } - @Test public void testRunScriptWithDbName() { //connect is not null - try { - ScriptRunner s = getScriptRunner(); - s.runScript(new StringReader("select 1;"), "test_db"); - } catch(Exception e) { - Assert.assertNotNull(e); - } + runScript("db_test"); } }