Pochatkin commented on code in PR #6556: URL: https://github.com/apache/ignite-3/pull/6556#discussion_r2332219094
########## modules/code-deployment/src/testFixtures/java/org/apache/ignite/internal/deployment/UnitStatusMatchers.java: ########## @@ -0,0 +1,170 @@ +/* + * 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.deployment; + +import static org.hamcrest.Matchers.is; + +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import org.apache.ignite.deployment.version.Version; +import org.apache.ignite.internal.deployunit.DeploymentStatus; +import org.apache.ignite.internal.deployunit.UnitStatus; +import org.apache.ignite.internal.deployunit.UnitStatuses; +import org.apache.ignite.internal.deployunit.UnitVersionStatus; +import org.hamcrest.Description; +import org.hamcrest.FeatureMatcher; +import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeMatcher; + +/** + * Matchers for {@link UnitStatus} and {@link UnitStatuses}. + */ +public class UnitStatusMatchers { + /** + * Matches replication info with a specified fst progress. + */ + public static Matcher<UnitStatus> versionIs(Version version) { + return replicationInfoMatcher(UnitStatus::version, version, "version"); + } + + public static Matcher<UnitStatus> deploymentStatusIs(DeploymentStatus status) { + return replicationInfoMatcher(UnitStatus::status, status, "status"); + } + + /** + * Matcher fo + */ + public static Matcher<UnitVersionStatus> unitVersionStatusIs(Version version, DeploymentStatus status) { + return new TypeSafeMatcher<>() { + @Override + public void describeTo(Description description) { + description.appendText("unitVersionStatus is ").appendValue(version) + .appendText(", status is ").appendValue(status); + } + + @Override + protected boolean matchesSafely(UnitVersionStatus item) { + return item.getStatus() == status && Objects.equals(item.getVersion(), version); + } + }; + } + + public static Matcher<UnitStatuses> containsAll(Matcher<UnitVersionStatus>... unitVersionMatcher) { + return new TypeSafeMatcher<>() { + @Override + protected boolean matchesSafely(UnitStatuses item) { + for (UnitVersionStatus versionStatus : item.versionStatuses()) { + for (Matcher<UnitVersionStatus> unitVersionStatus : unitVersionMatcher) { + if (unitVersionStatus.matches(versionStatus)) { + return true; + } + } + } + + return false; + } + + @Override + public void describeTo(Description description) { + description.appendText("a list containing elements matching: "); + for (int i = 0; i < unitVersionMatcher.length; i++) { + if (i > 0) { + description.appendText(", "); + } + unitVersionMatcher[i].describeTo(description); + } + } + }; + } + + private static <T> Matcher<UnitStatus> replicationInfoMatcher( Review Comment: Done ########## modules/code-deployment/src/testFixtures/java/org/apache/ignite/internal/deployment/UnitStatusMatchers.java: ########## @@ -0,0 +1,170 @@ +/* + * 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.deployment; + +import static org.hamcrest.Matchers.is; + +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import org.apache.ignite.deployment.version.Version; +import org.apache.ignite.internal.deployunit.DeploymentStatus; +import org.apache.ignite.internal.deployunit.UnitStatus; +import org.apache.ignite.internal.deployunit.UnitStatuses; +import org.apache.ignite.internal.deployunit.UnitVersionStatus; +import org.hamcrest.Description; +import org.hamcrest.FeatureMatcher; +import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeMatcher; + +/** + * Matchers for {@link UnitStatus} and {@link UnitStatuses}. + */ +public class UnitStatusMatchers { + /** + * Matches replication info with a specified fst progress. + */ + public static Matcher<UnitStatus> versionIs(Version version) { + return replicationInfoMatcher(UnitStatus::version, version, "version"); + } + + public static Matcher<UnitStatus> deploymentStatusIs(DeploymentStatus status) { + return replicationInfoMatcher(UnitStatus::status, status, "status"); + } + + /** + * Matcher fo + */ + public static Matcher<UnitVersionStatus> unitVersionStatusIs(Version version, DeploymentStatus status) { + return new TypeSafeMatcher<>() { + @Override + public void describeTo(Description description) { + description.appendText("unitVersionStatus is ").appendValue(version) + .appendText(", status is ").appendValue(status); + } + + @Override + protected boolean matchesSafely(UnitVersionStatus item) { + return item.getStatus() == status && Objects.equals(item.getVersion(), version); + } + }; + } + + public static Matcher<UnitStatuses> containsAll(Matcher<UnitVersionStatus>... unitVersionMatcher) { + return new TypeSafeMatcher<>() { + @Override + protected boolean matchesSafely(UnitStatuses item) { + for (UnitVersionStatus versionStatus : item.versionStatuses()) { + for (Matcher<UnitVersionStatus> unitVersionStatus : unitVersionMatcher) { + if (unitVersionStatus.matches(versionStatus)) { + return true; + } + } + } + + return false; + } + + @Override + public void describeTo(Description description) { + description.appendText("a list containing elements matching: "); + for (int i = 0; i < unitVersionMatcher.length; i++) { + if (i > 0) { + description.appendText(", "); + } + unitVersionMatcher[i].describeTo(description); + } + } + }; + } + + private static <T> Matcher<UnitStatus> replicationInfoMatcher( + Function<UnitStatus, T> extractor, + T actual, + String featureName + ) { + return new FeatureMatcher<>(is(actual), "unit status with " + featureName, featureName) { + @Override + protected T featureValueOf(UnitStatus actual) { + return extractor.apply(actual); + } + }; + } + + /** + * Matches that any item from list match with all provided matchers. + */ + public static <T extends UnitStatus> Matcher<List<T>> any(Matcher<UnitStatus>... matchers) { Review Comment: Done ########## modules/code-deployment/src/testFixtures/java/org/apache/ignite/internal/deployment/UnitStatusMatchers.java: ########## @@ -0,0 +1,170 @@ +/* + * 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.deployment; + +import static org.hamcrest.Matchers.is; + +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import org.apache.ignite.deployment.version.Version; +import org.apache.ignite.internal.deployunit.DeploymentStatus; +import org.apache.ignite.internal.deployunit.UnitStatus; +import org.apache.ignite.internal.deployunit.UnitStatuses; +import org.apache.ignite.internal.deployunit.UnitVersionStatus; +import org.hamcrest.Description; +import org.hamcrest.FeatureMatcher; +import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeMatcher; + +/** + * Matchers for {@link UnitStatus} and {@link UnitStatuses}. + */ +public class UnitStatusMatchers { + /** + * Matches replication info with a specified fst progress. + */ + public static Matcher<UnitStatus> versionIs(Version version) { + return replicationInfoMatcher(UnitStatus::version, version, "version"); + } + + public static Matcher<UnitStatus> deploymentStatusIs(DeploymentStatus status) { + return replicationInfoMatcher(UnitStatus::status, status, "status"); + } + + /** + * Matcher fo + */ + public static Matcher<UnitVersionStatus> unitVersionStatusIs(Version version, DeploymentStatus status) { + return new TypeSafeMatcher<>() { + @Override + public void describeTo(Description description) { + description.appendText("unitVersionStatus is ").appendValue(version) + .appendText(", status is ").appendValue(status); + } + + @Override + protected boolean matchesSafely(UnitVersionStatus item) { + return item.getStatus() == status && Objects.equals(item.getVersion(), version); + } + }; + } + + public static Matcher<UnitStatuses> containsAll(Matcher<UnitVersionStatus>... unitVersionMatcher) { Review Comment: Done -- 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: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org