brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [33/50] [abbrv] brooklyn-library git commit: Remove obsolete Tomcat fail binding test
Date Mon, 01 Feb 2016 17:47:25 GMT
Remove obsolete Tomcat fail binding test


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/27059a3c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/27059a3c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/27059a3c

Branch: refs/heads/0.7.0-incubating
Commit: 27059a3c55a6c31f23a8bbf0b1c2819ff5fdcafb
Parents: a29eab1
Author: Valentin Aitken <valentin.aitken@cloudsoftcorp.com>
Authored: Tue Jun 23 15:54:54 2015 +0300
Committer: Valentin Aitken <valentin.aitken@cloudsoftcorp.com>
Committed: Tue Jun 23 16:19:43 2015 +0300

----------------------------------------------------------------------
 .../Tomcat8ServerSimpleIntegrationTest.java     | 108 -------------------
 .../TomcatServerSimpleIntegrationTest.java      | 108 -------------------
 2 files changed, 216 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/27059a3c/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/Tomcat8ServerSimpleIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/Tomcat8ServerSimpleIntegrationTest.java
b/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/Tomcat8ServerSimpleIntegrationTest.java
deleted file mode 100644
index c8f33a7..0000000
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/Tomcat8ServerSimpleIntegrationTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity.webapp.tomcat;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-import java.net.ServerSocket;
-import java.util.Iterator;
-
-import org.jclouds.util.Throwables2;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import brooklyn.entity.basic.ApplicationBuilder;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.proxying.EntitySpec;
-import brooklyn.location.PortRange;
-import brooklyn.location.basic.LocalhostMachineProvisioningLocation;
-import brooklyn.location.basic.PortRanges;
-import brooklyn.test.entity.TestApplication;
-import brooklyn.util.net.Networking;
-import brooklyn.util.time.Duration;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * This tests the operation of the {@link Tomcat8Server} entity.
- * 
- * FIXME this test is largely superseded by WebApp*IntegrationTest which tests inter alia
Tomcat
- */
-public class Tomcat8ServerSimpleIntegrationTest {
-    @SuppressWarnings("unused")
-    private static final Logger LOG = LoggerFactory.getLogger(Tomcat8ServerSimpleIntegrationTest.class);
-    
-    /** don't use 8080 since that is commonly used by testing software; use different from
other tests. */
-    static PortRange DEFAULT_HTTP_PORT_RANGE = PortRanges.fromString("7880-7980");
-    
-    private TestApplication app;
-    private Tomcat8Server tc;
-    private int httpPort;
-    
-    @BeforeMethod(alwaysRun=true)
-    public void pickFreePort() {
-        for (Iterator<Integer> iter = DEFAULT_HTTP_PORT_RANGE.iterator(); iter.hasNext();)
{
-            Integer port = iter.next();
-            if (Networking.isPortAvailable(port)) {
-                httpPort = port;
-                return;
-            }
-        }
-        fail("someone is already listening on ports "+DEFAULT_HTTP_PORT_RANGE+"; tests assume
that port is free on localhost");
-    }
- 
-    @AfterMethod(alwaysRun=true)
-    public void tearDown() throws Exception {
-        if (app != null) Entities.destroyAll(app.getManagementContext());
-    }
-    
-	/*
-	 * TODO Tomcat's HTTP connector fails to start when the HTTP port is in use.
-	 * 
-	 * This prevents the the SERVICE_UP check from receiving an answer,
-	 * which causes the test to timeout.
-	 */
-    @Test(groups="Integration")
-    public void detectFailureIfTomcatCantBindToPort() throws Exception {
-    	ServerSocket listener = new ServerSocket(httpPort);
-        try {
-            app = ApplicationBuilder.newManagedApp(TestApplication.class);
-            tc = app.createAndManageChild(EntitySpec.create(Tomcat8Server.class)
-    			.configure("httpPort", httpPort)
-    			.configure(TomcatServer.START_TIMEOUT, Duration.ONE_MINUTE));
-            try {
-                tc.start(ImmutableList.of(app.getManagementContext().getLocationManager().manage(new
LocalhostMachineProvisioningLocation())));
-                fail("Should have thrown start-exception");
-            } catch (Exception e) {
-                // LocalhostMachineProvisioningLocation does NetworkUtils.isPortAvailable,
so get -1
-                IllegalArgumentException iae = Throwables2.getFirstThrowableOfType(e, IllegalArgumentException.class);
-                if (iae == null || iae.getMessage() == null || !iae.getMessage().equals("port
for httpPort is null")) throw e;
-            } finally {
-                tc.stop();
-            }
-            assertFalse(tc.getAttribute(Tomcat8ServerImpl.SERVICE_UP));
-        } finally {
-            listener.close();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/27059a3c/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerSimpleIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerSimpleIntegrationTest.java
b/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerSimpleIntegrationTest.java
deleted file mode 100644
index 0189456..0000000
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerSimpleIntegrationTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity.webapp.tomcat;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-import java.net.ServerSocket;
-import java.util.Iterator;
-
-import org.jclouds.util.Throwables2;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import brooklyn.entity.basic.ApplicationBuilder;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.proxying.EntitySpec;
-import brooklyn.location.PortRange;
-import brooklyn.location.basic.LocalhostMachineProvisioningLocation;
-import brooklyn.location.basic.PortRanges;
-import brooklyn.test.entity.TestApplication;
-import brooklyn.util.net.Networking;
-import brooklyn.util.time.Duration;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * This tests the operation of the {@link TomcatServer} entity.
- * 
- * FIXME this test is largely superseded by WebApp*IntegrationTest which tests inter alia
Tomcat
- */
-public class TomcatServerSimpleIntegrationTest {
-    @SuppressWarnings("unused")
-    private static final Logger LOG = LoggerFactory.getLogger(TomcatServerSimpleIntegrationTest.class);
-    
-    /** don't use 8080 since that is commonly used by testing software; use different from
other tests. */
-    static PortRange DEFAULT_HTTP_PORT_RANGE = PortRanges.fromString("7880-7980");
-    
-    private TestApplication app;
-    private TomcatServer tc;
-    private int httpPort;
-    
-    @BeforeMethod(alwaysRun=true)
-    public void pickFreePort() {
-        for (Iterator<Integer> iter = DEFAULT_HTTP_PORT_RANGE.iterator(); iter.hasNext();)
{
-            Integer port = iter.next();
-            if (Networking.isPortAvailable(port)) {
-                httpPort = port;
-                return;
-            }
-        }
-        fail("someone is already listening on ports "+DEFAULT_HTTP_PORT_RANGE+"; tests assume
that port is free on localhost");
-    }
- 
-    @AfterMethod(alwaysRun=true)
-    public void tearDown() throws Exception {
-        if (app != null) Entities.destroyAll(app.getManagementContext());
-    }
-    
-	/*
-	 * TODO Tomcat's HTTP connector fails to start when the HTTP port is in use.
-	 * 
-	 * This prevents the the SERVICE_UP check from receiving an answer,
-	 * which causes the test to timeout.
-	 */
-    @Test(groups="Integration")
-    public void detectFailureIfTomcatCantBindToPort() throws Exception {
-        ServerSocket listener = new ServerSocket(httpPort);
-        try {
-            app = ApplicationBuilder.newManagedApp(TestApplication.class);
-            tc = app.createAndManageChild(EntitySpec.create(TomcatServer.class)
-            	.configure("httpPort", httpPort)
-            	.configure(TomcatServer.START_TIMEOUT, Duration.ONE_MINUTE));
-            try {
-                tc.start(ImmutableList.of(app.getManagementContext().getLocationManager().manage(new
LocalhostMachineProvisioningLocation())));
-                fail("Should have thrown start-exception");
-            } catch (Exception e) {
-                // LocalhostMachineProvisioningLocation does NetworkUtils.isPortAvailable,
so get -1
-                IllegalArgumentException iae = Throwables2.getFirstThrowableOfType(e, IllegalArgumentException.class);
-                if (iae == null || iae.getMessage() == null || !iae.getMessage().equals("port
for httpPort is null")) throw e;
-            } finally {
-                tc.stop();
-            }
-            assertFalse(tc.getAttribute(TomcatServerImpl.SERVICE_UP));
-        } finally {
-            listener.close();
-        }
-    }
-}


Mime
View raw message