[dna-commits] DNA SVN: r944 - in trunk/extensions/dna-web-jcr-rest-war/src/test: java/org/jboss/dna/web/jcr and 1 other directories.

Author: bcarothers Date: 2009-05-28 09:28:05 -0400 (Thu, 28 May 2009) New Revision: 944 Added: trunk/extensions/dna-web-jcr-rest-war/src/test/java/org/jboss/dna/web/jcr/JcrResourcesTest.java trunk/extensions/dna-web-jcr-rest-war/src/test/resources/ trunk/extensions/dna-web-jcr-rest-war/src/test/resources/dna-test-users.props trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-dna.policy trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-jaas.xml trunk/extensions/dna-web-jcr-rest-war/src/test/resources/log4j.properties Log: DNA-312 DNA-312 Implement HTTP GET action for any resource at any path (folder or file) Adding the missing test files to the correct project (2 of 2) Added: trunk/extensions/dna-web-jcr-rest-war/src/test/java/org/jboss/dna/web/jcr/JcrResourcesTest.java =================================================================== --- trunk/extensions/dna-web-jcr-rest-war/src/test/java/org/jboss/dna/web/jcr/JcrResourcesTest.java (rev 0) +++ trunk/extensions/dna-web-jcr-rest-war/src/test/java/org/jboss/dna/web/jcr/JcrResourcesTest.java 2009-05-28 13:28:05 UTC (rev 944) @@ -0,0 +1,756 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.web.jcr.rest; + +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsInstanceOf.instanceOf; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.HashSet; +import java.util.Set; +import javax.ws.rs.core.MediaType; +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONObject; +import org.junit.Test; + +public class JcrResourcesTest { + + private static final String SERVER_CONTEXT = "/resources"; + private static final String SERVER_URL = "http://localhost:8080" + SERVER_CONTEXT; + + private String getResponseFor( HttpURLConnection connection ) throws IOException { + StringBuffer buff = new StringBuffer(); + + InputStream stream = connection.getInputStream(); + int bytesRead; + byte[] bytes = new byte[1024]; + while (-1 != (bytesRead = stream.read(bytes, 0, 1024))) { + buff.append(new String(bytes, 0, bytesRead)); + } + + return buff.toString(); + } + + @Test + public void shouldServeContentAtRoot() throws Exception { + URL postUrl = new URL(SERVER_URL + "/"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + String body = getResponseFor(connection); + + JSONObject objFromResponse = new JSONObject(body); + JSONObject expected = new JSONObject( + "{\"JCR%20Repository\":{\"repository\":{\"name\":\"JCR%20Repository\",\"resources\":{\"workspaces\":\"/resources/JCR%20Repository\"}}}}"); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + assertThat(objFromResponse.toString(), is(expected.toString())); + connection.disconnect(); + } + + @Test + public void shouldServeListOfWorkspacesForValidRepository() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + String body = getResponseFor(connection); + + JSONObject objFromResponse = new JSONObject(body); + JSONObject expected = new JSONObject( + "{\"%3cdefault%3e\":{\"workspace\":{\"name\":\"%3cdefault%3e\",\"resources\":{\"items\":\"/resources/JCR%20Repository/%3cdefault%3e/items\"}}}}"); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + assertThat(objFromResponse.toString(), is(expected.toString())); + connection.disconnect(); + } + + @Test + public void shouldReturnErrorForInvalidWorkspace() throws Exception { + URL postUrl = new URL(SERVER_URL + "/XXX"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + } + + @Test + public void shouldRetrieveRootNodeForValidRepository() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(2)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(2)); + assertThat(properties.getString("jcr:primaryType"), is("dna:root")); + assertThat(properties.get("jcr:uuid"), is(notNullValue())); + + JSONArray children = body.getJSONArray("children"); + assertThat(children.length(), is(1)); + assertThat(children.getString(0), is("jcr:system")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + } + + @Test + public void shouldRetrieveRootNodeAndChildrenWhenDepthSet() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items?dna:depth=1"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(2)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(2)); + assertThat(properties.getString("jcr:primaryType"), is("dna:root")); + assertThat(properties.get("jcr:uuid"), is(notNullValue())); + + JSONObject children = body.getJSONObject("children"); + assertThat(children.length(), is(1)); + + JSONObject system = children.getJSONObject("jcr:system"); + assertThat(system.length(), is(2)); + + properties = system.getJSONObject("properties"); + assertThat(properties.length(), is(1)); + assertThat(properties.getString("jcr:primaryType"), is("dna:system")); + + JSONArray namespaces = system.getJSONArray("children"); + assertThat(namespaces.length(), is(1)); + assertThat(namespaces.getString(0), is("dna:namespaces")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + } + + @Test + public void shouldRetrieveNodeAndChildrenWhenDepthSet() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/jcr:system?dna:depth=1"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(2)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(1)); + assertThat(properties.getString("jcr:primaryType"), is("dna:system")); + + JSONObject children = body.getJSONObject("children"); + assertThat(children.length(), is(1)); + + JSONObject namespaces = children.getJSONObject("dna:namespaces"); + assertThat(namespaces.length(), is(2)); + + properties = namespaces.getJSONObject("properties"); + assertThat(properties.length(), is(1)); + assertThat(properties.getString("jcr:primaryType"), is("dna:namespaces")); + + JSONArray namespace = namespaces.getJSONArray("children"); + assertThat(namespace.length(), is(10)); + Set<String> prefixes = new HashSet<String>(namespace.length()); + + for (int i = 0; i < namespace.length(); i++) { + prefixes.add(namespace.getString(i)); + } + + String[] expectedNamespaces = new String[] {"dna", "jcr", "nt", "mix", "sv", "xml", "dnaint", "xmlns", "xsi", "xsd"}; + for (int i = 0; i < expectedNamespaces.length; i++) { + assertTrue(prefixes.contains(expectedNamespaces[i])); + } + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + } + + @Test + public void shouldNotRetrieveNonExistentNode() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/foo"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + } + + @Test + public void shouldNotRetrieveNonExistentProperty() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/jcr:system/foobar"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + } + + @Test + public void shouldRetrieveProperty() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/jcr:system/jcr:primaryType"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String body = getResponseFor(connection); + assertThat(body, is("\"dna:system\"")); + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + } + + @Test + public void shouldPostNodeToValidPathWithPrimaryType() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeA"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:primaryType\": \"nt:unstructured\", \"testProperty\": \"testValue\", \"multiValuedProperty\": [\"value1\", \"value2\"]}}"; + connection.getOutputStream().write(payload.getBytes()); + + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(1)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(3)); + assertThat(properties.getString("jcr:primaryType"), is("nt:unstructured")); + assertThat(properties.getString("testProperty"), is("testValue")); + assertThat(properties.get("multiValuedProperty"), instanceOf(JSONArray.class)); + + JSONArray values = properties.getJSONArray("multiValuedProperty"); + assertThat(values, is(notNullValue())); + assertThat(values.length(), is(2)); + assertThat(values.getString(0), is("value1")); + assertThat(values.getString(1), is("value2")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_CREATED)); + connection.disconnect(); + } + + @Test + public void shouldPostNodeToValidPathWithoutPrimaryType() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/noPrimaryType"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{}"; + connection.getOutputStream().write(payload.getBytes()); + + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(1)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(1)); + assertThat(properties.getString("jcr:primaryType"), is("nt:base")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_CREATED)); + connection.disconnect(); + } + + @Test + public void shouldPostNodeToValidPathWithMixinTypes() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/withMixinType"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:mixinTypes\": \"mix:referenceable\"}}"; + connection.getOutputStream().write(payload.getBytes()); + + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(1)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(3)); + assertThat(properties.getString("jcr:primaryType"), is("nt:base")); + assertThat(properties.getString("jcr:uuid"), is(notNullValue())); + + JSONArray values = properties.getJSONArray("jcr:mixinTypes"); + assertThat(values, is(notNullValue())); + assertThat(values.length(), is(1)); + assertThat(values.getString(0), is("mix:referenceable")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_CREATED)); + connection.disconnect(); + + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/withMixinType"); + connection = (HttpURLConnection)postUrl.openConnection(); + + // Make sure that we can retrieve the node with a GET + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + body = new JSONObject(getResponseFor(connection)); + + assertThat(body.length(), is(1)); + + properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(3)); + assertThat(properties.getString("jcr:primaryType"), is("nt:base")); + assertThat(properties.getString("jcr:uuid"), is(notNullValue())); + + values = properties.getJSONArray("jcr:mixinTypes"); + assertThat(values, is(notNullValue())); + assertThat(values.length(), is(1)); + assertThat(values.getString(0), is("mix:referenceable")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + + } + + @Test + public void shouldNotPostNodeAtInvalidParentPath() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/foo/bar"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + + } + + @Test + public void shouldNotPostNodeWithInvalidPrimaryType() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/invalidPrimaryType"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:primaryType\": \"invalidType\", \"testProperty\": \"testValue\", \"multiValuedProperty\": [\"value1\", \"value2\"]}}"; + connection.getOutputStream().write(payload.getBytes()); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_BAD_REQUEST)); + connection.disconnect(); + + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/invalidPrimaryType"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + + } + + @Test + public void shouldPostNodeHierarchy() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nestedPost"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:primaryType\": \"nt:unstructured\", \"testProperty\": \"testValue\", \"multiValuedProperty\": [\"value1\", \"value2\"]}," + + " \"children\": { \"childNode\" : { \"properties\": {\"nestedProperty\": \"nestedValue\"}}}}"; + + connection.getOutputStream().write(payload.getBytes()); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_CREATED)); + connection.disconnect(); + + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nestedPost?dna:depth=1"); + connection = (HttpURLConnection)postUrl.openConnection(); + + // Make sure that we can retrieve the node with a GET + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + JSONObject body = new JSONObject(getResponseFor(connection)); + + assertThat(body.length(), is(2)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(3)); + assertThat(properties.getString("jcr:primaryType"), is("nt:unstructured")); + assertThat(properties.getString("testProperty"), is("testValue")); + assertThat(properties.get("multiValuedProperty"), instanceOf(JSONArray.class)); + + JSONArray values = properties.getJSONArray("multiValuedProperty"); + assertThat(values, is(notNullValue())); + assertThat(values.length(), is(2)); + assertThat(values.getString(0), is("value1")); + assertThat(values.getString(1), is("value2")); + + JSONObject children = body.getJSONObject("children"); + assertThat(children, is(notNullValue())); + assertThat(children.length(), is(1)); + + JSONObject child = children.getJSONObject("childNode"); + assertThat(child, is(notNullValue())); + assertThat(child.length(), is(1)); + + properties = child.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(2)); + // Parent primary type is nt:unstructured, so this should default to nt:unstructured primary type + assertThat(properties.getString("jcr:primaryType"), is("nt:unstructured")); + assertThat(properties.getString("nestedProperty"), is("nestedValue")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + + } + + @Test + public void shouldFailWholeTransactionIfOneNodeIsBad() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/invalidNestedPost"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:primaryType\": \"nt:unstructured\", \"testProperty\": \"testValue\", \"multiValuedProperty\": [\"value1\", \"value2\"]}," + + " \"children\": { \"childNode\" : { \"properties\": {\"jcr:primaryType\": \"invalidType\"}}}}"; + connection.getOutputStream().write(payload.getBytes()); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_BAD_REQUEST)); + connection.disconnect(); + + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/invalidNestedPost?dna:depth=1"); + connection = (HttpURLConnection)postUrl.openConnection(); + + // Make sure that we can retrieve the node with a GET + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + + } + + @Test + public void shouldNotDeleteNonExistentItem() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/invalidItemForDelete"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("DELETE"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + } + + @Test + public void shouldDeleteExtantNode() throws Exception { + + // Create the node + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeForDeletion"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:primaryType\": \"nt:unstructured\", \"testProperty\": \"testValue\", \"multiValuedProperty\": [\"value1\", \"value2\"]}}"; + connection.getOutputStream().write(payload.getBytes()); + + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(1)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(3)); + assertThat(properties.getString("jcr:primaryType"), is("nt:unstructured")); + assertThat(properties.getString("testProperty"), is("testValue")); + assertThat(properties.get("multiValuedProperty"), instanceOf(JSONArray.class)); + + JSONArray values = properties.getJSONArray("multiValuedProperty"); + assertThat(values, is(notNullValue())); + assertThat(values.length(), is(2)); + assertThat(values.getString(0), is("value1")); + assertThat(values.getString(1), is("value2")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_CREATED)); + connection.disconnect(); + + // Confirm that it exists + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeForDeletion"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + + // Delete the node + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeForDeletion"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("DELETE"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NO_CONTENT)); + connection.disconnect(); + + // Confirm that it no longer exists + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeForDeletion"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + } + + @Test + public void shouldDeleteExtantProperty() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/propertyForDeletion"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:primaryType\": \"nt:unstructured\", \"testProperty\": \"testValue\", \"multiValuedProperty\": [\"value1\", \"value2\"]}}"; + connection.getOutputStream().write(payload.getBytes()); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_CREATED)); + connection.disconnect(); + + // Confirm that it exists + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/propertyForDeletion"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(1)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(3)); + assertThat(properties.getString("jcr:primaryType"), is("nt:unstructured")); + assertThat(properties.getString("testProperty"), is("testValue")); + assertThat(properties.get("multiValuedProperty"), instanceOf(JSONArray.class)); + + JSONArray values = properties.getJSONArray("multiValuedProperty"); + assertThat(values, is(notNullValue())); + assertThat(values.length(), is(2)); + assertThat(values.getString(0), is("value1")); + assertThat(values.getString(1), is("value2")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + + // Delete the property + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/propertyForDeletion/multiValuedProperty"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("DELETE"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NO_CONTENT)); + connection.disconnect(); + + // Confirm that it no longer exists + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/propertyForDeletion"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(1)); + + properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(2)); + assertThat(properties.getString("jcr:primaryType"), is("nt:unstructured")); + assertThat(properties.getString("testProperty"), is("testValue")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + + } + + @Test + public void shouldNotBeAbleToPutAtInvalidPath() throws Exception { + + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nonexistantNode"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("PUT"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"firstProperty\": \"someValue\" }"; + connection.getOutputStream().write(payload.getBytes()); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_NOT_FOUND)); + connection.disconnect(); + } + + @Test + public void shouldBeAbleToPutValueToProperty() throws Exception { + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeForPutProperty"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:primaryType\": \"nt:unstructured\", \"testProperty\": \"testValue\" }}"; + connection.getOutputStream().write(payload.getBytes()); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_CREATED)); + connection.disconnect(); + + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeForPutProperty/testProperty"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("PUT"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + payload = "\"someOtherValue\""; + connection.getOutputStream().write(payload.getBytes()); + + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(1)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(2)); + assertThat(properties.getString("jcr:primaryType"), is("nt:unstructured")); + assertThat(properties.getString("testProperty"), is("someOtherValue")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + + } + + @Test + public void shouldNotBeAbleToPutPropertiesToNode() throws Exception { + + URL postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeForPutProperties"); + HttpURLConnection connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + String payload = "{ \"properties\": {\"jcr:primaryType\": \"nt:unstructured\" }}"; + connection.getOutputStream().write(payload.getBytes()); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_CREATED)); + connection.disconnect(); + + postUrl = new URL(SERVER_URL + "/JCR%20Repository/%3cdefault%3e/items/nodeForPutProperties"); + connection = (HttpURLConnection)postUrl.openConnection(); + + connection.setDoOutput(true); + connection.setRequestMethod("PUT"); + connection.setRequestProperty("Content-Type", MediaType.APPLICATION_JSON); + + payload = "{\"testProperty\": \"testValue\", \"multiValuedProperty\": [\"value1\", \"value2\"]}"; + connection.getOutputStream().write(payload.getBytes()); + + JSONObject body = new JSONObject(getResponseFor(connection)); + assertThat(body.length(), is(1)); + + JSONObject properties = body.getJSONObject("properties"); + assertThat(properties, is(notNullValue())); + assertThat(properties.length(), is(3)); + assertThat(properties.getString("jcr:primaryType"), is("nt:unstructured")); + assertThat(properties.getString("testProperty"), is("testValue")); + assertThat(properties.get("multiValuedProperty"), instanceOf(JSONArray.class)); + + JSONArray values = properties.getJSONArray("multiValuedProperty"); + assertThat(values, is(notNullValue())); + assertThat(values.length(), is(2)); + assertThat(values.getString(0), is("value1")); + assertThat(values.getString(1), is("value2")); + + assertThat(connection.getResponseCode(), is(HttpURLConnection.HTTP_OK)); + connection.disconnect(); + + } +} Property changes on: trunk/extensions/dna-web-jcr-rest-war/src/test/java/org/jboss/dna/web/jcr/JcrResourcesTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/extensions/dna-web-jcr-rest-war/src/test/resources/dna-test-users.props =================================================================== --- trunk/extensions/dna-web-jcr-rest-war/src/test/resources/dna-test-users.props (rev 0) +++ trunk/extensions/dna-web-jcr-rest-war/src/test/resources/dna-test-users.props 2009-05-28 13:28:05 UTC (rev 944) @@ -0,0 +1 @@ +dnauser=password,readwrite Added: trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-dna.policy =================================================================== --- trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-dna.policy (rev 0) +++ trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-dna.policy 2009-05-28 13:28:05 UTC (rev 944) @@ -0,0 +1,5 @@ +dna-jcr { + org.mortbay.jetty.plus.jaas.spi.PropertyFileLoginModule optional + debug="true" + file="target/test-classes/dna-test-users.props"; +}; Added: trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-jaas.xml =================================================================== --- trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-jaas.xml (rev 0) +++ trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-jaas.xml 2009-05-28 13:28:05 UTC (rev 944) @@ -0,0 +1,9 @@ +<Call name="addUserRealm"> + <Arg> + <New class="org.mortbay.jetty.plus.jaas.JAASUserRealm"> + <Set name="name">xyzrealm</Set> + <Set name="LoginModuleName">dna-jcr</Set> + </New> + </Arg> +</Call> + Property changes on: trunk/extensions/dna-web-jcr-rest-war/src/test/resources/jetty-jaas.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/extensions/dna-web-jcr-rest-war/src/test/resources/log4j.properties =================================================================== --- trunk/extensions/dna-web-jcr-rest-war/src/test/resources/log4j.properties (rev 0) +++ trunk/extensions/dna-web-jcr-rest-war/src/test/resources/log4j.properties 2009-05-28 13:28:05 UTC (rev 944) @@ -0,0 +1,13 @@ +log4j.rootLogger = DEBUG, stdout + +log4j.category.org.apache=INFO +log4j.category.org.jboss.resteasy=INFO +log4j.category.org.mortbay=DEBUG +log4j.category.org.slf4j.impl.JCLLoggerAdapter=INFO +log4j.category.org.springframework=INFO + +log4j.appender.stdout = org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Threshold = DEBUG +log4j.appender.stdout.Target = System.out +log4j.appender.stdout.layout = org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern = [%-5p] [%C{1}] : %m%n