test fixes on windows

This commit is contained in:
Clebert Suconic 2015-09-08 11:05:19 -04:00
parent 8843a9ee1e
commit 20006b6e9d
1 changed files with 16 additions and 5 deletions

View File

@ -64,12 +64,17 @@ public class ArtemisTest {
@Test @Test
public void invalidCliDoesntThrowException() { public void invalidCliDoesntThrowException() {
testCli("create"); testCli("--silent", "create");
} }
@Test @Test
public void invalidPathDoesntThrowException() { public void invalidPathDoesntThrowException() {
testCli("create", "/rawr"); if (isWindows()) {
testCli("create", "zzzzz:/rawr", "--silent");
}
else {
testCli("create", "/rawr", "--silent");
}
} }
@Test @Test
@ -90,7 +95,7 @@ public class ArtemisTest {
String queues = "q1,t2"; String queues = "q1,t2";
String topics = "t1,t2"; String topics = "t1,t2";
Run.setEmbedded(true); Run.setEmbedded(true);
Artemis.main("create", temporaryFolder.getRoot().getAbsolutePath(), "--force", "--silent", "--no-web", "--queues", queues, "--topics", topics); Artemis.main("create", temporaryFolder.getRoot().getAbsolutePath(), "--force", "--silent", "--no-web", "--queues", queues, "--topics", topics, "--no-autotune");
System.setProperty("artemis.instance", temporaryFolder.getRoot().getAbsolutePath()); System.setProperty("artemis.instance", temporaryFolder.getRoot().getAbsolutePath());
// Some exceptions may happen on the initialization, but they should be ok on start the basic core protocol // Some exceptions may happen on the initialization, but they should be ok on start the basic core protocol
Artemis.internalExecute("run"); Artemis.internalExecute("run");
@ -108,8 +113,8 @@ public class ArtemisTest {
} }
} }
Assert.assertEquals(Integer.valueOf(1000), Artemis.internalExecute("producer", "--message-count", "1000", "--verbose")); Assert.assertEquals(Integer.valueOf(100), Artemis.internalExecute("producer", "--message-count", "100", "--verbose"));
Assert.assertEquals(Integer.valueOf(1000), Artemis.internalExecute("consumer", "--verbose", "--break-on-null", "--receive-timeout", "100")); Assert.assertEquals(Integer.valueOf(100), Artemis.internalExecute("consumer", "--verbose", "--break-on-null", "--receive-timeout", "100"));
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616"); ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616");
Connection connection = cf.createConnection(); Connection connection = cf.createConnection();
@ -160,4 +165,10 @@ public class ArtemisTest {
Assert.fail("Exception caught " + e.getMessage()); Assert.fail("Exception caught " + e.getMessage());
} }
} }
public boolean isWindows() {
return System.getProperty("os.name", "null").toLowerCase().indexOf("win") >= 0;
}
} }