Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating WF version, adding fixes to tests #778

Merged
merged 1 commit into from Jan 27, 2023
Merged

Updating WF version, adding fixes to tests #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions as/itests/org.jboss.tools.as.jmx.ui.bot.itests/pom.xml
View file
Open in desktop
Expand Up @@ -16,14 +16,14 @@
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<rd.config>${project.build.directory}/classes/requirements.json</rd.config>
<skipPrivateRequirements>false</skipPrivateRequirements>
<systemProperties>-Drd.config=${rd.config} -Dusage_reporting_enabled=false -Djbosstools.test.wildfly.25.home=${jbosstools.test.wildfly.25.home} -Djbosstools.test.wildfly.26.home=${jbosstools.test.wildfly.26.home} -Djbosstools.test.eap.7.4.home=${jbosstools.test.eap.7.4.home} -Dusername=${username} -Dpassword=${password} -Dremote.system.type=${remote.system.type}</systemProperties>
<systemProperties>-Drd.config=${rd.config} -Dusage_reporting_enabled=false -Djbosstools.test.wildfly.26.home=${jbosstools.test.wildfly.26.home} -Djbosstools.test.wildfly.27.home=${jbosstools.test.wildfly.27.home} -Djbosstools.test.eap.7.4.home=${jbosstools.test.eap.7.4.home} -Dusername=${username} -Dpassword=${password} -Dremote.system.type=${remote.system.type}</systemProperties>
<surefire.timeout>14400</surefire.timeout>
<username></username>
<password></password>
<server.host></server.host>
<remote.system.type></remote.system.type>
<jbosstools.test.wildfly.25.home>${jbosstools.test.jboss.home.25.0}</jbosstools.test.wildfly.25.home>
<jbosstools.test.wildfly.26.home>${jbosstools.test.jboss.home.26.1}</jbosstools.test.wildfly.26.home>
<jbosstools.test.wildfly.27.home>${jbosstools.test.jboss.home.27.0}</jbosstools.test.wildfly.27.home>
<jbosstools.test.eap.7.4.home>${jbosstools.test.jboss.home.eap.7.4}</jbosstools.test.eap.7.4.home>
<suiteClass>org.jboss.tools.as.jmx.ui.bot.itests.JMXAllTests</suiteClass>
</properties>
Expand Down
18 changes: 14 additions & 4 deletions as/itests/org.jboss.tools.as.jmx.ui.bot.itests/resources/requirements.json
View file
Open in desktop
@@ -1,13 +1,13 @@
{
"org.jboss.ide.eclipse.as.reddeer.server.requirement.ServerRequirement.JBossServer": [
{
"runtime": "${jbosstools.test.wildfly.25.home}",
"runtime": "${jbosstools.test.wildfly.26.home}",
"version": "24+",
"family": "WILDFLY"
},
{
"runtime": "${jbosstools.test.wildfly.26.home}",
"version": "24+",
"runtime": "${jbosstools.test.wildfly.27.home}",
"version": "27",
"family": "WILDFLY"
},
{
Expand All @@ -25,7 +25,7 @@
"systemType": "Local"
}
},
{
{
"runtime": "${jbosstools.test.wildfly.26.home}",
"version": "24+",
"family": "WILDFLY",
Expand All @@ -34,6 +34,16 @@
"serverHost": "LOCALHOST",
"systemType": "Local"
}
},
{
"runtime": "${jbosstools.test.wildfly.27.home}",
"version": "27",
"family": "WILDFLY",
"remote": {
"serverHome": "${jbosstools.test.wildfly.27.home}",
"serverHost": "LOCALHOST",
"systemType": "Local"
}
}
]
}
3 changes: 2 additions & 1 deletion ...s/src/org/jboss/tools/as/jmx/ui/bot/itests/server/connection/JMXServerConnectionTest.java
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
*/
@JBossServer(state = ServerRequirementState.PRESENT, cleanup = true)
public class JMXServerConnectionTest extends JMXServerTestTemplate {

@RequirementRestriction
public static RequirementMatcher getRestrictionMatcher() {
return new RequirementMatcher(JBossServer.class, "remote", new IsNull<Object>());
Expand All @@ -45,6 +45,7 @@ public void setupServer() {
public void tearDownServer() {
stopServer();
}


@Test
public void testJMXServerConnection() {
Expand Down
42 changes: 41 additions & 1 deletion ...sts/src/org/jboss/tools/as/jmx/ui/bot/itests/server/connection/JMXServerTestTemplate.java
View file
Open in desktop
Expand Up @@ -17,17 +17,24 @@

import java.util.List;

import org.eclipse.reddeer.common.exception.WaitTimeoutExpiredException;
import org.eclipse.reddeer.common.logging.Logger;
import org.eclipse.reddeer.common.wait.TimePeriod;
import org.eclipse.reddeer.common.wait.WaitUntil;
import org.eclipse.reddeer.common.wait.WaitWhile;
import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
import org.eclipse.reddeer.eclipse.wst.server.ui.cnf.Server;
import org.eclipse.reddeer.eclipse.wst.server.ui.cnf.ServersView2;
import org.eclipse.reddeer.eclipse.wst.server.ui.cnf.ServersViewEnums.ServerState;
import org.eclipse.reddeer.junit.requirement.inject.InjectRequirement;
import org.eclipse.reddeer.swt.api.Button;
import org.eclipse.reddeer.swt.api.MenuItem;
import org.eclipse.reddeer.swt.api.TreeItem;
import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
import org.eclipse.reddeer.swt.impl.button.PushButton;
import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
import org.eclipse.swt.widgets.Shell;
import org.jboss.ide.eclipse.as.reddeer.server.requirement.ServerRequirement;
import org.jboss.tools.as.jmx.ui.bot.itests.JMXTestTemplate;
import org.jboss.tools.jmx.reddeer.core.JMXConnection;
Expand All @@ -41,6 +48,8 @@ public abstract class JMXServerTestTemplate extends JMXTestTemplate {
protected JMXConnectionItem serverItem;
protected Server server;

private static final Logger log = Logger.getLogger(RemoteServerJMXConnectionTest.class);

@InjectRequirement
protected static ServerRequirement serverConfig;

Expand All @@ -65,10 +74,41 @@ public void getServerJMXConnection() {
public void stopServer() {
Server server = getServer(serverConfig.getServerName());
if (server.getLabel().getState() != ServerState.STOPPED) {
server.stop();
try {
server.stop();
} catch (WaitTimeoutExpiredException exc) {
log.error(exc.getMessage() + ", Server cannot be stopped, terminating");
// workaround for
ShellIsAvailable shell = new ShellIsAvailable("Terminate Server");
new WaitUntil(shell, false);
if (shell.getResult() != null) {
processShell(shell.getResult());
}
terminateServer(server);
if (server.getLabel().getState().isRunningState()) {
terminateServer(server);
}
}
}
}

private void terminateServer(Server server) {
ServersView2 view = new ServersView2();
view.open();
server.select();
MenuItem item = new ContextMenu().getItem("Show In", "Console");
if (item.isEnabled()) {
item.select();
new ConsoleView().terminateConsole();
}
}

private void processShell(Shell shell) {
DefaultShell dialog = new DefaultShell(shell);
new PushButton("Cancel").click();
new WaitWhile(new ShellIsAvailable(dialog), false);
}

public Server getServer(String name) {
ServersView2 view = new ServersView2();
view.open();
Expand Down