diff options
author | gjoranv <gjoranv@gmail.com> | 2017-08-18 17:35:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-18 17:35:32 +0200 |
commit | 8c7c676d39f802fb6e4a03c3efdfeb1bfb040797 (patch) | |
tree | a55087fe430c0e3692dff3f2adc61dda18b85fb4 | |
parent | 515acff80f82a4e615a872ed3686243506feae75 (diff) | |
parent | bf21a1ce161605b323fa80ed2c7782fdc86308e0 (diff) |
Merge pull request #3162 from vespa-engine/bjorncs/travis
Travis does not do shallow clone for specific commit hash
5 files changed, 20 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 6eefe5cb0eb..33fb7100d91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,6 @@ cache: - $HOME/.m2 - $HOME/.ccache -git: - depth: 1 - branches: only: - master diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java index cfe8532d250..9388c8f400e 100644 --- a/application/src/test/java/com/yahoo/application/ApplicationTest.java +++ b/application/src/test/java/com/yahoo/application/ApplicationTest.java @@ -38,8 +38,8 @@ import java.net.ConnectException; import java.net.ServerSocket; import java.util.Map; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/application/src/test/java/com/yahoo/application/container/handler/HeadersTestCase.java b/application/src/test/java/com/yahoo/application/container/handler/HeadersTestCase.java index 31e265adfae..cda5ddd2ed9 100644 --- a/application/src/test/java/com/yahoo/application/container/handler/HeadersTestCase.java +++ b/application/src/test/java/com/yahoo/application/container/handler/HeadersTestCase.java @@ -3,14 +3,22 @@ package com.yahoo.application.container.handler; import org.junit.Test; -import java.util.*; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Simon Thoresen diff --git a/application/src/test/scala/com/yahoo/application/ApplicationBuilderTest.scala b/application/src/test/scala/com/yahoo/application/ApplicationBuilderTest.scala index 8d6ad443286..255810b959b 100644 --- a/application/src/test/scala/com/yahoo/application/ApplicationBuilderTest.scala +++ b/application/src/test/scala/com/yahoo/application/ApplicationBuilderTest.scala @@ -6,7 +6,7 @@ import java.nio.file.Files import org.junit.Assert.{assertTrue, assertThat, fail} import org.junit.Test import com.yahoo.io.IOUtils -import org.junit.matchers.JUnitMatchers.containsString +import org.hamcrest.CoreMatchers.containsString /** * @author tonytv diff --git a/application/src/test/scala/com/yahoo/application/container/JDiscTest.scala b/application/src/test/scala/com/yahoo/application/container/JDiscTest.scala index c84e8a17a0d..727a77ee119 100644 --- a/application/src/test/scala/com/yahoo/application/container/JDiscTest.scala +++ b/application/src/test/scala/com/yahoo/application/container/JDiscTest.scala @@ -8,14 +8,13 @@ import scala.language.implicitConversions import handler.Request import org.junit.{Ignore, Test} import org.junit.Assert.{assertThat, assertNotNull, fail} -import org.hamcrest.CoreMatchers.is +import org.hamcrest.CoreMatchers.{is, containsString, hasItem} import java.nio.file.FileSystems import com.yahoo.search.Query import com.yahoo.component.ComponentSpecification import handlers.TestHandler import xml.{Node, Elem} import JDiscTest._ -import org.junit.matchers.JUnitMatchers.{containsString, hasItem} import com.yahoo.application.{Networking, ApplicationBuilder} import scala.collection.convert.wrapAsScala._ |