From d48ae5c24b6f4582574f69a6abb0fd77f885a3b6 Mon Sep 17 00:00:00 2001 From: vran Date: Thu, 17 Mar 2022 08:39:31 +0800 Subject: [PATCH] fix: checkstyle --- .../java/com/databasir/dao/converter/.gitkeep | 0 plugin/src/test/java/App.java | 34 ------------ .../core/diff/service/DiffsTest.java | 55 ++++++++----------- 3 files changed, 23 insertions(+), 66 deletions(-) delete mode 100644 dao/src/main/java/com/databasir/dao/converter/.gitkeep delete mode 100644 plugin/src/test/java/App.java diff --git a/dao/src/main/java/com/databasir/dao/converter/.gitkeep b/dao/src/main/java/com/databasir/dao/converter/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/plugin/src/test/java/App.java b/plugin/src/test/java/App.java deleted file mode 100644 index 4f884ef..0000000 --- a/plugin/src/test/java/App.java +++ /dev/null @@ -1,34 +0,0 @@ -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.Properties; - -public class App { - -// @Test -// public void testRenderAsMarkdown() throws SQLException, ClassNotFoundException { -// try (FileOutputStream out = new FileOutputStream("demo.md")) { -// Connection connection = getJdbcConnection(); -// Databasir databasir = Databasir.of(); -// DatabaseMeta doc = databasir.get(connection, "demo").orElseThrow(); -// databasir.renderAsMarkdown(doc, out); -// } catch (IOException e) { -// throw new IllegalStateException(e); -// } -// } - - private static Connection getJdbcConnection() throws SQLException, ClassNotFoundException { - // get database connection - Class.forName("com.mysql.cj.jdbc.Driver"); - - Properties info = new Properties(); - info.put("user", "root"); - info.put("password", "123456"); - // this config is used by mysql - info.put("useInformationSchema", "true"); - - String url = "jdbc:mysql://localhost:3306/demo?" - + "useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true"; - return DriverManager.getConnection(url, info); - } -} diff --git a/plugin/src/test/java/com/databasir/core/diff/service/DiffsTest.java b/plugin/src/test/java/com/databasir/core/diff/service/DiffsTest.java index 6e50808..fc4e460 100644 --- a/plugin/src/test/java/com/databasir/core/diff/service/DiffsTest.java +++ b/plugin/src/test/java/com/databasir/core/diff/service/DiffsTest.java @@ -175,6 +175,12 @@ class DiffsTest { }); } + /** + * modify three table: departments, dept_emp + * - dept_manager: add comment, change table type + * - departments: add comment + * - dept_emp: add comment + */ @Test void diffTableModified() { DatabaseMeta original = load("ut/diffsTest/diffTableModified/original.json"); @@ -184,12 +190,6 @@ class DiffsTest { RootDiff diff = Diffs.diff(original, current); assertEquals(DiffType.MODIFIED, diff.getDiffType()); - /** - * modify three table: departments, dept_emp - * - dept_manager: add comment, change table type - * - departments: add comment - * - dept_emp: add comment - */ assertSame(1, diff.getFields().size()); FieldDiff tableField = diff.getFields().iterator().next(); assertEquals("tables", tableField.getFieldName()); @@ -211,11 +211,6 @@ class DiffsTest { .stream() .collect(Collectors.toMap(TableMeta::getName, Function.identity())); - /** - * - departments: add comment - * - dept_emp: add comment - * - dept_manager: add comment, change table type - */ List.of("departments", "dept_emp", "dept_manager").forEach(tableName -> { assertTrue(tableFieldMap.containsKey(tableName)); FieldDiff departments = tableFieldMap.get(tableName); @@ -380,13 +375,6 @@ class DiffsTest { .findFirst() .orElseThrow(); - /** - * dept_emp - * fk: dept_emp_ibfk_2 - * column: from_date, to_date - * index: dept_no - * trigger: before_insert - */ List.of("dept_emp").forEach(tableName -> { assertTrue(tableFieldMap.containsKey(tableName)); FieldDiff departments = tableFieldMap.get(tableName); @@ -445,6 +433,21 @@ class DiffsTest { }); } + + /** + * departments + * column: dept_no add comment + * column: dept_name add comment + * indexes: dept_name change unique=false + *

+ * dept_emp + * column: emp_no change default value + * column: dept_noL change auto increment true + * indexes: dept_no + * triggers: before_insert + * foreignKeys: dept_emp_ibfk_2 + *

+ */ @Test void diffTableFieldsModified() { DatabaseMeta original = load("ut/diffsTest/diffTableFieldsModified/original.json"); @@ -476,19 +479,6 @@ class DiffsTest { .stream() .collect(Collectors.toMap(TableMeta::getName, Function.identity())); - /** - * departments - * column: dept_no add comment - * column: dept_name add comment - * indexes: dept_name change unique=false - * - * dept_emp - * column: emp_no change default value - * column: dept_noL change auto increment true - * indexes: dept_no - * triggers: before_insert - * foreignKeys: dept_emp_ibfk_2 - */ List.of("departments", "dept_emp").forEach(tableName -> { assertTrue(tableFieldMap.containsKey(tableName)); FieldDiff tableField = tableFieldMap.get(tableName); @@ -571,7 +561,8 @@ class DiffsTest { assertTrue(currentTableMap.get(tableName) .getForeignKeys().stream().anyMatch(f -> Objects.equals(f, currentFk))); } - if (tableName.equals("departments") && List.of("foreignKeys", "triggers").contains(field.getFieldName())) { + if (tableName.equals("departments") + && List.of("foreignKeys", "triggers").contains(field.getFieldName())) { assertIsNone(field); } }