Return-Path: 
 <commits-return-4953-apmail-marmotta-commits-archive=marmotta.apache.org@marmotta.apache.org>
X-Original-To: apmail-marmotta-commits-archive@minotaur.apache.org
Delivered-To: apmail-marmotta-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 75CFF1186D
	for <apmail-marmotta-commits-archive@minotaur.apache.org>;
 Thu, 11 Sep 2014 07:51:09 +0000 (UTC)
Received: (qmail 53520 invoked by uid 500); 11 Sep 2014 07:51:09 -0000
Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org
Received: (qmail 53488 invoked by uid 500); 11 Sep 2014 07:51:09 -0000
Mailing-List: contact commits-help@marmotta.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@marmotta.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@marmotta.apache.org>
List-Post: <mailto:commits@marmotta.apache.org>
List-Id: <commits.marmotta.apache.org>
Reply-To: dev@marmotta.apache.org
Delivered-To: mailing list commits@marmotta.apache.org
Received: (qmail 53477 invoked by uid 99); 11 Sep 2014 07:51:09 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2014 07:51:09 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id C0F2C90EB73; Thu, 11 Sep 2014 07:51:08 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: wikier@apache.org
To: commits@marmotta.apache.org
Message-Id: <bafa37e460d74627a1e322cd18617f0b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: MARMOTTA-508: configuring surefire plugin to also run
 testng suites
Date: Thu, 11 Sep 2014 07:51:08 +0000 (UTC)

Repository: marmotta
Updated Branches:
  refs/heads/ldp 37a228490 -> a55b059dc


MARMOTTA-508: configuring surefire plugin to also run testng suites


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a55b059d
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a55b059d
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a55b059d

Branch: refs/heads/ldp
Commit: a55b059dcef2ff8db2c46c751f18ee03a3dc4149
Parents: 37a2284
Author: Sergio Fernández <wikier@apache.org>
Authored: Thu Sep 11 09:50:45 2014 +0200
Committer: Sergio Fernández <wikier@apache.org>
Committed: Thu Sep 11 09:50:45 2014 +0200

----------------------------------------------------------------------
 platform/marmotta-ldp/pom.xml                     | 18 ++++++++++++++++++
 .../marmotta/platform/ldp/LdpTestSuite.java       |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/a55b059d/platform/marmotta-ldp/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/pom.xml b/platform/marmotta-ldp/pom.xml
index dcb5cc4..9dd7a17 100644
--- a/platform/marmotta-ldp/pom.xml
+++ b/platform/marmotta-ldp/pom.xml
@@ -65,6 +65,24 @@
         </pluginManagement>
 
         <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>2.17</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>2.17</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.marmotta</groupId>
                 <artifactId>buildinfo-maven-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/a55b059d/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/LdpTestSuite.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/LdpTestSuite.java b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/LdpTestSuite.java
index 2af104d..881edc1 100644
--- a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/LdpTestSuite.java
+++ b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/LdpTestSuite.java
@@ -35,7 +35,6 @@ import java.util.Map;
  * @author Sergio Fernández
  * @author Jakob Frank
  */
-@Ignore("Something does not work, all tests in the ldp-testsuite are SKIPPED")
 public class LdpTestSuite {
 
     /** @see org.testng.TestNG#HAS_FAILURE */
@@ -63,6 +62,7 @@ public class LdpTestSuite {
 
     @Test
     public void testSuite() {
+        log.debug("Running W3C official LDP Test Suite against {} server", baseUrl);
         System.out.println("Running ldp-testsuite against " + baseUrl);
         Map<String, String> options = new HashMap<>();
         options.put("server", baseUrl);
@@ -70,8 +70,8 @@ public class LdpTestSuite {
         options.put("non-rdf", null);
         org.w3.ldp.testsuite.LdpTestSuite testSuite = new org.w3.ldp.testsuite.LdpTestSuite(options);
         testSuite.run();
-        Assert.assertTrue("ldp-testsuite finished with errors",(testSuite.getStatus() & TESTNG_STATUS_HAS_FAILURE) == 0);
-        Assert.assertTrue("ldp-testsuite is empty - no test run",(testSuite.getStatus() & TESTNG_STATUS_HAS_NO_TEST) == 0);
+        Assert.assertTrue("ldp-testsuite finished with errors", (testSuite.getStatus() & TESTNG_STATUS_HAS_FAILURE) == 0);
+        Assert.assertTrue("ldp-testsuite is empty - no test run", (testSuite.getStatus() & TESTNG_STATUS_HAS_NO_TEST) == 0);
     }
 
 }