This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-7597
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
The following commit(s) were added to refs/heads/feature/SLING-7597 by this
push:
new 69c0b35 SLING-7597 - Investigate setting up Windows testing
69c0b35 is described below
commit 69c0b3571b2243c33e165b02077c6d470e549525
Author: Robert Munteanu <[email protected]>
AuthorDate: Thu Feb 28 00:12:16 2019 +0100
SLING-7597 - Investigate setting up Windows testing
Ignore some more tests on Windows and properly mark them with the issue key.
---
.../java/org/apache/sling/ide/cli/impl/DirWatcherTest.java | 4 +---
.../test/impl/JcrPartialCoverageAggregatesDeploymentTest.java | 11 +++++++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/cli/cli/src/test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java
b/cli/cli/src/test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java
index 3bb03a4..be17894 100644
--- a/cli/cli/src/test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java
+++ b/cli/cli/src/test/java/org/apache/sling/ide/cli/impl/DirWatcherTest.java
@@ -35,8 +35,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
-import org.hamcrest.Matchers;
-import org.junit.Assume;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -116,7 +114,7 @@ public class DirWatcherTest {
@Test(timeout = 3000)
public void deletedFile() throws IOException, InterruptedException {
- assumeThat(System.getProperty("os.name"),
not(containsString("Windows")));
+ assumeThat(System.getProperty("os.name"),
not(containsString("Windows"))); // TODO - SLING-7596
File watchRoot = folder.newFolder();
File subDir = new File(watchRoot, "subDir");
diff --git
a/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/JcrPartialCoverageAggregatesDeploymentTest.java
b/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/JcrPartialCoverageAggregatesDeploymentTest.java
index 6a606df..f3c20cc 100644
---
a/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/JcrPartialCoverageAggregatesDeploymentTest.java
+++
b/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/JcrPartialCoverageAggregatesDeploymentTest.java
@@ -22,6 +22,9 @@ import static
org.apache.sling.ide.test.impl.helpers.jcr.JcrMatchers.hasPath;
import static
org.apache.sling.ide.test.impl.helpers.jcr.JcrMatchers.hasPrimaryType;
import static
org.apache.sling.ide.test.impl.helpers.jcr.JcrMatchers.hasPropertyValue;
import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assume.assumeThat;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -247,7 +250,9 @@ public class JcrPartialCoverageAggregatesDeploymentTest {
@Test
public void deployNodeWithContentXmlInParentFolder() throws Exception {
-
+
+ assumeThat(System.getProperty("os.name"),
not(containsString("Windows"))); // TODO - SLING-7596
+
wstServer.waitForServerToStart();
// create faceted project
@@ -315,7 +320,9 @@ public class JcrPartialCoverageAggregatesDeploymentTest {
@Test
public void deployNodeWithContentXmlInParentFolder_reverse() throws
Exception {
-
+
+ assumeThat(System.getProperty("os.name"),
not(containsString("Windows"))); // TODO - SLING-7596
+
wstServer.waitForServerToStart();
// create faceted project