diff options
author | gjoranv <gv@yahoo-inc.com> | 2017-02-22 15:49:26 +0100 |
---|---|---|
committer | gjoranv <gv@yahoo-inc.com> | 2017-02-22 15:49:26 +0100 |
commit | e6a9cc78d2f6bd70b44de249b9d87687fdd64509 (patch) | |
tree | e13f0e36ff267c75d0469af22717b66f4494dcde /config-model/src/test/java/com | |
parent | 938639fa0f2e7fe2ce21a857513fd5fc305d31a9 (diff) |
One TestUtil and joinLines() is enough.
Diffstat (limited to 'config-model/src/test/java/com')
5 files changed, 4 insertions, 16 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java index aa65cca1b6a..a19fe9629fd 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java @@ -8,7 +8,7 @@ import java.util.Iterator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static com.yahoo.searchdefinition.TestUtils.joinLines; +import static com.yahoo.config.model.test.TestUtil.joinLines; /** * @author gjoranv diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/TestUtils.java b/config-model/src/test/java/com/yahoo/searchdefinition/TestUtils.java deleted file mode 100644 index d2c963d814d..00000000000 --- a/config-model/src/test/java/com/yahoo/searchdefinition/TestUtils.java +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; - -/** - * @author geirst - */ -public class TestUtils { - - public static String joinLines(String... lines) { - return String.join("\n", lines); - } -} diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java index cdc4cbce77f..6220ab9f7d5 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java @@ -11,7 +11,7 @@ import org.junit.Test; import java.io.IOException; import java.util.Iterator; -import static com.yahoo.searchdefinition.TestUtils.joinLines; +import static com.yahoo.config.model.test.TestUtil.joinLines; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java index 4222a4ef66a..00ea49a9025 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import static org.junit.Assert.assertEquals; -import static com.yahoo.searchdefinition.TestUtils.joinLines; +import static com.yahoo.config.model.test.TestUtil.joinLines; import static org.junit.Assert.assertNotNull; /** diff --git a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java index bb115ff43e2..f9b15343f8e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java @@ -13,7 +13,7 @@ import org.junit.Test; import java.io.IOException; -import static com.yahoo.searchdefinition.TestUtils.joinLines; +import static com.yahoo.config.model.test.TestUtil.joinLines; import static junit.framework.TestCase.assertSame; /** |