valepakh commented on code in PR #3043: URL: https://github.com/apache/ignite-3/pull/3043#discussion_r1463257680
########## modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/utils/TestingJobExecution.java: ########## @@ -0,0 +1,146 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.compute.utils; + +import static org.apache.ignite.compute.JobState.CANCELED; +import static org.apache.ignite.compute.JobState.COMPLETED; +import static org.apache.ignite.compute.JobState.EXECUTING; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import org.apache.ignite.compute.JobExecution; +import org.apache.ignite.compute.JobStatus; +import org.apache.ignite.lang.IgniteException; + +/** + * Testing instance of {@link JobExecution}. Adds useful assertions on job's state and sync methods. + * + * @param <R> Job result type. + */ +public class TestingJobExecution<R> implements JobExecution<R> { + private final JobExecution<R> jobExecution; + + /** + * Constructor. + * + * @param jobExecution job execution to wrap. + */ + public TestingJobExecution(JobExecution<R> jobExecution) { + this.jobExecution = jobExecution; + } + + private JobStatus statusSync() throws InterruptedException, ExecutionException, TimeoutException { + return jobExecution.statusAsync().get(10, TimeUnit.SECONDS); + } + + public UUID idSync() throws InterruptedException, ExecutionException, TimeoutException { + return jobExecution.idAsync().get(10, TimeUnit.SECONDS); + } + + private R resultSync() throws ExecutionException, InterruptedException, TimeoutException { + return jobExecution.resultAsync().get(10, TimeUnit.SECONDS); + } + + public long createTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().createTime().toEpochMilli(); + } + + public long startTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().startTime().toEpochMilli(); + } + + public long finishTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().finishTime().toEpochMilli(); + } + + public void cancelSync() throws ExecutionException, InterruptedException, TimeoutException { + jobExecution.cancelAsync().get(10, TimeUnit.SECONDS); + } + + @Override + public CompletableFuture<R> resultAsync() { + return jobExecution.resultAsync(); + } + + @Override + public CompletableFuture<JobStatus> statusAsync() { + return jobExecution.statusAsync(); + } + + @Override + public CompletableFuture<Boolean> cancelAsync() { + return jobExecution.cancelAsync(); + } + + @Override + public CompletableFuture<Boolean> changePriorityAsync(int newPriority) { + return jobExecution.changePriorityAsync(newPriority); + } + + /** + * Checks that the job execution object has EXECUTING state. + */ + public void assertExecuting() { + await().until(() -> jobExecution.statusAsync().get(10, TimeUnit.SECONDS).state() == EXECUTING); + + assertThat(jobExecution.resultAsync().isDone(), equalTo(false)); + + try { + assertThat(idSync(), notNullValue()); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + throw new RuntimeException(e); + } + } + + /** + * Checks that the job execution object is cancelled. + */ + public void assertCancelled() throws ExecutionException, InterruptedException, TimeoutException { + assertThat(jobExecution.resultAsync(), willThrow(IgniteException.class)); + assertThat(statusSync().state(), is(CANCELED)); Review Comment: ```suggestion public void assertCancelled() { assertThat(resultAsync(), willThrow(IgniteException.class)); assertThat(statusAsync(), willBe(jobStatusWithState(CANCELED))); ``` ########## modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/utils/TestingJobExecution.java: ########## @@ -0,0 +1,146 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.compute.utils; + +import static org.apache.ignite.compute.JobState.CANCELED; +import static org.apache.ignite.compute.JobState.COMPLETED; +import static org.apache.ignite.compute.JobState.EXECUTING; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import org.apache.ignite.compute.JobExecution; +import org.apache.ignite.compute.JobStatus; +import org.apache.ignite.lang.IgniteException; + +/** + * Testing instance of {@link JobExecution}. Adds useful assertions on job's state and sync methods. + * + * @param <R> Job result type. + */ +public class TestingJobExecution<R> implements JobExecution<R> { + private final JobExecution<R> jobExecution; + + /** + * Constructor. + * + * @param jobExecution job execution to wrap. + */ + public TestingJobExecution(JobExecution<R> jobExecution) { + this.jobExecution = jobExecution; + } + + private JobStatus statusSync() throws InterruptedException, ExecutionException, TimeoutException { + return jobExecution.statusAsync().get(10, TimeUnit.SECONDS); + } + + public UUID idSync() throws InterruptedException, ExecutionException, TimeoutException { + return jobExecution.idAsync().get(10, TimeUnit.SECONDS); + } + + private R resultSync() throws ExecutionException, InterruptedException, TimeoutException { + return jobExecution.resultAsync().get(10, TimeUnit.SECONDS); + } + + public long createTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().createTime().toEpochMilli(); + } + + public long startTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().startTime().toEpochMilli(); + } + + public long finishTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().finishTime().toEpochMilli(); + } + + public void cancelSync() throws ExecutionException, InterruptedException, TimeoutException { + jobExecution.cancelAsync().get(10, TimeUnit.SECONDS); + } + + @Override + public CompletableFuture<R> resultAsync() { + return jobExecution.resultAsync(); + } + + @Override + public CompletableFuture<JobStatus> statusAsync() { + return jobExecution.statusAsync(); + } + + @Override + public CompletableFuture<Boolean> cancelAsync() { + return jobExecution.cancelAsync(); + } + + @Override + public CompletableFuture<Boolean> changePriorityAsync(int newPriority) { + return jobExecution.changePriorityAsync(newPriority); + } + + /** + * Checks that the job execution object has EXECUTING state. + */ + public void assertExecuting() { + await().until(() -> jobExecution.statusAsync().get(10, TimeUnit.SECONDS).state() == EXECUTING); + + assertThat(jobExecution.resultAsync().isDone(), equalTo(false)); + + try { + assertThat(idSync(), notNullValue()); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + throw new RuntimeException(e); + } + } + + /** + * Checks that the job execution object is cancelled. + */ + public void assertCancelled() throws ExecutionException, InterruptedException, TimeoutException { + assertThat(jobExecution.resultAsync(), willThrow(IgniteException.class)); + assertThat(statusSync().state(), is(CANCELED)); + } + + /** + * Checks that the job execution object is completed successfully. + */ + public void assertCompleted() throws ExecutionException, InterruptedException, TimeoutException { + assertThat(resultSync(), equalTo("Done")); + assertThat(statusSync().state(), is(COMPLETED)); + } + + /** + * Checks that the job execution object has failed stated. Review Comment: Do you mean `failed starting`? ########## modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/utils/TestingJobExecution.java: ########## @@ -0,0 +1,146 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.compute.utils; + +import static org.apache.ignite.compute.JobState.CANCELED; +import static org.apache.ignite.compute.JobState.COMPLETED; +import static org.apache.ignite.compute.JobState.EXECUTING; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import org.apache.ignite.compute.JobExecution; +import org.apache.ignite.compute.JobStatus; +import org.apache.ignite.lang.IgniteException; + +/** + * Testing instance of {@link JobExecution}. Adds useful assertions on job's state and sync methods. + * + * @param <R> Job result type. + */ +public class TestingJobExecution<R> implements JobExecution<R> { + private final JobExecution<R> jobExecution; + + /** + * Constructor. + * + * @param jobExecution job execution to wrap. + */ + public TestingJobExecution(JobExecution<R> jobExecution) { + this.jobExecution = jobExecution; + } + + private JobStatus statusSync() throws InterruptedException, ExecutionException, TimeoutException { + return jobExecution.statusAsync().get(10, TimeUnit.SECONDS); + } + + public UUID idSync() throws InterruptedException, ExecutionException, TimeoutException { + return jobExecution.idAsync().get(10, TimeUnit.SECONDS); + } + + private R resultSync() throws ExecutionException, InterruptedException, TimeoutException { + return jobExecution.resultAsync().get(10, TimeUnit.SECONDS); + } + + public long createTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().createTime().toEpochMilli(); + } + + public long startTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().startTime().toEpochMilli(); + } + + public long finishTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().finishTime().toEpochMilli(); + } + + public void cancelSync() throws ExecutionException, InterruptedException, TimeoutException { + jobExecution.cancelAsync().get(10, TimeUnit.SECONDS); + } + + @Override + public CompletableFuture<R> resultAsync() { + return jobExecution.resultAsync(); + } + + @Override + public CompletableFuture<JobStatus> statusAsync() { + return jobExecution.statusAsync(); + } + + @Override + public CompletableFuture<Boolean> cancelAsync() { + return jobExecution.cancelAsync(); + } + + @Override + public CompletableFuture<Boolean> changePriorityAsync(int newPriority) { + return jobExecution.changePriorityAsync(newPriority); + } + + /** + * Checks that the job execution object has EXECUTING state. + */ + public void assertExecuting() { + await().until(() -> jobExecution.statusAsync().get(10, TimeUnit.SECONDS).state() == EXECUTING); + + assertThat(jobExecution.resultAsync().isDone(), equalTo(false)); + + try { + assertThat(idSync(), notNullValue()); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + throw new RuntimeException(e); + } Review Comment: ```suggestion assertThat(idAsync(), willBe(notNullValue())); ``` ########## modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/utils/TestingJobExecution.java: ########## @@ -0,0 +1,146 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.compute.utils; + +import static org.apache.ignite.compute.JobState.CANCELED; +import static org.apache.ignite.compute.JobState.COMPLETED; +import static org.apache.ignite.compute.JobState.EXECUTING; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import org.apache.ignite.compute.JobExecution; +import org.apache.ignite.compute.JobStatus; +import org.apache.ignite.lang.IgniteException; + +/** + * Testing instance of {@link JobExecution}. Adds useful assertions on job's state and sync methods. + * + * @param <R> Job result type. + */ +public class TestingJobExecution<R> implements JobExecution<R> { + private final JobExecution<R> jobExecution; + + /** + * Constructor. + * + * @param jobExecution job execution to wrap. + */ + public TestingJobExecution(JobExecution<R> jobExecution) { + this.jobExecution = jobExecution; + } + + private JobStatus statusSync() throws InterruptedException, ExecutionException, TimeoutException { + return jobExecution.statusAsync().get(10, TimeUnit.SECONDS); + } + + public UUID idSync() throws InterruptedException, ExecutionException, TimeoutException { + return jobExecution.idAsync().get(10, TimeUnit.SECONDS); + } + + private R resultSync() throws ExecutionException, InterruptedException, TimeoutException { + return jobExecution.resultAsync().get(10, TimeUnit.SECONDS); + } + + public long createTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().createTime().toEpochMilli(); + } + + public long startTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().startTime().toEpochMilli(); + } + + public long finishTimeMillis() throws ExecutionException, InterruptedException, TimeoutException { + return statusSync().finishTime().toEpochMilli(); + } + + public void cancelSync() throws ExecutionException, InterruptedException, TimeoutException { + jobExecution.cancelAsync().get(10, TimeUnit.SECONDS); + } + + @Override + public CompletableFuture<R> resultAsync() { + return jobExecution.resultAsync(); + } + + @Override + public CompletableFuture<JobStatus> statusAsync() { + return jobExecution.statusAsync(); + } + + @Override + public CompletableFuture<Boolean> cancelAsync() { + return jobExecution.cancelAsync(); + } + + @Override + public CompletableFuture<Boolean> changePriorityAsync(int newPriority) { + return jobExecution.changePriorityAsync(newPriority); + } + + /** + * Checks that the job execution object has EXECUTING state. + */ + public void assertExecuting() { + await().until(() -> jobExecution.statusAsync().get(10, TimeUnit.SECONDS).state() == EXECUTING); + + assertThat(jobExecution.resultAsync().isDone(), equalTo(false)); + + try { + assertThat(idSync(), notNullValue()); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + throw new RuntimeException(e); + } + } + + /** + * Checks that the job execution object is cancelled. + */ + public void assertCancelled() throws ExecutionException, InterruptedException, TimeoutException { + assertThat(jobExecution.resultAsync(), willThrow(IgniteException.class)); + assertThat(statusSync().state(), is(CANCELED)); + } + + /** + * Checks that the job execution object is completed successfully. + */ + public void assertCompleted() throws ExecutionException, InterruptedException, TimeoutException { + assertThat(resultSync(), equalTo("Done")); + assertThat(statusSync().state(), is(COMPLETED)); Review Comment: ```suggestion public void assertCompleted() throws { assertThat(resultAsync(), willBe("Done")); assertThat(statusAsync(), willBe(jobStatusWithState(COMPLETED))); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
