You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/09/20 19:53:28 UTC
[4/7] git commit: MARMOTTA-499: added more testing
MARMOTTA-499: added more testing
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/48d398ad
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/48d398ad
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/48d398ad
Branch: refs/heads/develop
Commit: 48d398add62f3ce6e8bba895b2c622351a108a20
Parents: e447515
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Jul 9 08:32:49 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Jul 9 08:32:49 2014 +0200
----------------------------------------------------------------------
.../modules/MarmottaResourceServiceTest.java | 32 ++++++++++++--------
1 file changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/48d398ad/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/modules/MarmottaResourceServiceTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/modules/MarmottaResourceServiceTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/modules/MarmottaResourceServiceTest.java
index d4b6a24..a4000ad 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/modules/MarmottaResourceServiceTest.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/modules/MarmottaResourceServiceTest.java
@@ -22,16 +22,9 @@ import org.apache.marmotta.platform.core.api.modules.MarmottaResourceService;
import org.apache.marmotta.platform.core.api.modules.ResourceEntry;
import org.apache.marmotta.platform.core.test.base.JettyMarmotta;
import org.apache.marmotta.platform.core.webservices.prefix.PrefixWebService;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
-import java.io.IOException;
-
-import static com.jayway.restassured.RestAssured.expect;
import static com.jayway.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.equalTo;
/**
* Marmotta Resources test
@@ -60,20 +53,33 @@ public class MarmottaResourceServiceTest {
@Test
public void testMARMOTTA499() {
+ testResource("/core/public/style/blue/style.css", "text/css");
+ }
- final String resource = "/core/public/style/blue/style.css";
- final String expectedMimeType = "text/css";
+ @Test
+ public void testPage() {
+ testResource("/core/admin/about.html", "text/html");
+ }
+
+ @Test
+ public void testImage() {
+ testResource("/core/public/img/logo/marmotta-logo.png", "image/png");
+ }
+
+ private void testResource(String resource, String mimetype) {
+ Assume.assumeNotNull(resource);
+ Assume.assumeNotNull(mimetype);
ResourceEntry resourceEntry = resourceService.getResource(resource);
- Assert.assertEquals(expectedMimeType, resourceEntry.getContentType());
+ Assert.assertNotNull(resourceEntry);
+ Assert.assertEquals(mimetype, resourceEntry.getContentType());
given().
expect().
statusCode(200).
- contentType(expectedMimeType).
+ contentType(mimetype).
when().
get(resource);
-
}
}