You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/12/06 16:27:04 UTC
[16/50] [abbrv] ignite git commit: IGNITE-8379 Fix PDS Compatibility
tests, javadocs.
IGNITE-8379 Fix PDS Compatibility tests, javadocs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72517181
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72517181
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72517181
Branch: refs/heads/ignite-10044
Commit: 72517181fc29d2b8eb3af93994b968675f3d29a6
Parents: ff6b8ee
Author: Dmitriy Pavlov <dp...@apache.org>
Authored: Tue Dec 4 17:19:24 2018 +0300
Committer: Dmitriy Pavlov <dp...@apache.org>
Committed: Tue Dec 4 17:19:24 2018 +0300
----------------------------------------------------------------------
.../persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java | 4 ++--
.../junits/IgniteCompatibilityAbstractTest.java | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/72517181/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java
----------------------------------------------------------------------
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java
index da77dd8..60b6464 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java
@@ -60,8 +60,8 @@ public class IgnitePKIndexesMigrationToUnwrapPkTest extends IgnitePersistenceCom
}
/** {@inheritDoc} */
- @Override @NotNull protected Set<String> getExcluded(Collection<Dependency> dependencies) {
- Set<String> excluded = super.getExcluded(dependencies);
+ @Override protected Set<String> getExcluded(String ver, Collection<Dependency> dependencies) {
+ Set<String> excluded = super.getExcluded(ver, dependencies);
excluded.add("h2");
http://git-wip-us.apache.org/repos/asf/ignite/blob/72517181/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
index 2d73bd8..b0e4001 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
@@ -169,7 +169,7 @@ public abstract class IgniteCompatibilityAbstractTest extends GridCommonAbstract
final Collection<Dependency> dependencies = getDependencies(ver);
- Set<String> excluded = getExcluded(dependencies);
+ Set<String> excluded = getExcluded(ver, dependencies);
StringBuilder pathBuilder = new StringBuilder();
@@ -247,10 +247,15 @@ public abstract class IgniteCompatibilityAbstractTest extends GridCommonAbstract
}
/**
+ * These dependencies will not be translated from current code dependencies into separate node's classpath.
+ *
+ * Include here all dependencies which will be set up manually, leave all version independent dependencies.
+ *
+ * @param ver Ignite version.
* @param dependencies Dependencies to filter.
* @return Set of paths to exclude.
*/
- @NotNull protected Set<String> getExcluded(Collection<Dependency> dependencies) {
+ protected Set<String> getExcluded(String ver, Collection<Dependency> dependencies) {
Set<String> excluded = new HashSet<>();
for (Dependency dependency : dependencies) {