/**
 *  Copyright 2005-2016 Red Hat, Inc.
 *
 *  Red Hat 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 io.fabric8.quickstarts.springbootmvc;

import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.TestRestTemplate;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.web.client.RestTemplate;

@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = {IpRestApiTest.class, App.class})
@WebAppConfiguration
@IntegrationTest("server.port:0")
@EnableAutoConfiguration
public class IpRestApiTest extends Assert {

    private RestTemplate rest = new TestRestTemplate();

    @Autowired
    EmbeddedWebApplicationContext tomcat;

    int port;
    String baseUri;

    @Before
    public void before() {
        port = tomcat.getEmbeddedServletContainer().getPort();
        baseUri = "http://localhost:" + port;
    }

    @Test
    public void shouldExposeIpApi() throws InterruptedException {
        String ip = rest.getForObject(baseUri + "/ip", String.class);
        assertNotNull(ip);

        String ip2 = rest.getForObject(baseUri + "/ip", String.class);
        assertNotNull(ip2);

        // should not be same as there is a counter in the response
        assertNotSame(ip, ip2);
    }

}

@@ -708,33 +708,8 @@
 rt;%0A
-import org.junit.Before;%0A
 impo
@@ -859,285 +859,83 @@
 oot.
-autoconfigure.EnableAutoConfiguration;%0Aimport org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;%0Aimport org.springframework.boot.test.IntegrationTest;%0Aimport org.springframework.boot.test.SpringApplicationConfiguration;%0Aimport org.springframework.boot.tes
+test.context.SpringBootTest;%0Aimport org.springframework.boot.test.web.clien
 t.Te
@@ -999,35 +999,24 @@
 unit4.Spring
-JUnit4Class
 Runner;%0Aimpo
@@ -1010,32 +1010,39 @@
 gRunner;%0Aimport 
+static 
 org.springframew
@@ -1037,32 +1037,37 @@
 springframework.
+boot.
 test.context.web
@@ -1067,83 +1067,37 @@
 ext.
-web.WebAppConfiguration;%0Aimport org.springframework.web.client.RestTemplate
+SpringBootTest.WebEnvironment
 ;%0A%0A@
@@ -1114,19 +1114,8 @@
 ring
-JUnit4Class
 Runn
@@ -1135,32 +1135,16 @@
 ring
-ApplicationConfiguration
+BootTest
 (cla
@@ -1186,438 +1186,149 @@
 ass%7D
-)%0A@WebAppConfiguration%0A@IntegrationTest(%22server.port:0%22)%0A@EnableAutoConfiguration%0Apublic class IpRestApiTest extends Assert %7B%0A%0A    private RestTemplate rest = new TestRestTemplate();%0A%0A    @Autowired%0A    EmbeddedWebApplicationContext tomcat;%0A%0A    int port;%0A    String baseUri;%0A%0A    @Before%0A    public void before() %7B%0A        port = tomcat.getEmbeddedServletContainer().getPort();%0A        baseUri = %22http://localhost:%22 + port;%0A    %7D
+, webEnvironment = WebEnvironment.RANDOM_PORT)%0Apublic class IpRestApiTest extends Assert %7B%0A%0A    @Autowired%0A    private TestRestTemplate rest;
 %0A%0A  
@@ -1435,34 +1435,24 @@
 etForObject(
-baseUri + 
 %22/ip%22, Strin
@@ -1532,18 +1532,8 @@
 ect(
-baseUri + 
 %22/ip

Clean up usage of deprecated APIs