diff --git a/tmbs-processor-backend/.settings/org.eclipse.core.resources.prefs b/tmbs-processor-backend/.settings/org.eclipse.core.resources.prefs index db326978a75223e28f8bb866e5484ff0dc9423ab..99f26c0203a7844de00dbfc56e6a35d8ed3c022c 100644 --- a/tmbs-processor-backend/.settings/org.eclipse.core.resources.prefs +++ b/tmbs-processor-backend/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/resources=UTF-8 encoding/<project>=UTF-8 diff --git a/tmbs-rest-backend/.classpath b/tmbs-rest-backend/.classpath index 0ea5b457813ab8b17b1513a6956425e2739c552c..09d933fbd645dd9b814f1cd167d0c23cb111f548 100644 --- a/tmbs-rest-backend/.classpath +++ b/tmbs-rest-backend/.classpath @@ -2,6 +2,8 @@ <classpath> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" path="src/main/resources"/> + <classpathentry kind="src" path="src/test/java"/> + <classpathentry kind="src" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> diff --git a/tmbs-rest-backend/.settings/org.eclipse.wst.common.component b/tmbs-rest-backend/.settings/org.eclipse.wst.common.component index 7ffe805eac95f76fb915c35104d8610d42660284..95b175ed4be0215065da882d16dd65cfcf7f11b6 100644 --- a/tmbs-rest-backend/.settings/org.eclipse.wst.common.component +++ b/tmbs-rest-backend/.settings/org.eclipse.wst.common.component @@ -4,6 +4,8 @@ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/> <property name="java-output-path" value="/tmbs-rest-backend/target/classes"/> <property name="context-root" value="tmbs"/> </wb-module> diff --git a/tmbs-rest-backend/pom.xml b/tmbs-rest-backend/pom.xml index 8841b573f1a81c37941db19cfbf47431435227ab..c81782152a3da6f23312ba389c6d62ed90046819 100644 --- a/tmbs-rest-backend/pom.xml +++ b/tmbs-rest-backend/pom.xml @@ -21,6 +21,16 @@ <artifactId>jersey-media-moxy</artifactId> <version>2.22.1</version> </dependency> + <dependency> + <groupId>org.glassfish.jersey.test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> + <version>2.22.1</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> + <artifactId>jersey-test-framework-provider-simple</artifactId> + <version>2.22.1</version> + </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> @@ -31,10 +41,25 @@ <artifactId>log4j-core</artifactId> <version>2.4.1</version> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.4.1</version> + </dependency> <dependency> <groupId>org.mongodb</groupId> <artifactId>mongodb-driver</artifactId> <version>3.0.4</version> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + </dependency> </dependencies> </project> diff --git a/tmbs-rest-backend/src/main/resources/log4j2.xml b/tmbs-rest-backend/src/main/resources/log4j2.xml index e43e1b9947b2f185974de3038a845e4434a2603b..fe4f3e8a41ac350245fd17458bb664919340591f 100644 --- a/tmbs-rest-backend/src/main/resources/log4j2.xml +++ b/tmbs-rest-backend/src/main/resources/log4j2.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<Configuration status="WARN"> +<Configuration status="OFF"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" /> diff --git a/tmbs-rest-backend/src/test/java/de/cochu/backend/rest/resource/ArticlesTest.java b/tmbs-rest-backend/src/test/java/de/cochu/backend/rest/resource/ArticlesTest.java new file mode 100644 index 0000000000000000000000000000000000000000..924b13084228b6807f3c60c46f144546d9f6507e --- /dev/null +++ b/tmbs-rest-backend/src/test/java/de/cochu/backend/rest/resource/ArticlesTest.java @@ -0,0 +1,25 @@ +package de.cochu.backend.rest.resource; + +import static org.junit.Assert.*; + +import javax.ws.rs.core.Application; +import javax.ws.rs.core.Response; + +import org.glassfish.jersey.server.ResourceConfig; +import org.glassfish.jersey.test.JerseyTest; +import org.junit.Test; + +public class ArticlesTest extends JerseyTest { + + @Override + protected Application configure() { + return new ResourceConfig(Articles.class); + } + + @Test + public void getArticles() { + Response response = target("articles").request().get(); + assertEquals(Response.Status.OK.getStatusCode(), response.getStatus()); + } + +} diff --git a/tmbs-rest-backend/src/test/resources/log4j2.xml b/tmbs-rest-backend/src/test/resources/log4j2.xml new file mode 100644 index 0000000000000000000000000000000000000000..e43e1b9947b2f185974de3038a845e4434a2603b --- /dev/null +++ b/tmbs-rest-backend/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="error"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/tmbs-rest-backend/target/classes/log4j2.xml b/tmbs-rest-backend/target/classes/log4j2.xml index e43e1b9947b2f185974de3038a845e4434a2603b..fe4f3e8a41ac350245fd17458bb664919340591f 100644 --- a/tmbs-rest-backend/target/classes/log4j2.xml +++ b/tmbs-rest-backend/target/classes/log4j2.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<Configuration status="WARN"> +<Configuration status="OFF"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />