Removed usage of "NON-RDF" group, closes #166

Author: sspeiche

src/main/java/org/w3/ldp/testsuite/LdpTestSuite.java

@@ -240,7 +240,6 @@ private void setupSuite(OptionsHandler options) {
 
 		if (options.hasOption("non-rdf")) {
 			classList.add(new XmlClass("org.w3.ldp.testsuite.test.NonRDFSourceTest"));
-			testsuite.addIncludedGroup(LdpTest.NR);
 		}
 
 		if (options.hasOption("httpLogging")) {

src/main/java/org/w3/ldp/testsuite/test/CommonResourceTest.java

@@ -24,7 +24,6 @@
 import org.testng.annotations.Optional;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
-import org.testng.internal.Utils;
 import org.w3.ldp.testsuite.LdpTestSuite;
 import org.w3.ldp.testsuite.annotations.SpecTest;
 import org.w3.ldp.testsuite.annotations.SpecTest.METHOD;

src/main/java/org/w3/ldp/testsuite/test/LdpTest.java

@@ -156,14 +156,6 @@ public void tearDown() {
 	 */
 	public static final String MANUAL = "MANUAL";
 
-	/**
-	 * A Linked Data Platform Non-RDF Source (LDP-NR). An LDPR whose state
-	 * is not represented in RDF. These are binary or text documents that do not
-	 * have useful RDF representations.
-	 *
-	 * @see <a href="http://www.w3.org/TR/ldp/#terms">LDP Terminology</a>
-	 */
-	public static final String NR = "NON-RDF";
 
 	private static boolean warnings = false;
 

src/main/java/org/w3/ldp/testsuite/test/NonRDFSourceTest.java

@@ -110,7 +110,7 @@ protected String getResourceUri() {
 	}
 
 	@Test(
-			groups = {MAY, NR},
+			groups = {MAY},
 			description = "LDP servers may accept an HTTP POST of non-RDF " +
 					"representations (LDP-NRs) for creation of any kind of " +
 					"resource, for example binary resources.")
@@ -133,7 +133,7 @@ public void testPostNonRDFSource() throws IOException {
 	}
 
 	@Test(
-			groups = {MAY, NR},
+			groups = {MAY},
 			description = "LDP servers may accept an HTTP POST of non-RDF " +
 					"representations (LDP-NRs) for creation of any kind of " +
 					"resource, for example binary resources.")
@@ -170,7 +170,7 @@ public void testPostResourceAndGetFromContainer() throws IOException {
 	}
 
 	@Test(
-			groups = {MAY, NR},
+			groups = {MAY},
 			description = "LDP servers may host a mixture of LDP-RSs and LDP-NRs. " +
 					"For example, it is common for LDP servers to need to host binary " +
 					"or text resources that do not have useful RDF representations.")
@@ -207,7 +207,7 @@ public void testPostResourceGetBinary() throws IOException {
 	}
 
 	@Test(
-			groups = {MAY, NR},
+			groups = {MAY},
 			description = "Each LDP Non-RDF Source must also be a conforming LDP Resource. " +
 					"LDP Non-RDF Sources may not be able to fully express their state using RDF.")
 	@SpecTest(
@@ -258,7 +258,7 @@ public void testPostResourceGetMetadataAndBinary() throws IOException {
 	}
 
 	@Test(
-			groups = {MAY, NR},
+			groups = {MAY},
 			description = "LDP servers exposing an LDP Non-RDF Source may advertise this by exposing " +
 					"a HTTP Link header with a target URI of http://www.w3.org/ns/ldp#NonRDFSource, and " +
 					"a link relation type of type (that is, rel='type') in responses to requests made to " +
@@ -293,7 +293,7 @@ public void testPostResourceAndCheckLink() throws IOException {
 	}
 
 	@Test(
-			groups = {MAY, NR},
+			groups = {MAY},
 			description = "Upon successful creation of an LDP-NR (HTTP status code of 201-Created and " +
 					"URI indicated by Location response header), LDP servers may create an associated " +
 					"LDP-RS to contain data about the newly created LDP-NR. If a LDP server creates " +
@@ -342,7 +342,7 @@ public void testPostResourceAndCheckAssociatedResource() throws IOException {
 	}
 
 	@Test(
-			groups = {MUST, NR},
+			groups = {MUST},
 			description = "When a contained LDPR is deleted, and the LDPC server created an"+
 					"associated LDP-RS (see the LDPC POST section), the LDPC server must also"+
 					"delete the associated LDP-RS it created.",
@@ -412,7 +412,7 @@ protected Response postNonRDFSource(String slug, String file, String mimeType) t
 	}
 
 	@Test(
-			groups = {MUST, NR},
+			groups = {MUST},
 			description = "When responding to requests whose request-URI is a LDP-NR with an"+
 					"associated LDP-RS, a LDPC server must provide the same HTTP Link response"+
 					"header as is required in the create response",

testng.xml

@@ -47,9 +47,6 @@
 
             <run>
                 <include name="allRequirementLevels"/>
-
-                <!-- Include this group if your server supports non-RDF source resources -->
-                <include name="NON-RDF"/>
 
                 <!-- Will just skip the tests but create entries for the reporters -->
                 <include name="MANUAL"/>