Skip to content

Commit

Permalink
Change semantics and name of assumeThatJDK8
Browse files Browse the repository at this point in the history 
The primary intention of this change is to ignore W3cDomTest on JDK6.
Since we test our builds with JDK8+ versions as well, assumeThatJDK8
ignores the affected tests on JDK8+ builds, therefore changed the name
and the semantics of the assumeThatJDK8 method. From now it ignores the
affected tests on JDK6 and JDK7 only.

Fixes #14379
  • Loading branch information
@blazember
blazember committed Jan 15, 2019
1 parent b7066e0 commit 781f967
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 47 deletions.
7 changes: 5 additions & 2 deletions hazelcast/src/test/java/com/hazelcast/config/yaml/W3cDomTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.hazelcast.internal.yaml.YamlNode;
import com.hazelcast.internal.yaml.YamlTest;
import com.hazelcast.test.HazelcastParallelClassRunner;
import com.hazelcast.test.HazelcastTestSupport;
import com.hazelcast.test.annotation.QuickTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
Expand Down Expand Up @@ -47,11 +48,13 @@
*/
@RunWith(HazelcastParallelClassRunner.class)
@Category(QuickTest.class)
public class W3cDomTest {
public class W3cDomTest extends HazelcastTestSupport {
private static final int NOT_EXISTING = 42;

@Test
public void testYamlExtendedTestFromInputStream() {
public void testW3cDomAdapter() {
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map-extended.yaml");
YamlNode yamlRoot = YamlLoader.load(inputStream, "root-map");
Node domRoot = W3cDomUtil.asW3cNode(yamlRoot);
Expand Down
76 changes: 38 additions & 38 deletions hazelcast/src/test/java/com/hazelcast/internal/yaml/YamlTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import static com.hazelcast.internal.yaml.YamlUtil.asMapping;
import static com.hazelcast.internal.yaml.YamlUtil.asSequence;
import static com.hazelcast.test.HazelcastTestSupport.assumeThatJDK6;
import static com.hazelcast.test.HazelcastTestSupport.assumeThatJDK8;
import static com.hazelcast.test.HazelcastTestSupport.assumeThatJDK8OrHigher;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
Expand All @@ -59,7 +59,7 @@ public void testLoadOnJdk6Throws() {

@Test
public void testYamlFromInputStream() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map.yaml");
YamlNode root = YamlLoader.load(inputStream, "root-map");
Expand All @@ -68,7 +68,7 @@ public void testYamlFromInputStream() {

@Test
public void testYamlFromInputStreamWithoutRootName() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map.yaml");
YamlNode root = YamlLoader.load(inputStream);
Expand All @@ -77,7 +77,7 @@ public void testYamlFromInputStreamWithoutRootName() {

@Test
public void testYamlExtendedTestFromInputStream() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map-extended.yaml");
YamlNode root = YamlLoader.load(inputStream, "root-map");
Expand All @@ -87,7 +87,7 @@ public void testYamlExtendedTestFromInputStream() {

@Test
public void testJsonFromInputStream() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map.json");
YamlNode root = YamlLoader.load(inputStream, "root-map");
Expand All @@ -96,7 +96,7 @@ public void testJsonFromInputStream() {

@Test
public void testYamlFromReader() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand All @@ -106,7 +106,7 @@ public void testYamlFromReader() {

@Test
public void testYamlFromReaderWithoutRootName() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand All @@ -116,7 +116,7 @@ public void testYamlFromReaderWithoutRootName() {

@Test
public void testYamlFromString() throws IOException {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand All @@ -127,7 +127,7 @@ public void testYamlFromString() throws IOException {

@Test
public void testYamlFromStringWithoutRootMap() throws IOException {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand All @@ -138,7 +138,7 @@ public void testYamlFromStringWithoutRootMap() throws IOException {

@Test
public void testLoadingInvalidYamlFromInputStream() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-invalid.yaml");
expectedException.expect(YamlException.class);
Expand All @@ -147,7 +147,7 @@ public void testLoadingInvalidYamlFromInputStream() {

@Test
public void testLoadingInvalidYamlFromInputStreamWithRootName() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-invalid.yaml");
expectedException.expect(YamlException.class);
Expand All @@ -156,7 +156,7 @@ public void testLoadingInvalidYamlFromInputStreamWithRootName() {

@Test
public void testLoadingInvalidYamlFromReader() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-invalid.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand All @@ -166,7 +166,7 @@ public void testLoadingInvalidYamlFromReader() {

@Test
public void testLoadingInvalidYamlFromReaderWithRootName() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-invalid.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand All @@ -176,7 +176,7 @@ public void testLoadingInvalidYamlFromReaderWithRootName() {

@Test
public void testLoadingInvalidYamlFromString() throws IOException {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-invalid.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand All @@ -187,7 +187,7 @@ public void testLoadingInvalidYamlFromString() throws IOException {

@Test
public void testLoadingInvalidYamlFromStringWithRootName() throws IOException {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-invalid.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand All @@ -198,7 +198,7 @@ public void testLoadingInvalidYamlFromStringWithRootName() throws IOException {

@Test
public void testInvalidScalarValueTypeMap() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping rootMap = getYamlRoot();
YamlMapping embeddedMap = rootMap.childAsMapping("embedded-map");
Expand All @@ -209,7 +209,7 @@ public void testInvalidScalarValueTypeMap() {

@Test
public void testInvalidScalarValueTypeSeq() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping rootMap = getYamlRoot();
YamlSequence embeddedList = rootMap
Expand All @@ -222,7 +222,7 @@ public void testInvalidScalarValueTypeSeq() {

@Test
public void testInvalidScalarValueTypeHintedMap() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping rootMap = getYamlRoot();
YamlMapping embeddedMap = rootMap.childAsMapping("embedded-map");
Expand All @@ -235,7 +235,7 @@ public void testInvalidScalarValueTypeHintedMap() {

@Test
public void testInvalidScalarValueTypeHintedSeq() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping rootMap = getYamlRoot();
YamlSequence embeddedList = rootMap
Expand All @@ -250,28 +250,28 @@ public void testInvalidScalarValueTypeHintedSeq() {

@Test
public void testNotExistingMappingFromMap() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

assertNull(getYamlRoot().childAsMapping("not-existing"));
}

@Test
public void testNotExistingSequenceFromMap() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

assertNull(getYamlRoot().childAsSequence("not-existing"));
}

@Test
public void testNotExistingScalarFromMap() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

assertNull(getYamlRoot().childAsScalar("not-existing"));
}

@Test
public void testNotExistingMappingFromSeq() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlSequence seq = getYamlRoot()
.childAsMapping("embedded-map")
Expand All @@ -281,7 +281,7 @@ public void testNotExistingMappingFromSeq() {

@Test
public void testNotExistingSequenceFromSeq() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlSequence seq = getYamlRoot()
.childAsMapping("embedded-map")
Expand All @@ -291,7 +291,7 @@ public void testNotExistingSequenceFromSeq() {

@Test
public void testNotExistingScalarFromSeq() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlSequence seq = getYamlRoot()
.childAsMapping("embedded-map")
Expand All @@ -301,7 +301,7 @@ public void testNotExistingScalarFromSeq() {

@Test
public void testInvalidNodeTypeNotAMapping() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-map.yaml");
YamlNode root = YamlLoader.load(inputStream, "root-map");
Expand All @@ -315,7 +315,7 @@ public void testInvalidNodeTypeNotAMapping() {

@Test
public void testInvalidNodeTypeNotASeq() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping rootMap = getYamlRoot();

Expand All @@ -325,7 +325,7 @@ public void testInvalidNodeTypeNotASeq() {

@Test
public void testInvalidNodeTypeNotAScalar() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping rootMap = getYamlRoot();

Expand All @@ -335,7 +335,7 @@ public void testInvalidNodeTypeNotAScalar() {

@Test
public void testIterateChildrenMap() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping embeddedMap = getYamlRoot()
.childAsMapping("embedded-map");
Expand All @@ -351,7 +351,7 @@ public void testIterateChildrenMap() {

@Test
public void testIterateChildrenSeq() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlSequence embeddedList = getYamlRoot()
.childAsMapping("embedded-map")
Expand All @@ -368,37 +368,37 @@ public void testIterateChildrenSeq() {

@Test
public void testParentOfRootIsNull() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

assertNull(getYamlRoot().parent());
}

@Test
public void testParentOfEmbeddedMapIsRoot() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping root = getYamlRoot();
assertSame(root, root.childAsMapping("embedded-map").parent());
}

@Test
public void testParentOfScalarIntIsEmbeddedMap() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

YamlMapping embeddedMap = getYamlRoot().childAsMapping("embedded-map");
assertSame(embeddedMap, embeddedMap.childAsScalar("scalar-int").parent());
}

@Test
public void testNameOfMap() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

assertEquals("embedded-map", getYamlRoot().childAsMapping("embedded-map").nodeName());
}

@Test
public void testNameOfSeq() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

assertEquals("embedded-list", getYamlRoot().childAsMapping("embedded-map")
.childAsSequence("embedded-list")
Expand All @@ -407,7 +407,7 @@ public void testNameOfSeq() {

@Test
public void testNameOfNamedScalar() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

assertEquals("scalar-int", getYamlRoot().childAsMapping("embedded-map")
.childAsScalar("scalar-int")
Expand All @@ -416,7 +416,7 @@ public void testNameOfNamedScalar() {

@Test
public void testNameOfUnnamedScalar() {
assumeThatJDK8();
assumeThatJDK8OrHigher();

assertSame(YamlNode.UNNAMED_NODE, getYamlRoot().childAsMapping("embedded-map")
.childAsSequence("embedded-list")
Expand Down Expand Up @@ -500,7 +500,7 @@ private YamlMapping getYamlRoot() {

@Test
public void testYamlListInRoot() throws IOException {
assumeThatJDK8();
assumeThatJDK8OrHigher();

InputStream inputStream = YamlTest.class.getClassLoader().getResourceAsStream("yaml-test-root-seq.yaml");
InputStreamReader reader = new InputStreamReader(inputStream);
Expand Down
5 changes: 3 additions & 2 deletions hazelcast/src/test/java/com/hazelcast/test/HazelcastTestSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1585,8 +1585,9 @@ public static void assumeThatNoJDK7() {
assumeFalse("Java 7 used", JAVA_VERSION.startsWith("1.7."));
}

public static void assumeThatJDK8() {
assumeTrue("Java 8 should be used", JAVA_VERSION.startsWith("1.8."));
public static void assumeThatJDK8OrHigher() {
assumeFalse("Java 8+ should be used", JAVA_VERSION.startsWith("1.6."));
assumeFalse("Java 8+ should be used", JAVA_VERSION.startsWith("1.7."));
}

public static void assumeThatNotZingJDK6() {
Expand Down

0 comments on commit 781f967

Please sign in to comment.