Skip to content

Commit

Permalink
Increased test timeout from 5s to 15s
Browse files Browse the repository at this point in the history 
The following command was used to replace all occurrences in the project:

find . -name "*.java" -type f -exec sed -i 's/, 5, TimeUnit.SECONDS/, 15, TimeUnit.SECONDS/g' {} +
  • Loading branch information
@gastaldi
gastaldi committed Sep 2, 2015
1 parent 1555498 commit 56e2653
Show file tree
Hide file tree
Showing 24 changed files with 158 additions and 158 deletions.
2 changes: 1 addition & 1 deletion ...uration/tests/src/test/java/org/jboss/forge/addon/configuration/ui/ConfigCommandTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void testConfigSetPropertyListInProject() throws Exception
test.getShell().setCurrentResource(project.getRoot());
test.execute("config-set --key key2 --value projectValue2 --local", 15, TimeUnit.MINUTES);
test.execute("config-set --key key3 --value projectValue3 --local", 15, TimeUnit.SECONDS);
assertFalse(test.execute("config-list", 5, TimeUnit.SECONDS) instanceof Failed);
assertFalse(test.execute("config-list", 15, TimeUnit.SECONDS) instanceof Failed);
assertThat(test.getStdOut(), containsString("key2=project: [projectValue2]"));
assertThat(test.getStdOut(), containsString("key3=project: [projectValue3]"));
}
Expand Down
2 changes: 1 addition & 1 deletion javaee/faces/src/test/java/org/jboss/forge/addon/scaffold/faces/FacesScaffoldTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void setUp()
@Test
public void testScaffoldSetup() throws Exception
{
shellTest.execute("jpa-new-entity --named Customer", 5, TimeUnit.SECONDS);
shellTest.execute("jpa-new-entity --named Customer", 15, TimeUnit.SECONDS);
shellTest.execute("jpa-new-field --named firstName", 10, TimeUnit.SECONDS);
Result result = shellTest.execute("scaffold-setup", 10, TimeUnit.SECONDS);
Assert.assertThat(result, is(instanceOf(CompositeResult.class)));
Expand Down
4 changes: 2 additions & 2 deletions javaee/tests/src/test/java/org/jboss/forge/addon/javaee/rest/ui/RestSetupTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void testProjectSetup() throws Exception
Project tempProject = projectFactory.createTempProject(Arrays
.<Class<? extends ProjectFacet>> asList(JavaSourceFacet.class));
shell.getShell().setCurrentResource(tempProject.getRoot());
shell.execute("rest-setup --jaxrsVersion 2.0", 5, TimeUnit.SECONDS);
shell.execute("rest-setup --jaxrsVersion 2.0", 15, TimeUnit.SECONDS);
Resource<?> currentResource = shell.getShell().getCurrentResource();
Project project = projectFactory.findProject(currentResource);
Assert.assertTrue(project.hasFacet(RestFacet_2_0.class));
Expand All @@ -90,7 +90,7 @@ public void testFORGE2127() throws Exception
Project tempProject = projectFactory.createTempProject(Arrays
.<Class<? extends ProjectFacet>> asList(JavaSourceFacet.class));
shell.getShell().setCurrentResource(tempProject.getRoot());
shell.execute("javaee-setup --javaEEVersion 7", 5, TimeUnit.SECONDS);
shell.execute("javaee-setup --javaEEVersion 7", 15, TimeUnit.SECONDS);
shell.execute("rest-setup --jaxrsVersion 2.0", 5, TimeUnit.MINUTES);
Resource<?> currentResource = shell.getShell().getCurrentResource();
Project project = projectFactory.findProject(currentResource);
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/jboss/forge/addon/maven/archetype/ui/ArchetypeCatalogCommandsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void tearDown() throws Exception
@Test
public void testArchetypeList() throws Exception
{
Result result = shellTest.execute("archetype-list", 5, TimeUnit.SECONDS);
Result result = shellTest.execute("archetype-list", 15, TimeUnit.SECONDS);
Assert.assertThat(result, not(instanceOf(Failed.class)));
Assert.assertThat(shellTest.getStdOut(), containsString("Test = A Test Archetype"));
}
Expand Down
2 changes: 1 addition & 1 deletion ...ests/src/test/java/org/jboss/forge/addon/parser/java/ui/JavaAddAnnotationCommandTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ public void testAddUnparsableAnnotation() throws Exception
public void testAddAnnotationFromShell() throws Exception
{
shellTest.getShell().setCurrentResource(project.getRoot());
shellTest.execute("java-new-class --named MyClass --targetPackage org.demo.classes", 5, TimeUnit.SECONDS);
shellTest.execute("java-new-class --named MyClass --targetPackage org.demo.classes", 15, TimeUnit.SECONDS);
JavaResource javaResource = project.getFacet(JavaSourceFacet.class).getJavaResource("org.demo.classes.MyClass");
Assert.assertTrue(javaResource.exists());
Result result = shellTest.execute(
Expand Down
8 changes: 4 additions & 4 deletions projects/tests/src/test/java/org/jboss/forge/addon/projects/shell/NewProjectShellTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ public void testTopLevelPackageOptional() throws Exception
@Ignore("Until shell is fixed")
public void testCompletionFlow() throws Exception
{
test.waitForCompletion("project-new ", "project-n", 5, TimeUnit.SECONDS);
test.waitForCompletion("project-new --", "", 5, TimeUnit.SECONDS);
test.waitForCompletion("project-new ", "project-n", 15, TimeUnit.SECONDS);
test.waitForCompletion("project-new --", "", 15, TimeUnit.SECONDS);

String stdout = test.waitForCompletion(5, TimeUnit.SECONDS);
Assert.assertThat(stdout, containsString("--named"));
Expand All @@ -133,10 +133,10 @@ public void testCompletionFlow() throws Exception
Assert.assertThat(stdout, containsString("Maven - Resources"));

stdout = test.waitForCompletion("project-new --named lincoln --type Maven\\ -\\ Java ",
"J", 5, TimeUnit.SECONDS);
"J", 15, TimeUnit.SECONDS);

stdout = test.waitForCompletion("project-new --named lincoln --type Maven\\ -\\ Java --",
"--", 5, TimeUnit.SECONDS);
"--", 15, TimeUnit.SECONDS);

Assert.assertThat(stdout, containsString("--topLevelPackage"));
Assert.assertThat(stdout, containsString("--targetLocation"));
Expand Down
28 changes: 14 additions & 14 deletions ...urces/tests/src/test/java/org/jboss/forge/addon/resource/monitor/ResourceMonitorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 1;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);
final FileResource<?> childFile = childDir.getChild("child_file.txt").reify(FileResource.class);

waitForMonitor(new Callable<Void>()
Expand All @@ -143,7 +143,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 2;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

waitForMonitor(new Callable<Void>()
{
Expand All @@ -161,7 +161,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 3;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

Assert.assertEquals(3, eventCollector.size());
Iterator<ResourceEvent> iterator = eventCollector.iterator();
Expand Down Expand Up @@ -208,7 +208,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 1;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);
final FileResource<?> childFile = childDir.getChild("child_file.txt").reify(FileResource.class);

waitForMonitor(new Callable<Void>()
Expand All @@ -227,7 +227,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 2;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

waitForMonitor(new Callable<Void>()
{
Expand All @@ -245,7 +245,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 4;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

Assert.assertEquals(4, eventCollector.size());
Iterator<ResourceEvent> iterator = eventCollector.iterator();
Expand Down Expand Up @@ -366,7 +366,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 1;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

waitForMonitor(new Callable<Void>()
{
Expand All @@ -384,7 +384,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 2;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

Assert.assertEquals(2, eventCollector.size());
Iterator<ResourceEvent> iterator = eventCollector.iterator();
Expand Down Expand Up @@ -439,7 +439,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 1;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

waitForMonitor(new Callable<Void>()
{
Expand All @@ -458,7 +458,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 3;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

Assert.assertEquals(3, eventCollector.size());
Iterator<ResourceEvent> iterator = eventCollector.iterator();
Expand Down Expand Up @@ -513,7 +513,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 1;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

waitForMonitor(new Callable<Void>()
{
Expand All @@ -531,7 +531,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 2;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

Assert.assertEquals(2, eventCollector.size());
Iterator<ResourceEvent> iterator = eventCollector.iterator();
Expand Down Expand Up @@ -584,7 +584,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 1;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

waitForMonitor(new Callable<Void>()
{
Expand All @@ -602,7 +602,7 @@ public Boolean call() throws Exception
{
return eventCollector.size() == 2;
}
}, 5, TimeUnit.SECONDS);
}, 15, TimeUnit.SECONDS);

Assert.assertEquals(2, eventCollector.size());
Iterator<ResourceEvent> iterator = eventCollector.iterator();
Expand Down
6 changes: 3 additions & 3 deletions shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellAddonTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ public void testContainerInjection() throws Exception
test.getStdIn().flush();
System.out.println("OUT:" + test.getStdOut());
System.out.println("ERR:" + test.getStdErr());
test.waitForStdOutChanged("\n", 5, TimeUnit.SECONDS);
test.waitForStdOutChanged("\n", 15, TimeUnit.SECONDS);
System.out.println("OUT:" + test.getStdOut());
System.out.println("ERR:" + test.getStdErr());

test.waitForStdOutChanged("list-services\n", 5, TimeUnit.SECONDS);
test.waitForStdOutChanged("list-services\n", 15, TimeUnit.SECONDS);
System.out.println("OUT:" + test.getStdOut());
System.out.println("ERR:" + test.getStdErr());
}
Expand All @@ -103,7 +103,7 @@ public void testContainerInjection() throws Exception
@Ignore("Until ShellTest is used properly")
public void testDidYouMean() throws Exception
{
test.waitForStdOutChanged("cde\n", 5, TimeUnit.SECONDS);
test.waitForStdOutChanged("cde\n", 15, TimeUnit.SECONDS);
Assert.assertThat(test.getStdOut(), CoreMatchers.containsString("Did you mean this?"));
}
}
2 changes: 1 addition & 1 deletion shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellCommandListenerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void testCommandExecutionListenerTriggers() throws Exception
MockCommandExecutionListener listener = new MockCommandExecutionListener();
shell.addCommandExecutionListener(listener);

test.execute("command-list", 5, TimeUnit.SECONDS);
test.execute("command-list", 15, TimeUnit.SECONDS);
Assert.assertTrue(listener.isPreExecuted());
Assert.assertTrue(listener.isPostExecuted());
}
Expand Down
2 changes: 1 addition & 1 deletion shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellExportTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void testExport() throws Exception
{
shellTest.execute("export A_VARIABLE=123");
shellTest.clearScreen();
Result result = shellTest.execute("echo-export", 5, TimeUnit.SECONDS);
Result result = shellTest.execute("echo-export", 15, TimeUnit.SECONDS);
Assert.assertThat(result.getMessage(), CoreMatchers.containsString("123"));
}

Expand Down
10 changes: 5 additions & 5 deletions shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellInputManyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@ public void testCommandForInputMany() throws Exception
{
// Verify autocomplete for parameter works
test.clearScreen();
test.waitForCompletion("mock-command-inputmany ", "mock", 5, TimeUnit.SECONDS);
test.waitForCompletion("mock-command-inputmany --values ", "--v", 5, TimeUnit.SECONDS);
test.waitForCompletion("mock-command-inputmany ", "mock", 15, TimeUnit.SECONDS);
test.waitForCompletion("mock-command-inputmany --values ", "--v", 15, TimeUnit.SECONDS);
Assert.assertEquals("mock-command-inputmany --values ", test.getBuffer());

test.clearScreen();

// Verify that command execution works for one argument
Result result = test.execute("mock-command-inputmany --values one", 5, TimeUnit.SECONDS);
Result result = test.execute("mock-command-inputmany --values one", 15, TimeUnit.SECONDS);
Assert.assertEquals("Command executed with input values : one ", result.getMessage());

// Verify that command execution works for multiple arguments
result = test.execute("mock-command-inputmany --values one two three", 5, TimeUnit.SECONDS);
result = test.execute("mock-command-inputmany --values one two three", 15, TimeUnit.SECONDS);
Assert.assertEquals("Command executed with input values : one two three ", result.getMessage());

// Verify that command execution fails for no arguments
test.clearScreen();
test.waitForStdErrChanged("mock-command-inputmany --values\n", 5, TimeUnit.SECONDS);
test.waitForStdErrChanged("mock-command-inputmany --values\n", 15, TimeUnit.SECONDS);
Assert.assertThat(test.getStdErr(),
containsString("Must specify at least one value for --values before continuing."));
}
Expand Down
2 changes: 1 addition & 1 deletion shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void testRmCommand() throws TimeoutException
@Test(timeout = 10000)
public void testChangeDirCommandCompletion() throws TimeoutException
{
shellTest.waitForCompletion("cd ", "cd", 5, TimeUnit.SECONDS);
shellTest.waitForCompletion("cd ", "cd", 15, TimeUnit.SECONDS);
}

@Test(timeout = 10000)
Expand Down
4 changes: 2 additions & 2 deletions shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellVerboseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ public void testVerboseOutput() throws Exception
{
shellTest.execute("export VERBOSE=false");
Thread.sleep(500);
Result result = shellTest.execute("throw-exception", 5, TimeUnit.SECONDS);
Result result = shellTest.execute("throw-exception", 15, TimeUnit.SECONDS);
Assert.assertThat(result, instanceOf(Failed.class));
Assert.assertThat(shellTest.getStdErr(), not(containsString("Cause Exception")));
shellTest.clearScreen();
shellTest.execute("export VERBOSE=true");
Thread.sleep(500);
shellTest.execute("throw-exception", 5, TimeUnit.SECONDS);
shellTest.execute("throw-exception", 15, TimeUnit.SECONDS);
Assert.assertThat(shellTest.getStdErr(), containsString("Cause Exception"));
}

Expand Down
8 changes: 4 additions & 4 deletions shell/tests/src/test/java/org/jboss/forge/addon/shell/command/CatCommandTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void tearDown() throws Exception
@Test
public void testCatCommandInvalidArgument() throws Exception
{
Result result = shellTest.execute("cat foo bar", 5, TimeUnit.SECONDS);
Result result = shellTest.execute("cat foo bar", 15, TimeUnit.SECONDS);
Assert.assertThat(result, instanceOf(Failed.class));
String err = shellTest.getStdErr();
Assert.assertThat(err, containsString("cat: foo: No such file or directory"));
Expand All @@ -63,7 +63,7 @@ public void testCatCommand() throws Exception
FileResource<?> source = project.getRoot().getChild(target.getName()).reify(FileResource.class);
source.setContents("public void test() {}");

shellTest.execute("cat " + source.getFullyQualifiedName(), 5, TimeUnit.SECONDS);
shellTest.execute("cat " + source.getFullyQualifiedName(), 15, TimeUnit.SECONDS);
Assert.assertThat(shellTest.getStdOut(), containsString("test()"));
}

Expand All @@ -77,7 +77,7 @@ public void testCatColoredCommand() throws Exception
FileResource<?> source = project.getRoot().getChild(target.getName()).reify(FileResource.class);
source.setContents("public void test() {}");

shellTest.execute("cat " + source.getFullyQualifiedName() + " --color", 5, TimeUnit.SECONDS);
shellTest.execute("cat " + source.getFullyQualifiedName() + " --color", 15, TimeUnit.SECONDS);
// the string should be colors, so there are color codes between the statements
Assert.assertThat(shellTest.getStdOut(), not(containsString("public void")));
}
Expand All @@ -93,7 +93,7 @@ public void testCatColoredCommandMissingType() throws Exception
FileResource<?> source = project.getRoot().getChild(target.getName()).reify(FileResource.class);
source.setContents("public void test() {}");

shellTest.execute("cat " + source.getFullyQualifiedName() + " --color", 5, TimeUnit.SECONDS);
shellTest.execute("cat " + source.getFullyQualifiedName() + " --color", 15, TimeUnit.SECONDS);
Assert.assertThat(shellTest.getStdErr(), containsString("Error while rendering output in color"));
// the string should not be colored
Assert.assertThat(shellTest.getStdOut(), containsString("public void"));
Expand Down
24 changes: 12 additions & 12 deletions shell/tests/src/test/java/org/jboss/forge/addon/shell/command/CdCommandTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@ public void testCDProject() throws Exception
{
Project project = projectFactory.createTempProject();
String projectPath = project.getRoot().getFullyQualifiedName();
shellTest.execute("cd " + projectPath, 5, TimeUnit.SECONDS);
shellTest.execute("cd " + projectPath, 15, TimeUnit.SECONDS);
shellTest.clearScreen();
shellTest.execute("pwd", 5, TimeUnit.SECONDS);
shellTest.execute("pwd", 15, TimeUnit.SECONDS);
Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString(projectPath));

shellTest.execute("mkdir abc", 5, TimeUnit.SECONDS);
shellTest.execute("cd abc", 5, TimeUnit.SECONDS);
shellTest.execute("cd ~~", 5, TimeUnit.SECONDS);
shellTest.execute("mkdir abc", 15, TimeUnit.SECONDS);
shellTest.execute("cd abc", 15, TimeUnit.SECONDS);
shellTest.execute("cd ~~", 15, TimeUnit.SECONDS);
shellTest.clearScreen();
shellTest.execute("pwd", 5, TimeUnit.SECONDS);
shellTest.execute("pwd", 15, TimeUnit.SECONDS);
Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString(projectPath));
}

Expand All @@ -130,16 +130,16 @@ public List<Resource<?>> getNewCurrentResources(UIContext current, String token)
{
Assert.assertTrue(handlerFactory.getHandlers().contains(handler));

shellTest.execute("cd " + projectPath, 5, TimeUnit.SECONDS);
shellTest.execute("cd " + projectPath, 15, TimeUnit.SECONDS);
shellTest.clearScreen();
shellTest.execute("pwd", 5, TimeUnit.SECONDS);
shellTest.execute("pwd", 15, TimeUnit.SECONDS);
Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString(projectPath));

shellTest.execute("mkdir abc", 5, TimeUnit.SECONDS);
shellTest.execute("cd abc", 5, TimeUnit.SECONDS);
shellTest.execute("cd #/", 5, TimeUnit.SECONDS);
shellTest.execute("mkdir abc", 15, TimeUnit.SECONDS);
shellTest.execute("cd abc", 15, TimeUnit.SECONDS);
shellTest.execute("cd #/", 15, TimeUnit.SECONDS);
shellTest.clearScreen();
shellTest.execute("pwd", 5, TimeUnit.SECONDS);
shellTest.execute("pwd", 15, TimeUnit.SECONDS);
Assert.assertThat(shellTest.getStdOut(), CoreMatchers.containsString(projectPath));
}
finally
Expand Down

0 comments on commit 56e2653

Please sign in to comment.