[ignite-teamcity-bot] branch master updated: Code cleanup - unused test stop was removed

[dpavlov]

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git


The following commit(s) were added to refs/heads/master by this push:
     new 2fa56fa  Code cleanup - unused test stop was removed
2fa56fa is described below

commit 2fa56fa4691d7f449abc02a9f62cae904ece82a7
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Thu Sep 30 16:09:15 2021 +0300

    Code cleanup - unused test stop was removed
---
 .../java/org/apache/ignite/tcbot/engine/conf/GitHubConfig.java    | 5 +----
 .../org/apache/ignite/tcignited/buildlog/ILogProductSpecific.java | 5 -----
 .../org/apache/ignite/tcignited/buildlog/LogIgniteSpecific.java   | 7 -------
 .../java/org/apache/ignite/tcignited/buildlog/TestLogHandler.java | 8 +-------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git 
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/conf/GitHubConfig.java
 
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/conf/GitHubConfig.java
index 4f3252b..dae7647 100644
--- 
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/conf/GitHubConfig.java
+++ 
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/conf/GitHubConfig.java
@@ -104,10 +104,7 @@ public class GitHubConfig implements IGitHubConfig {
     @Override public String gitAuthTok() {
         String encAuth = gitAuthTokenEncoded();
 
-        if (isNullOrEmpty(encAuth))
-            return null;
-
-        return PasswordEncoder.decode(encAuth);
+        return isNullOrEmpty(encAuth) ? null : PasswordEncoder.decode(encAuth);
     }
 
     /** {@inheritDoc} */
diff --git 
a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/ILogProductSpecific.java
 
b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/ILogProductSpecific.java
index 335bc4b..32c15c0 100644
--- 
a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/ILogProductSpecific.java
+++ 
b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/ILogProductSpecific.java
@@ -29,10 +29,5 @@ public interface ILogProductSpecific {
     /**
      * @param line Line.
      */
-    public boolean isTestStopping(String line);
-
-    /**
-     * @param line Line.
-     */
     public boolean needWarn(String line);
 }
diff --git 
a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/LogIgniteSpecific.java
 
b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/LogIgniteSpecific.java
index 851b69a..ab3c0e8 100644
--- 
a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/LogIgniteSpecific.java
+++ 
b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/LogIgniteSpecific.java
@@ -27,8 +27,6 @@ public class LogIgniteSpecific implements ILogProductSpecific 
{
     private static final String STARTING_TEST = ">>> Starting test: ";
     /** Test name end. */
     private static final String TEST_NAME_END = " <<<";
-    /** Stopping test. */
-    private static final String STOPPING_TEST = ">>> Stopping test: ";
 
     /** {@inheritDoc} */
     @Override public boolean isTestStarting(String line) {
@@ -36,11 +34,6 @@ public class LogIgniteSpecific implements 
ILogProductSpecific {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean isTestStopping(String line) {
-        return line.contains(STOPPING_TEST);
-    }
-
-    /** {@inheritDoc} */
     @Override public boolean needWarn(String line) {
         return line.contains("java.lang.AssertionError:")
             || line.contains(JAVA_LEVEL_DEADLOCK_TXT)
diff --git 
a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/TestLogHandler.java
 
b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/TestLogHandler.java
index 79ccf2c..c24c16d 100644
--- 
a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/TestLogHandler.java
+++ 
b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/buildlog/TestLogHandler.java
@@ -51,13 +51,7 @@ public class TestLogHandler implements ILineHandler {
             if (currentTestName != null)
                 currentTestName = null;
 
-            String startTest = line.substring(line.indexOf(STARTING_TEST) + 
STARTING_TEST.length(), line.indexOf(TEST_NAME_END));
-
-            this.currentTestName = startTest;
-        }
-        else if (currentTestName != null && logSpecific.isTestStopping(line)) {
-            //currentTestName = null;
-
+            this.currentTestName = line.substring(line.indexOf(STARTING_TEST) 
+ STARTING_TEST.length(), line.indexOf(TEST_NAME_END));
         }
 
         if (currentTestName == null)