You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/10/11 10:12:02 UTC
[ignite-teamcity-bot] branch ignite-9848-load-all-builds updated:
IGNITE-9848: Test refactoring to prepare new one
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9848-load-all-builds
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9848-load-all-builds by this push:
new 6422bdd IGNITE-9848: Test refactoring to prepare new one
6422bdd is described below
commit 6422bddfef57d6843b09db0f104320594099334d
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Oct 11 13:11:46 2018 +0300
IGNITE-9848: Test refactoring to prepare new one
---
.../ci/di/scheduler/DirectExecNoWaitSheduler.java | 0
.../ignited/IgnitedTcInMemoryIntegrationTest.java | 95 ++++++++++++++--------
.../src/test/resources/testFull.xml | 2 +-
3 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/DirectExecNoWaitSheduler.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/scheduler/DirectExecNoWaitSheduler.java
similarity index 100%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/DirectExecNoWaitSheduler.java
rename to ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/di/scheduler/DirectExecNoWaitSheduler.java
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 f66abd5..233f918 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
@@ -29,6 +29,9 @@ import org.apache.ignite.ci.di.scheduler.IScheduler;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
import org.apache.ignite.ci.teamcity.pure.ITeamcityHttpConnection;
import org.apache.ignite.ci.user.ICredentialsProv;
+import org.jetbrains.annotations.NotNull;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
@@ -38,14 +41,34 @@ import static org.apache.ignite.ci.teamcity.ignited.IgniteStringCompactor.STRING
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
+/**
+ * Test for ignite persistence
+ */
public class IgnitedTcInMemoryIntegrationTest {
-
+ /** Server Name for test. */
public static final String APACHE = "apache";
+ /** Ignite. */
+ private static Ignite ignite;
+
+ /**
+ *
+ */
+ @BeforeClass
+ public static void startIgnite(){
+ ignite = Ignition.start();
+ }
+
+
+ /**
+ *
+ */
+ @AfterClass
+ public static void stopIgnite(){
+ ignite.close();
+ }
@Test
public void saveAndLoadBuildReference() throws IOException {
- Ignite ignite = Ignition.start();
-
ITeamcityHttpConnection http = Mockito.mock(ITeamcityHttpConnection.class);
when(http.sendGet(anyString(), anyString())).thenAnswer(
@@ -62,46 +85,50 @@ public class IgnitedTcInMemoryIntegrationTest {
}
);
- try {
- TeamcityIgnitedModule module = new TeamcityIgnitedModule();
+ TeamcityIgnitedModule module = new TeamcityIgnitedModule();
+
+ module.overrideHttp(http);
- module.overrideHttp(http);
+ Injector injector = Guice.createInjector(module, new AbstractModule() {
+ @Override protected void configure() {
+ bind(Ignite.class).toInstance(ignite);
+ bind(IScheduler.class).to(DirectExecNoWaitSheduler.class);
+ }
+ });
- Injector injector = Guice.createInjector(module, new AbstractModule() {
- @Override protected void configure() {
- bind(Ignite.class).toInstance(ignite);
- bind(IScheduler.class).to(DirectExecNoWaitSheduler.class);
- }
- });
+ ITeamcityIgnited srv = injector.getInstance(ITeamcityIgnitedProvider.class).server(APACHE, creds());
- ICredentialsProv mock = Mockito.mock(ICredentialsProv.class);
- when(mock.hasAccess(anyString())).thenReturn(true);
- when(mock.getUser(anyString())).thenReturn("mtcga");
- when(mock.getPassword(anyString())).thenReturn("123");
- ITeamcityIgnited srv = injector.getInstance(ITeamcityIgnitedProvider.class).server(APACHE, mock);
+ String buildTypeId = "IgniteTests24Java8_RunAll";
+ String branchName = "<default>";
+ List<BuildRef> hist = srv.getBuildHistory(buildTypeId, branchName);
- String buildTypeId = "IgniteTests24Java8_RunAll";
- String branchName = "<default>";
- List<BuildRef> hist = srv.getBuildHistory(buildTypeId, branchName);
+ assertTrue(!hist.isEmpty());
- assertTrue(!hist.isEmpty());
+ for (BuildRef h : hist) {
+ System.out.println(h);
- for (BuildRef h : hist) {
- System.out.println(h);
+ assertEquals(buildTypeId, h.suiteId());
- assertEquals(buildTypeId, h.suiteId());
+ assertEquals("refs/heads/master", h.branchName());
+ }
- assertEquals("refs/heads/master", h.branchName());
+ ignite.cache(STRINGS_CACHE).forEach(
+ (e) -> {
+ System.out.println(e.getValue());
}
+ );
+ }
- ignite.cache(STRINGS_CACHE).forEach(
- (e) -> {
- System.out.println(e.getValue());
- }
- );
- }
- finally {
- ignite.close();
- }
+ /**
+ *
+ */
+ @NotNull public ICredentialsProv creds() {
+ ICredentialsProv mock = Mockito.mock(ICredentialsProv.class);
+
+ when(mock.hasAccess(anyString())).thenReturn(true);
+ when(mock.getUser(anyString())).thenReturn("mtcga");
+ when(mock.getPassword(anyString())).thenReturn("123");
+
+ return mock;
}
}
diff --git a/ignite-tc-helper-web/src/test/resources/testFull.xml b/ignite-tc-helper-web/src/test/resources/testFull.xml
index 0aafa61..7b6da00 100644
--- a/ignite-tc-helper-web/src/test/resources/testFull.xml
+++ b/ignite-tc-helper-web/src/test/resources/testFull.xml
@@ -2,5 +2,5 @@
<testOccurrence id="id:3078,build:(id:2039380)" name="org.apache.ignite.testsuites.IgniteJtaTestSuite: org.apache.ignite.internal.processors.cache.jta.GridPartitionedCacheJtaFactorySelfTest.testAsyncOpAwait" status="SUCCESS" duration="102" href="/app/rest/latest/testOccurrences/id:3078,build:(id:2039380)">
<details/>
<test id="6611322481661461526" name="org.apache.ignite.testsuites.IgniteJtaTestSuite: org.apache.ignite.internal.processors.cache.jta.GridPartitionedCacheJtaFactorySelfTest.testAsyncOpAwait" href="/app/rest/latest/tests/id:6611322481661461526"/>
- <build id="2039380" buildTypeId="IgniteTests24Java8_Jta" number="3617" status="SUCCESS" state="finished" branchName="refs/heads/master" defaultBranch="true" href="/app/rest/latest/builds/id:2039380" webUrl="http://ci.ignite.apache.org/viewLog.html?buildId=2039380&buildTypeId=IgniteTests24Java8_Jta"/>
+ <build id="2039380" buildTypeId="IgniteTests24Java8_Jta" number="3617" status="SUCCESS" state="finished" branchName="refs/heads/master" defaultBranch="true" href="/app/rest/latest/builds/id:2039380" webUrl="http://ci.ignite.apache.org/viewLog.html?buildId=2039380&buildTypeId=IgniteTests24Java8_Jta"/>
</testOccurrence>
\ No newline at end of file