Author: adietish
Date: 2011-04-11 13:42:16 -0400 (Mon, 11 Apr 2011)
New Revision: 30484
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
Log:
[JBIDE-8690] added test that checks if app was deployed
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
===================================================================
---
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11
17:37:33 UTC (rev 30483)
+++
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11
17:42:16 UTC (rev 30484)
@@ -48,11 +48,10 @@
private static final String BUNDLE_ID =
"org.jboss.ide.eclipse.as7.deployment.tests";
private static final int WEBAPP_RESPONSE_TIMEOUT = 10 * 1024;
-
private static final String HOST = "localhost";
private static final int MGMT_PORT = 9999;
private static final int WEB_PORT = 8080;
-
+
@Before
public void setUp() throws UnknownHostException, IOException {
assertAs7IsRunning();
@@ -64,7 +63,8 @@
socket.connect(new InetSocketAddress(HOST, MGMT_PORT));
socket.close();
} catch (ConnectException e) {
- fail("JBoss as7 seems not to run on " + HOST + ", test cannot access
it's management API on port " + MGMT_PORT);
+ fail("JBoss as7 seems not to run on " + HOST + ", test cannot access
it's management API on port "
+ + MGMT_PORT);
}
}
@@ -75,12 +75,11 @@
new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
}
-
@Ignore
@Test
public void returnsDeployables() throws DeploymentException, URISyntaxException,
IOException {
String warName = "minimalistic.war";
- File file = getWarFile(warName );
+ File file = getWarFile(warName);
List<Deployable> deployables = new DeploymentBuilder(HOST,
MGMT_PORT).add(file).deploy();
assertEquals(1, deployables.size());
assertEquals(warName, deployables.get(0).getName());
@@ -93,25 +92,41 @@
Deployable deployable = deployables.get(0);
assertNotNull(deployable.getStatus());
}
-
+
@Test
public void isDeployed() throws DeploymentException, URISyntaxException, IOException {
String warName = "minimalistic.war";
- File file = getWarFile(warName );
+ File file = getWarFile(warName);
List<Deployable> deployables = new DeploymentBuilder(HOST,
MGMT_PORT).add(file).deploy();
Deployable deployable = deployables.get(0);
deployable.getStatus(); // wait for deployment to have finished
- String name = deployable.getName().substring(0,
deployable.getName().indexOf('.'));
- String response = getServerResponse(new
URL(MessageFormat.format("http://{0}:{1}/{2}", HOST, String.valueOf(WEB_PORT),
name)));
+ String response = getServerResponse(new URL(
+ MessageFormat.format("http://{0}:{1}/{2}",
+ HOST,
+ String.valueOf(WEB_PORT),
+ getWebappname(deployable.getName()))));
assertTrue(response.indexOf("minimalistic") >= 0);
}
+ /**
+ * cuts off the .war suffix
+ * @param deployableName
+ * @return
+ */
+ private String getWebappname(String deployableName) {
+ int suffixIndex = deployableName.indexOf('.');
+ if (suffixIndex < 0) {
+ return deployableName;
+ }
+ return deployableName.substring(0, suffixIndex);
+ }
+
private File getWarFile(String name) throws URISyntaxException, IOException {
Bundle bundle = Platform.getBundle(BUNDLE_ID);
URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
return new File(FileLocator.resolve(entryUrl).toURI());
}
-
+
private String getServerResponse(URL url) throws IOException {
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setUseCaches(false);
@@ -126,7 +141,7 @@
private String toString(BufferedInputStream in) throws IOException {
StringWriter writer = new StringWriter();
- for(int data = -1; ((data = in.read()) != -1); ) {
+ for (int data = -1; ((data = in.read()) != -1);) {
writer.write(data);
}
return writer.toString();
Show replies by date