From 951904394b06eae8e470683292fdee8509860bc5 Mon Sep 17 00:00:00 2001 From: floxx2112 Date: Thu, 1 Jun 2023 09:21:42 +0200 Subject: [PATCH] Add unit test and opti with sonar --- pom.xml | 30 +- .../assistDbBackend/service/GitService.java | 6 +- .../service/ResetDataService.java | 62 +- .../service/ScriptsService.java | 75 +- .../assistDbBackend/service/TagsService.java | 42 +- src/main/resources/assistDbData.json | 2222 +---------------- src/main/resources/assistDbDataTest.json | 2221 ++++++++++++++++ .../assistDbBackend/AssistDBBackendTest.java | 30 +- .../repository/InfoColumnRepositoryTest.java | 135 + .../repository/InfoTableRepositoryTest.java | 97 + .../repository/LinkInfoRepositoryTest.java | 37 + .../service/GitServiceTest.java | 127 + .../service/InfoColumnServiceTest.java | 228 ++ .../service/InfoTableServiceTest.java | 157 ++ .../service/LinkInfoServiceTest.java | 96 + .../service/ResetDataServiceTest.java | 82 + .../service/ScriptsServiceTest.java | 251 ++ .../service/TagsServiceTest.java | 156 ++ src/test/resources/application.properties | 9 + src/test/resources/db/initDb/initDatas.sql | 0 src/test/resources/db/initDb/initDb.sql | 27 + src/test/resources/scripts.json | 1 + src/test/resources/tagtest.json | 1 + src/test/resources/testDb.json | 18 + 24 files changed, 3785 insertions(+), 2325 deletions(-) create mode 100644 src/main/resources/assistDbDataTest.json create mode 100644 src/test/java/com/apside/assistDbBackend/repository/InfoColumnRepositoryTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/repository/InfoTableRepositoryTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/repository/LinkInfoRepositoryTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/service/GitServiceTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/service/InfoColumnServiceTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/service/InfoTableServiceTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/service/LinkInfoServiceTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/service/ResetDataServiceTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/service/ScriptsServiceTest.java create mode 100644 src/test/java/com/apside/assistDbBackend/service/TagsServiceTest.java create mode 100644 src/test/resources/application.properties create mode 100644 src/test/resources/db/initDb/initDatas.sql create mode 100644 src/test/resources/db/initDb/initDb.sql create mode 100644 src/test/resources/scripts.json create mode 100644 src/test/resources/tagtest.json create mode 100644 src/test/resources/testDb.json diff --git a/pom.xml b/pom.xml index bf4b68d..42468b1 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ spring-boot-starter-tomcat provided - com.mysql mysql-connector-j @@ -66,7 +65,34 @@ org.eclipse.jgit 6.4.0.202211300538-r - + + com.h2database + h2 + runtime + + + junit + junit + test + + + org.mockito + mockito-core + 3.6.28 + + + org.junit.jupiter + junit-jupiter-engine + 5.9.1 + test + + + org.assertj + assertj-core + 3.4.1 + test + + diff --git a/src/main/java/com/apside/assistDbBackend/service/GitService.java b/src/main/java/com/apside/assistDbBackend/service/GitService.java index 9cde681..35a14dd 100644 --- a/src/main/java/com/apside/assistDbBackend/service/GitService.java +++ b/src/main/java/com/apside/assistDbBackend/service/GitService.java @@ -19,6 +19,8 @@ public class GitService { private final String tempDirectoryPath; + private UsernamePasswordCredentialsProvider userPass; + public GitService(){ tempDirectoryPath = new File(System.getProperty("user.dir")).getParent() + "\\AssistDB_AdditionalFiles"; } @@ -40,7 +42,9 @@ public class GitService { git.add().addFilepattern(".").call(); git.commit().setMessage("commited").call(); - git.push().setCredentialsProvider(new UsernamePasswordCredentialsProvider(userGit, accesToken)).call(); + userPass = new UsernamePasswordCredentialsProvider(userGit, accesToken); + + git.push().setCredentialsProvider(userPass).call(); } } diff --git a/src/main/java/com/apside/assistDbBackend/service/ResetDataService.java b/src/main/java/com/apside/assistDbBackend/service/ResetDataService.java index 89a526b..8612de1 100644 --- a/src/main/java/com/apside/assistDbBackend/service/ResetDataService.java +++ b/src/main/java/com/apside/assistDbBackend/service/ResetDataService.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; @Data @@ -24,11 +25,19 @@ public class ResetDataService { @Autowired private LinkInfoService linkInfoService; - private static final String tableStr = "table"; - private static final String nameStr = "name"; - private static final String dataTypeStr = "data_type"; - private static final String lengthStr = "length"; - private static final String columnTextStr = "column_text"; + private String result; + private Path path; + + private static final String TABLE_STRING = "table"; + private static final String NAME_STRING = "name"; + private static final String DATA_TYPE_STRING = "data_type"; + private static final String LENGTH_STRING = "length"; + private static final String COLUMN_TEXT_STRING = "column_text"; + + public ResetDataService() throws IOException { + path = Paths.get("src/main/resources/assistDbData.json"); + result = new String(Files.readAllBytes(path)); + } public void deleteEverything(){ infoColumnService.truncateMyColumn(); @@ -37,7 +46,6 @@ public class ResetDataService { } public void insertEverything() throws IOException { - String result = new String(Files.readAllBytes(Paths.get("src/main/resources/assistDbData.json"))); JSONArray jo = new JSONArray(result); for (int i=0; i retrieveScripts() throws IOException, GitAPIException { gitService.pullFromGit(); List