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 e8d611f Optimize imports & code formatted for TC Bot tests
e8d611f is described below
commit e8d611fd3f9ed5ca66b9377a373aeeb7d7c0e331
Author: Dmitriy Pavlov <[email protected]>
AuthorDate: Wed Feb 13 14:10:24 2019 +0300
Optimize imports & code formatted for TC Bot tests
---
.../ignite/ci/conf/ChainAtServerTracked.java | 2 -
.../org/apache/ignite/ci/conf/PasswordEncoder.java | 10 ++--
.../java/org/apache/ignite/ci/db/Ignite1Init.java | 34 +++++++-------
.../org/apache/ignite/ci/db/Ignite2Configurer.java | 23 +++++----
.../java/org/apache/ignite/ci/db/TcHelperDb.java | 4 +-
.../org/apache/ignite/ci/di/DiContextTest.java | 19 ++++----
.../org/apache/ignite/ci/di/cache/CachingTest.java | 4 +-
.../ignite/ci/issue/DetectingFailureTest.java | 3 --
.../ci/tcbot/chain/BuildChainProcessorTest.java | 2 +-
.../ci/tcbot/chain/MockBasedTcBotModule.java | 4 +-
.../ci/tcbot/chain/PrChainsProcessorTest.java | 22 ++++-----
.../ci/tcbot/chain/TrackedBranchProcessorTest.java | 4 +-
.../ignite/ci/tcbot/issue/IssueDetectorTest.java | 2 -
.../ci/teamcity/ignited/BuildKeyUnitTest.java | 2 +-
.../ignited/IgnitedTcInMemoryIntegrationTest.java | 8 ++--
.../ci/teamcity/ignited/TeamcityIgnitedMock.java | 54 +++++++++++-----------
.../ci/teamcity/pure/BuildHistoryEmulator.java | 4 +-
.../org/apache/ignite/ci/user/LoginAuthTest.java | 15 +++---
.../java/org/apache/ignite/ci/util/DiffTest.java | 2 +-
19 files changed, 99 insertions(+), 119 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServerTracked.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServerTracked.java
index 2e9cef8..4260a99 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServerTracked.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/ChainAtServerTracked.java
@@ -18,7 +18,6 @@
package org.apache.ignite.ci.conf;
import com.google.common.base.Strings;
-
import java.util.Objects;
import java.util.Optional;
import javax.annotation.Nonnull;
@@ -44,7 +43,6 @@ public class ChainAtServerTracked extends ChainAtServer {
/** Automatic build triggering quiet period in minutes. */
@Nullable private Integer triggerBuildQuietPeriod;
-
/** @return {@link #suiteId} */
@Nonnull public String getSuiteIdMandatory() {
checkState(!isNullOrEmpty(suiteId), "Invalid config: suiteId should be
filled " + this);
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java
index bcb8b50..8cf5f88 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/PasswordEncoder.java
@@ -19,12 +19,10 @@ package org.apache.ignite.ci.conf;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
-
import java.security.SecureRandom;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.DatatypeConverter;
-
import org.apache.ignite.ci.HelperConfig;
import org.apache.ignite.ci.util.CryptUtil;
import org.jetbrains.annotations.NotNull;
@@ -54,7 +52,7 @@ public class PasswordEncoder {
SecureRandom random = new SecureRandom();
byte[] pref = random.generateSeed(PREF_LEN);
byte[] suffix = random.generateSeed(POSTF_LEN);
- int length = bytes.length + CHAR ;
+ int length = bytes.length + CHAR;
if ((length & ~0xFF) != 0)
throw new IllegalStateException();
byte[] len = get1bLen(length);
@@ -92,7 +90,7 @@ public class PasswordEncoder {
public static void main0(String[] args) {
String pass = "324aadfe23....";
String encode = encode(pass);
- System.err.println("Encoded: " + HelperConfig.GITHUB_AUTH_TOKEN + "="
+ encode);
+ System.err.println("Encoded: " + HelperConfig.GITHUB_AUTH_TOKEN + "="
+ encode);
String decode = decode(encode);
Preconditions.checkState(decode.equals(pass));
}
@@ -100,7 +98,7 @@ public class PasswordEncoder {
public static void main1(String[] args) {
String pass = "mmm";
String encode = encode(pass);
- System.err.println("Encoded: " + HelperConfig.ENCODED_PASSWORD + "="
+ encode);
+ System.err.println("Encoded: " + HelperConfig.ENCODED_PASSWORD + "=" +
encode);
String decode = decode(encode);
Preconditions.checkState(decode.equals(pass));
}
@@ -112,7 +110,7 @@ public class PasswordEncoder {
public static void encodeJiraTok(String user, String pwd) {
String tok = HelperConfig.userPwdToToken(user, pwd);
String encode = encode(tok);
- System.err.println("Encoded: " + HelperConfig.JIRA_AUTH_TOKEN + "=" +
encode);
+ System.err.println("Encoded: " + HelperConfig.JIRA_AUTH_TOKEN + "=" +
encode);
String decode = decode(encode);
Preconditions.checkState(decode.equals(tok));
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite1Init.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite1Init.java
index 1457c8b..8fc7b8a 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite1Init.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite1Init.java
@@ -17,6 +17,13 @@
package org.apache.ignite.ci.db;
+import java.io.File;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
import org.apache.ignite.ci.HelperConfig;
@@ -30,21 +37,14 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.logger.slf4j.Slf4jLogger;
import org.jetbrains.annotations.NotNull;
-import java.io.File;
-import java.util.Collection;
-import java.util.Objects;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-public class Ignite1Init {
+public class Ignite1Init {
private static boolean clientMode;
/**
* Reference to Ignite init future.
*/
private AtomicReference<Future<Ignite>> igniteFutureRef =
- new AtomicReference<>();
+ new AtomicReference<>();
/**
* Internally initialized field with instance.
@@ -66,7 +66,6 @@ public class Ignite1Init {
return ignite;
}
-
@SuppressWarnings({"WeakerAccess", "UnusedReturnValue"})
@MonitoredTask(name = "Ignition Start")
@AutoProfiling
@@ -86,7 +85,6 @@ public class Ignite1Init {
return "Started, topVer " + ignite.cluster().topologyVersion();
}
-
@SuppressWarnings({"WeakerAccess", "UnusedReturnValue"})
@MonitoredTask(name = "Ignite Activate")
@AutoProfiling
@@ -103,10 +101,10 @@ public class Ignite1Init {
final Collection<BaselineNode> baselineNodes =
ignite.cluster().currentBaselineTopology();
final String str
- = Objects.requireNonNull(baselineNodes)
- .stream()
- .map(BaselineNode::consistentId)
- .collect(Collectors.toList()).toString();
+ = Objects.requireNonNull(baselineNodes)
+ .stream()
+ .map(BaselineNode::consistentId)
+ .collect(Collectors.toList()).toString();
return "Activated, BLT=" + str;
}
@@ -141,16 +139,16 @@ public class Ignite1Init {
return startIgnite();
}
-
public Future<Ignite> getIgniteFuture() {
final FutureTask<Ignite> futureTask = new FutureTask<>(this::init);
- if(igniteFutureRef.compareAndSet(null, futureTask)) {
+ if (igniteFutureRef.compareAndSet(null, futureTask)) {
final Thread thread = new Thread(futureTask,
"ignite-1-init-thread");
thread.start();
return futureTask;
- } else
+ }
+ else
return igniteFutureRef.get();
}
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite2Configurer.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite2Configurer.java
index 29ccee1..ddb4f6f 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite2Configurer.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite2Configurer.java
@@ -22,6 +22,8 @@ import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.core.rolling.RollingFileAppender;
import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
+import java.io.File;
+import java.io.IOException;
import org.apache.ignite.ci.HelperConfig;
import org.apache.ignite.ci.tcbot.TcBotSystemProperties;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -31,14 +33,11 @@ import org.apache.ignite.configuration.WALMode;
import org.jetbrains.annotations.NotNull;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.IOException;
-
public class Ignite2Configurer {
public static void configLogger(File workDir, String subdir) {
- LoggerContext logCtx = (LoggerContext)
LoggerFactory.getILoggerFactory();
+ LoggerContext logCtx =
(LoggerContext)LoggerFactory.getILoggerFactory();
- PatternLayoutEncoder logEncoder = new PatternLayoutEncoder();
+ PatternLayoutEncoder logEncoder = new PatternLayoutEncoder();
logEncoder.setContext(logCtx);
logEncoder.setPattern("%-12date{YYYY-MM-dd HH:mm:ss.SSS} %-5level [%t]
- %msg%n");
logEncoder.start();
@@ -52,7 +51,6 @@ public class Ignite2Configurer {
final File logs = new File(workDir, subdir);
HelperConfig.ensureDirExist(logs);
-
TimeBasedRollingPolicy logFilePolicy = new TimeBasedRollingPolicy();
logFilePolicy.setContext(logCtx);
logFilePolicy.setParent(rollingFa);
@@ -112,7 +110,8 @@ public class Ignite2Configurer {
LoggerFactory.getLogger(Ignite2Configurer.class).error("Unable
to setup region", e);
}
- } else {
+ }
+ else {
String msg = "Using default size of region.";
LoggerFactory.getLogger(Ignite2Configurer.class).info(msg);
System.out.println(msg);
@@ -122,10 +121,10 @@ public class Ignite2Configurer {
static DataStorageConfiguration
getDataStorageConfiguration(DataRegionConfiguration regConf) {
return new DataStorageConfiguration()
- .setWalMode(WALMode.LOG_ONLY)
- .setWalHistorySize(1)
- .setCheckpointFrequency(5 * 60 * 1000)
- .setWriteThrottlingEnabled(true)
- .setDefaultDataRegionConfiguration(regConf);
+ .setWalMode(WALMode.LOG_ONLY)
+ .setWalHistorySize(1)
+ .setCheckpointFrequency(5 * 60 * 1000)
+ .setWriteThrottlingEnabled(true)
+ .setDefaultDataRegionConfiguration(regConf);
}
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
index 140859e..960eccd 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
@@ -20,13 +20,13 @@ package org.apache.ignite.ci.db;
import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.Collections;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.ci.web.model.Version;
-import org.apache.ignite.configuration.*;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.logger.slf4j.Slf4jLogger;
import org.apache.ignite.spi.IgniteSpiContext;
import org.apache.ignite.spi.IgniteSpiException;
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/DiContextTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/DiContextTest.java
index ce32465..766e626 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/DiContextTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/DiContextTest.java
@@ -72,8 +72,8 @@ public class DiContextTest {
Injector injector = getInjector();
TcUpdatePool pool = injector.getInstance(TcUpdatePool.class);
- Preconditions.checkState(pool == injector.getInstance((Class<?>)
TcUpdatePool.class),
- "Instance not cached for type " + TcUpdatePool.class);
+ Preconditions.checkState(pool ==
injector.getInstance((Class<?>)TcUpdatePool.class),
+ "Instance not cached for type " + TcUpdatePool.class);
pool.stop();
}
@@ -81,7 +81,7 @@ public class DiContextTest {
private <T> T validateInstanceCachedFor(Injector injector, Class<T> type) {
final T firstInstance = injector.getInstance(type);
Preconditions.checkState(firstInstance == injector.getInstance(type),
- "Instance not cached for type " + type);
+ "Instance not cached for type " + type);
return firstInstance;
}
@@ -104,8 +104,8 @@ public class DiContextTest {
if (fullParametrized.equals(next.name()))
foundPar = true;
- if (MonitorTest.TASK_NME .equals(next.name()))
- found = true;
+ if (MonitorTest.TASK_NME.equals(next.name()))
+ found = true;
}
assertTrue(foundPar);
@@ -116,12 +116,13 @@ public class DiContextTest {
public static final String TASK_NME = "test";
- @MonitoredTask(name = TASK_NME, nameExtArgIndex=0)
- public void doSmth(String parameter) {}
-
+ @MonitoredTask(name = TASK_NME, nameExtArgIndex = 0)
+ public void doSmth(String parameter) {
+ }
@MonitoredTask(name = TASK_NME)
- public void doSmth() {}
+ public void doSmth() {
+ }
}
@Test
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/cache/CachingTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/cache/CachingTest.java
index de38491..25682a2 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/cache/CachingTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/cache/CachingTest.java
@@ -52,9 +52,8 @@ public class CachingTest {
assertEquals(400, instance.toStringMtdCalls.get());
}
-
for (int i = 0; i < 100; i++)
- instance.parseInt(Integer.toString(i%10));
+ instance.parseInt(Integer.toString(i % 10));
assertEquals(10, instance.parseIntMtdCalls.get());
@@ -84,7 +83,6 @@ public class CachingTest {
return Integer.toString(i);
}
-
@GuavaCached(cacheNegativeNumbersRval = false)
public int parseInt(String val) {
parseIntMtdCalls.incrementAndGet();
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
index 2de53c1..14496df 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
@@ -122,7 +122,6 @@ public class DetectingFailureTest {
assertEquals(firstFailedBuildId, buildId.intValue());
}
-
@Test
public void detectNewContributedTestFailure() {
RunStat statWithHist = new RunStat("");
@@ -154,7 +153,6 @@ public class DetectingFailureTest {
assertEquals(firstFailedBuildId, buildId.intValue());
}
-
@Test
public void detectSuiteFailureIsOnlyOnce() {
RunStat stat = new RunStat("");
@@ -182,7 +180,6 @@ public class DetectingFailureTest {
assertNotNull(buildId);
assertEquals(firstFailedBuildId, buildId.intValue());
-
for (int i = 0; i < 4; i++)
stat.setBuildCriticalError(timedOutBuildCnt + firstFailedBuildId +
i);
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessorTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessorTest.java
index a3ab9e0..6a099d8 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessorTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessorTest.java
@@ -202,7 +202,7 @@ public class BuildChainProcessorTest {
@NotNull public ITeamcityIgnited tcIgnitedMock(Map<Integer,
FatBuildCompacted> builds) {
return TeamcityIgnitedMock.getMutableMapTeamcityIgnited(builds,
- injector.getInstance(IStringCompactor.class));
+ injector.getInstance(IStringCompactor.class));
}
@NotNull public static FatBuildCompacted testFatBuild(IStringCompactor c,
int id, String bt) {
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java
index 54f177b..38a91a3 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java
@@ -56,8 +56,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Setup TC bot context with Ignited services mocks:
- * - TC: {@link TeamcityIgnitedProviderMock}
+ * Setup TC bot context with Ignited services mocks: - TC: {@link
TeamcityIgnitedProviderMock}
*/
public class MockBasedTcBotModule extends AbstractModule {
private BranchesTracked tracked = new BranchesTracked();
@@ -146,7 +145,6 @@ public class MockBasedTcBotModule extends AbstractModule {
}
/**
- *
* @param jiraCfg JIRA config.
*/
private void mockJira(IJiraServerConfig jiraCfg) {
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
index 3c07d25..b2de7bf 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
@@ -57,8 +57,8 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
/**
- * Unit test for {@link PrChainsProcessor} and blockers detection.
- * Emulates builds using Mockito. Does not start an Ignite node.
+ * Unit test for {@link PrChainsProcessor} and blockers detection. Emulates
builds using Mockito. Does not start an
+ * Ignite node.
*/
public class PrChainsProcessorTest {
public static final String SRV_ID = "apache";
@@ -102,7 +102,7 @@ public class PrChainsProcessorTest {
/** */
@Before
public void initBuilds() {
- final TeamcityIgnitedProviderMock instance =
(TeamcityIgnitedProviderMock)
injector.getInstance(ITeamcityIgnitedProvider.class);
+ final TeamcityIgnitedProviderMock instance =
(TeamcityIgnitedProviderMock)injector.getInstance(ITeamcityIgnitedProvider.class);
instance.addServer(SRV_ID, apacheBuilds);
}
@@ -117,7 +117,7 @@ public class PrChainsProcessorTest {
PrChainsProcessor prcp = injector.getInstance(PrChainsProcessor.class);
final List<SuiteCurrentStatus> blockers =
prcp.getBlockersSuitesStatuses(btId,
- branch, SRV_ID, mock(ICredentialsProv.class));
+ branch, SRV_ID, mock(ICredentialsProv.class));
System.out.println(blockers);
assertNotNull(blockers);
@@ -186,7 +186,7 @@ public class PrChainsProcessorTest {
public Optional<TestFailure>
findBlockerTestFailure(List<SuiteCurrentStatus> blockers, String name) {
Optional<SuiteCurrentStatus> suiteOpt =
blockers.stream().filter(containsTestFail(name)).findAny();
- return suiteOpt.flatMap(suite->suite.testFailures.stream().filter(tf
-> name.equals(tf.name)).findAny());
+ return suiteOpt.flatMap(suite -> suite.testFailures.stream().filter(tf
-> name.equals(tf.name)).findAny());
}
/**
@@ -240,7 +240,7 @@ public class PrChainsProcessorTest {
for (int i = 0; i < 10; i++) {
final FatBuildCompacted successfull =
- createFatBuild(c, CACHE_1, "some-exotic-branch", i+7777,
100020, true)
+ createFatBuild(c, CACHE_1, "some-exotic-branch", i + 7777,
100020, true)
.addTests(c,
Lists.newArrayList(
createPassingTest(1L, TEST_WITHOUT_HISTORY),
@@ -305,7 +305,7 @@ public class PrChainsProcessorTest {
final FatBuildCompacted cancelledBuild = new FatBuildCompacted(c,
build);
- cancelledBuild.snapshotDependencies(new int[]{buildBuild.id()});
+ cancelledBuild.snapshotDependencies(new int[] {buildBuild.id()});
final int id = 1000;
@@ -338,8 +338,6 @@ public class PrChainsProcessorTest {
addBuildsToEmulatedStor(buildBuild, cache9, chain);
}
-
-
/**
* Adds builds into emulated storage.
*
@@ -349,7 +347,7 @@ public class PrChainsProcessorTest {
for (FatBuildCompacted build : builds) {
final FatBuildCompacted oldB = apacheBuilds.put(build.id(), build);
- Preconditions.checkState(oldB==null);
+ Preconditions.checkState(oldB == null);
}
}
@@ -375,7 +373,7 @@ public class PrChainsProcessorTest {
}
@NotNull
- public FatBuildCompacted createFailedBuild(IStringCompactor c, String
btId, String branch, int id, long ageMs) {
+ public FatBuildCompacted createFailedBuild(IStringCompactor c, String
btId, String branch, int id, long ageMs) {
return createFatBuild(c, btId, branch, id, ageMs, false);
}
@@ -430,7 +428,7 @@ public class PrChainsProcessorTest {
cache8.changes(new int[] {i}); //change which failed this test
final FatBuildCompacted chain =
- createFailedBuild(c, btId, branch, 1220+i, 100000)
+ createFailedBuild(c, btId, branch, 1220 + i, 100000)
.snapshotDependencies(new int[] {cache8.id()});
addBuildsToEmulatedStor(buildBuild, cache8, chain);
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
index ed0c392..765789f 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
@@ -75,7 +75,7 @@ public class TrackedBranchProcessorTest {
/** */
@Before
public void initBuilds() {
- final TeamcityIgnitedProviderMock instance =
(TeamcityIgnitedProviderMock)
injector.getInstance(ITeamcityIgnitedProvider.class);
+ final TeamcityIgnitedProviderMock instance =
(TeamcityIgnitedProviderMock)injector.getInstance(ITeamcityIgnitedProvider.class);
instance.addServer(SRV_ID, apacheBuilds);
}
@@ -156,7 +156,7 @@ public class TrackedBranchProcessorTest {
}
public Optional<TestFailure> findTestFailure(SuiteCurrentStatus
suiteFails, String name) {
- return suiteFails.testFailures.stream().filter(tf ->
tf.name.equals(name)) .findAny();
+ return suiteFails.testFailures.stream().filter(tf ->
tf.name.equals(name)).findAny();
}
}
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
index af63eaa..c20fcf0 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
@@ -60,7 +60,6 @@ public class IssueDetectorTest {
/** Builds emulated storage. */
private Map<Integer, FatBuildCompacted> apacheBuilds = new
ConcurrentHashMap<>();
-
/** Config Branches tracked. */
private BranchesTracked branchesTracked = new BranchesTracked();
/**
@@ -85,7 +84,6 @@ public class IssueDetectorTest {
return chain;
}
-
@Test
public void testDetector() throws IOException {
String brachName = "masterTest";
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/BuildKeyUnitTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/BuildKeyUnitTest.java
index 716051d..774af90 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/BuildKeyUnitTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/BuildKeyUnitTest.java
@@ -32,7 +32,7 @@ public class BuildKeyUnitTest {
public void testKeyTransformations() {
int apache = ITeamcityIgnited.serverIdToInt("apache");
- for (int i = 0; i < 10000000; i+=132) {
+ for (int i = 0; i < 10000000; i += 132) {
int buildId = 2264667 + i;
long cacheKey = FatBuildDao.buildIdToCacheKey(apache, buildId);
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
index fb20dc6..1f5087e 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
@@ -227,7 +227,7 @@ public class IgnitedTcInMemoryIntegrationTest {
if (url.contains("app/rest/latest/projects/" + projectId))
return getClass().getResourceAsStream("/" + projectId +
- (buildTypeRmv.get() ? "_v2" : "") + ".xml");
+ (buildTypeRmv.get() ? "_v2" : "") + ".xml");
if ((url.contains("app/rest/latest/buildTypes/id:" + runAll))
&& !runAllRmv.get())
return getClass().getResourceAsStream("/" + runAll +
".xml");
@@ -253,7 +253,7 @@ public class IgnitedTcInMemoryIntegrationTest {
List<String> buildTypes =
srv.getCompositeBuildTypesIdsSortedByBuildNumberCounter(projectId);
- assertEquals(buildTypes.size(),1);
+ assertEquals(buildTypes.size(), 1);
assertEquals(buildTypes.get(0), runAll);
@@ -573,7 +573,6 @@ public class IgnitedTcInMemoryIntegrationTest {
assertEquals(0.5, cache1HistAllBranch.getFailRate(), 0.05);
}
-
@Test
public void testHistoryBackgroundUpdateWorks() {
Injector injector = Guice.createInjector(new TeamcityIgnitedModule(),
new IgniteAndSchedulerTestModule());
@@ -595,7 +594,6 @@ public class IgnitedTcInMemoryIntegrationTest {
final IStringCompactor c =
injector.getInstance(IStringCompactor.class);
-
final PrChainsProcessorTest tst = new PrChainsProcessorTest();
tst.initBuildChainAndMasterHistory(c, btId, branch);
@@ -698,7 +696,7 @@ public class IgnitedTcInMemoryIntegrationTest {
}
@NotNull public List<BuildRef> printRefs(IStringCompactor c,
List<BuildRefCompacted> running2) {
- return
running2.stream().map(bref->bref.toBuildRef(c)).collect(Collectors.toList());
+ return running2.stream().map(bref ->
bref.toBuildRef(c)).collect(Collectors.toList());
}
/**
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
index d3225c0..8006701 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
@@ -38,7 +38,8 @@ import static org.mockito.Mockito.when;
public class TeamcityIgnitedMock {
@NotNull
- public static ITeamcityIgnited getMutableMapTeamcityIgnited(Map<Integer,
FatBuildCompacted> builds, IStringCompactor c) {
+ public static ITeamcityIgnited getMutableMapTeamcityIgnited(Map<Integer,
FatBuildCompacted> builds,
+ IStringCompactor c) {
ITeamcityIgnited tcIgnited = Mockito.mock(ITeamcityIgnited.class);
Map<RunHistKey, RunHistCompacted> histCache = new
ConcurrentHashMap<>();
final int srvId = 0;
@@ -84,47 +85,48 @@ public class TeamcityIgnitedMock {
});
when(tcIgnited.getTestRunHist(any(TestInBranch.class)))
- .thenAnswer((inv) -> {
- final TestInBranch t = inv.getArgument(0);
- final String name = t.name;
- final String branch = t.branch;
-
- // System.out.println("Search history " + name + " in " +
branch + ": " );
-
- if (histCache.isEmpty()) {
- synchronized (histCache) {
- if (histCache.isEmpty())
- initHistory(c, histCache, builds, srvId);
- }
+ .thenAnswer((inv) -> {
+ final TestInBranch t = inv.getArgument(0);
+ final String name = t.name;
+ final String branch = t.branch;
+
+ // System.out.println("Search history " + name + " in " +
branch + ": " );
+
+ if (histCache.isEmpty()) {
+ synchronized (histCache) {
+ if (histCache.isEmpty())
+ initHistory(c, histCache, builds, srvId);
}
+ }
- final Integer tstName = c.getStringIdIfPresent(name);
- if (tstName == null)
- return null;
+ final Integer tstName = c.getStringIdIfPresent(name);
+ if (tstName == null)
+ return null;
- final Integer branchId = c.getStringIdIfPresent(branch);
- if (branchId == null)
- return null;
+ final Integer branchId = c.getStringIdIfPresent(branch);
+ if (branchId == null)
+ return null;
- final RunHistKey key = new RunHistKey(srvId, tstName,
branchId);
+ final RunHistKey key = new RunHistKey(srvId, tstName,
branchId);
- final RunHistCompacted runHistCompacted =
histCache.get(key);
+ final RunHistCompacted runHistCompacted = histCache.get(key);
- System.out.println("Test history " + name + " in " +
branch + " => " + runHistCompacted);
+ System.out.println("Test history " + name + " in " + branch +
" => " + runHistCompacted);
- return runHistCompacted;
- });
+ return runHistCompacted;
+ });
// when(tcIgnited.gitBranchPrefix()).thenReturn("ignite-");
return tcIgnited;
}
- public static void initHistory(IStringCompactor c, Map<RunHistKey,
RunHistCompacted> resHistCache, Map<Integer, FatBuildCompacted> builds, int
srvId) {
+ public static void initHistory(IStringCompactor c, Map<RunHistKey,
RunHistCompacted> resHistCache,
+ Map<Integer, FatBuildCompacted> builds, int srvId) {
Map<RunHistKey, RunHistCompacted> histCache = new
ConcurrentHashMap<>();
for (FatBuildCompacted build : builds.values()) {
- if(!build.isFinished(c))
+ if (!build.isFinished(c))
continue;
build.getAllTests().forEach(t -> {
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/pure/BuildHistoryEmulator.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/pure/BuildHistoryEmulator.java
index babb18f..7cecc57 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/pure/BuildHistoryEmulator.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/pure/BuildHistoryEmulator.java
@@ -60,7 +60,7 @@ public class BuildHistoryEmulator {
nextStart = start + returnNow;
Builds builds = createBuilds(cnt, returnNow, nextStart);
- List<BuildRef> buildsList = new ArrayList<>();
+ List<BuildRef> buildsList = new ArrayList<>();
for (int i = start; i < start + returnNow; i++)
buildsList.add(sharedState.get(i));
@@ -98,7 +98,7 @@ public class BuildHistoryEmulator {
String cntStr = m.group(0);
- if(cntStr == null)
+ if (cntStr == null)
return def;
return Integer.parseInt(cntStr.substring(prefix.length()));
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/user/LoginAuthTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/user/LoginAuthTest.java
index 70bb78e..be85137 100644
---
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/user/LoginAuthTest.java
+++
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/user/LoginAuthTest.java
@@ -52,7 +52,7 @@ public class LoginAuthTest {
Login login = createLogin();
LoginResponse login1
- = login.doLogin("user", "password", storage, "public",
Collections.emptySet(), tcLogin);
+ = login.doLogin("user", "password", storage, "public",
Collections.emptySet(), tcLogin);
assertNotNull(login1.fullToken);
AuthenticationFilter authenticationFilter = new AuthenticationFilter();
@@ -77,10 +77,9 @@ public class LoginAuthTest {
doAnswer(i -> {
UserSession argument = i.getArgument(1);
sessionRef.set(argument);
- return (Void) null;
+ return (Void)null;
}).when(storage).putSession(anyString(), any(UserSession.class));
-
AtomicReference<TcHelperUser> userRef = new AtomicReference<>();
when(storage.getUser(anyString())).thenAnswer((i) -> userRef.get());
doAnswer(i -> {
@@ -88,13 +87,12 @@ public class LoginAuthTest {
userRef.set(argument);
- return (Void) null;
+ return (Void)null;
}).when(storage).putUser(anyString(), any(TcHelperUser.class));
return storage;
}
-
private ContainerRequestContext mockCtxWithParams() {
ContainerRequestContext ctx =
Mockito.mock(ContainerRequestContext.class);
Map<Object, Object> atts = new HashMap<>();
@@ -103,7 +101,7 @@ public class LoginAuthTest {
doAnswer(i -> {
atts.put(i.getArgument(0), i.getArgument(1));
- return (Void) null;
+ return (Void)null;
}).when(ctx).setProperty(anyString(), any(Object.class));
return ctx;
@@ -127,7 +125,7 @@ public class LoginAuthTest {
assertTrue(authenticationFilter.authenticate(ctx,
loginResponse.fullToken, storage));
- ICredentialsProv creds = (ICredentialsProv)
ctx.getProperty(ICredentialsProv._KEY);
+ ICredentialsProv creds =
(ICredentialsProv)ctx.getProperty(ICredentialsProv._KEY);
assertNotNull(creds);
@@ -138,7 +136,6 @@ public class LoginAuthTest {
assertEquals(password, creds.getPassword(srvId));
}
-
@Test
public void testAuthFailedWithBrokenToken() {
UserAndSessionsStorage storage = mockOneSessionStor();
@@ -149,7 +146,7 @@ public class LoginAuthTest {
int sepIdx = fullToken.indexOf(':');
String brokenToken = fullToken.substring(0, sepIdx + 1) +
- Base64Util.encodeBytesToString(new byte[128 / 8]);
+ Base64Util.encodeBytesToString(new byte[128 / 8]);
assertNotNull(fullToken);
AuthenticationFilter authenticationFilter = new AuthenticationFilter();
diff --git
a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/util/DiffTest.java
b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/util/DiffTest.java
index ff6d2b3..4090b1e 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/util/DiffTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/util/DiffTest.java
@@ -49,7 +49,7 @@ public class DiffTest {
@Test
public void testDuplicates() {
Diff<String> diff =
- new Diff<>( Arrays.asList("A", "A", "B", "D", "D"),
Arrays.asList("A", "B", "B", "D", "E", "E", "F"));
+ new Diff<>(Arrays.asList("A", "A", "B", "D", "D"),
Arrays.asList("A", "B", "B", "D", "E", "E", "F"));
Assert.assertArrayEquals(new String[] {"B", "E", "E", "F"},
diff.added().toArray());
Assert.assertArrayEquals(new String[] {"A", "D"},
diff.removed().toArray());
