From 60873d339c6573902faf8d33c292df07344d40a6 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <ntd@informatik.uni-kiel.de>
Date: Tue, 11 Nov 2014 15:17:29 +0100
Subject: [PATCH] removed conf from buildpath refactored test to work with
jenkins moved pipe-factories.conf to src-folder
---
.classpath | 1 -
{conf => src/main/resources}/pipe-factories.conf | 0
.../java/teetime/framework/pipe/PipeFactoryLoaderTest.java | 6 +++---
3 files changed, 3 insertions(+), 4 deletions(-)
rename {conf => src/main/resources}/pipe-factories.conf (100%)
diff --git a/.classpath b/.classpath
index abce7149..fdc7b871 100644
--- a/.classpath
+++ b/.classpath
@@ -25,6 +25,5 @@
</classpathentry>
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/resources"/>
- <classpathentry kind="src" path="conf"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/conf/pipe-factories.conf b/src/main/resources/pipe-factories.conf
similarity index 100%
rename from conf/pipe-factories.conf
rename to src/main/resources/pipe-factories.conf
diff --git a/src/test/java/teetime/framework/pipe/PipeFactoryLoaderTest.java b/src/test/java/teetime/framework/pipe/PipeFactoryLoaderTest.java
index 1c350635..e7beafb3 100644
--- a/src/test/java/teetime/framework/pipe/PipeFactoryLoaderTest.java
+++ b/src/test/java/teetime/framework/pipe/PipeFactoryLoaderTest.java
@@ -25,15 +25,15 @@ public class PipeFactoryLoaderTest {
@Test
public void singleConfig() throws IOException {
List<IPipeFactory> list = PipeFactoryLoader.loadPipeFactoriesFromClasspath("pipe-factories.conf");
- int lines = Files.readLines(new File("conf/pipe-factories.conf"), Charsets.UTF_8).size();
+ int lines = Files.readLines(new File("target/classes/pipe-factories.conf"), Charsets.UTF_8).size();
Assert.assertEquals(lines, list.size());
}
@Test
public void multipleConfigs() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException {
List<URL> files = new ArrayList<URL>();
- File pipeConfig = new File("conf/pipe-factories.conf");
- File testConfig = new File("src/test/resources/data/normal-test.conf");
+ File pipeConfig = new File("target/classes/pipe-factories.conf");
+ File testConfig = new File("target/test-classes/data/normal-test.conf");
files.add(testConfig.toURI().toURL());
files.add(pipeConfig.toURI().toURL());
List<IPipeFactory> pipeFactories = PipeFactoryLoader.mergeFiles(files);
--
GitLab