You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by el...@apache.org on 2009/07/02 13:14:49 UTC

svn commit: r790550 [2/3] - in /incubator/wink/trunk: wink-component-test-support/src/main/java/org/apache/wink/server/ wink-component-test-support/src/main/java/org/apache/wink/server/internal/ wink-component-test-support/src/main/java/org/apache/wink...

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AppCategoriesDocumentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AppCategoriesDocumentProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AppCategoriesDocumentProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AppCategoriesDocumentProviderTest.java Thu Jul  2 11:14:47 2009
@@ -30,9 +30,9 @@
 import org.apache.wink.common.model.app.AppCategories;
 import org.apache.wink.common.model.app.AppYesNo;
 import org.apache.wink.common.model.atom.AtomCategory;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.diff.DiffIgnoreUpdateWithAttributeQualifier;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AssetProviderTest.java Thu Jul  2 11:14:47 2009
@@ -42,8 +42,8 @@
 import org.apache.wink.common.annotations.Asset;
 import org.apache.wink.common.model.json.JSONException;
 import org.apache.wink.common.model.json.JSONObject;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomEntryProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomEntryProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomEntryProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomEntryProviderTest.java Thu Jul  2 11:14:47 2009
@@ -37,8 +37,8 @@
 
 import org.apache.wink.common.model.atom.AtomEntry;
 import org.apache.wink.common.model.synd.SyndEntry;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomFeedProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomFeedProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomFeedProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/AtomFeedProviderTest.java Thu Jul  2 11:14:47 2009
@@ -37,8 +37,8 @@
 
 import org.apache.wink.common.model.atom.AtomFeed;
 import org.apache.wink.common.model.synd.SyndFeed;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/CategoriesDocumentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/CategoriesDocumentProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/CategoriesDocumentProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/CategoriesDocumentProviderTest.java Thu Jul  2 11:14:47 2009
@@ -29,9 +29,9 @@
 import org.apache.wink.common.categories.Categories;
 import org.apache.wink.common.internal.utils.MediaTypeUtils;
 import org.apache.wink.common.model.atom.AtomCategory;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.diff.DiffIgnoreUpdateWithAttributeQualifier;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/EntityLocatorProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/EntityLocatorProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/EntityLocatorProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/EntityLocatorProviderTest.java Thu Jul  2 11:14:47 2009
@@ -35,8 +35,8 @@
 import org.apache.wink.common.model.atom.AtomText;
 import org.apache.wink.common.model.atom.AtomTextType;
 import org.apache.wink.common.model.atom.ObjectFactory;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/FormMultivaluedMapProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/FormMultivaluedMapProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/FormMultivaluedMapProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/FormMultivaluedMapProviderTest.java Thu Jul  2 11:14:47 2009
@@ -35,8 +35,8 @@
 
 import org.apache.wink.common.internal.MultivaluedMapImpl;
 import org.apache.wink.common.internal.providers.entity.FormMultivaluedMapProvider;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBElementProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBElementProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBElementProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBElementProviderTest.java Thu Jul  2 11:14:47 2009
@@ -45,8 +45,8 @@
 import org.apache.wink.common.internal.providers.entity.xml.JAXBXmlProvider;
 import org.apache.wink.common.model.atom.AtomFeed;
 import org.apache.wink.common.model.atom.ObjectFactory;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JsonProviderTest.java Thu Jul  2 11:14:47 2009
@@ -43,8 +43,8 @@
 import org.apache.wink.common.model.synd.SyndEntry;
 import org.apache.wink.common.model.synd.SyndFeed;
 import org.apache.wink.common.model.synd.SyndText;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/MultiTableCsvDescriptorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/MultiTableCsvDescriptorTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/MultiTableCsvDescriptorTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/MultiTableCsvDescriptorTest.java Thu Jul  2 11:14:47 2009
@@ -32,8 +32,8 @@
 
 import org.apache.wink.common.model.csv.CsvTable;
 import org.apache.wink.common.model.csv.MultiCsvTable;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SourceProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SourceProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SourceProviderTest.java Thu Jul  2 11:14:47 2009
@@ -42,8 +42,8 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.wink.common.internal.providers.entity.SourceProvider;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.xml.sax.InputSource;

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/StreamingOutputProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/StreamingOutputProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/StreamingOutputProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/StreamingOutputProviderTest.java Thu Jul  2 11:14:47 2009
@@ -29,8 +29,8 @@
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.StreamingOutput;
 
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndEntryLocatorProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndEntryLocatorProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndEntryLocatorProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndEntryLocatorProviderTest.java Thu Jul  2 11:14:47 2009
@@ -30,8 +30,8 @@
 import org.apache.wink.common.annotations.Asset;
 import org.apache.wink.common.model.synd.SyndEntry;
 import org.apache.wink.common.model.synd.SyndText;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndFeedLocatorProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndFeedLocatorProviderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndFeedLocatorProviderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/SyndFeedLocatorProviderTest.java Thu Jul  2 11:14:47 2009
@@ -30,8 +30,8 @@
 import org.apache.wink.common.annotations.Asset;
 import org.apache.wink.common.model.synd.SyndFeed;
 import org.apache.wink.common.model.synd.SyndText;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Added: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/UserProvidersOverBuiltinProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/UserProvidersOverBuiltinProviderTest.java?rev=790550&view=auto
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/UserProvidersOverBuiltinProviderTest.java (added)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/UserProvidersOverBuiltinProviderTest.java Thu Jul  2 11:14:47 2009
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *  
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ *  
+ *******************************************************************************/
+package org.apache.wink.server.internal.providers.entity;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
+
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
+import org.apache.wink.test.mock.MockRequestConstructor;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * User providers should always be chosen over regular providers.
+ */
+public class UserProvidersOverBuiltinProviderTest extends MockServletInvocationTest {
+
+    private static final String PROVIDER_STR = "read with myprovider";
+
+    @Override
+    protected Class<?>[] getClasses() {
+        return new Class[] {SimpleResource.class};
+    }
+
+    @Override
+    protected Object[] getSingletons() {
+        return new Object[] {new StringReaderProvider()};
+    }
+
+    @Path("/")
+    public static class SimpleResource {
+
+        @GET
+        public String getSomething(String o) {
+            return o.toString();
+        }
+    }
+
+    @Provider
+//    @Consumes("abcd/xyz")
+    public static class StringReaderProvider implements MessageBodyReader<Object> {
+
+        public boolean isReadable(Class<?> type,
+                                  Type genericType,
+                                  Annotation[] annotations,
+                                  MediaType mediaType) {
+            return true;
+        }
+
+        public Object readFrom(Class<Object> type,
+                               Type genericType,
+                               Annotation[] annotations,
+                               MediaType mediaType,
+                               MultivaluedMap<String, String> httpHeaders,
+                               InputStream entityStream) throws IOException,
+            WebApplicationException {
+            return PROVIDER_STR;
+        }
+    }
+
+    public void testUserProviderOverBuiltIn() throws Exception {
+        MockHttpServletRequest mockRequest =
+            MockRequestConstructor.constructMockRequest("GET", "/", "*/*", "abcd/xyz", "hello"
+                .getBytes());
+
+        MockHttpServletResponse response = invoke(mockRequest);
+        String content = response.getContentAsString();
+        assertEquals(PROVIDER_STR, content);
+    }
+}

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockServletInvocationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockServletInvocationTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockServletInvocationTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockServletInvocationTest.java Thu Jul  2 11:14:47 2009
@@ -17,25 +17,18 @@
  *  under the License.
  *  
  *******************************************************************************/
- 
-package org.apache.wink.server.internal.providers.entity.html;
-
-import java.util.HashSet;
-import java.util.Set;
 
-import javax.ws.rs.core.Application;
+package org.apache.wink.server.internal.providers.entity.html;
 
-import org.apache.wink.common.SymphonyApplication;
 import org.apache.wink.server.internal.providers.entity.html.HtmlRepresentationCollectionCustomizedTest.DefectsCustomizedResource;
 import org.apache.wink.server.internal.providers.entity.html.HtmlRepresentationCollectionDefaultTest.DefectsDefaultResource;
 import org.apache.wink.server.internal.providers.entity.html.HtmlRepresentationEntryCustomizedTest.DefectCustomizedResource;
 import org.apache.wink.server.internal.providers.entity.html.HtmlRepresentationEntryDefaultTest.DefectDefaultResource;
 import org.apache.wink.server.internal.providers.entity.html.HtmlRepresentationServiceDocumentTest.ExistHtmlResource;
 import org.apache.wink.server.internal.providers.entity.html.HtmlRepresentationServiceDocumentTest.NoHtmlResource;
-import org.apache.wink.test.mock.MockServletInvocationTest;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 
-
 /**
  * This class defines the data that will be used to test the HTML representation
  * for collection and entry resources.
@@ -46,21 +39,10 @@
     protected static final String CUSTOMIZED_COLLECTION_URL = "/HtmlCustRepresentation/customizedHtmlCollection.jsp";
     protected static final String GET                       = "GET";
 
-    @Override
-    protected Application getApplication() {
-        return new SymphonyApplication() {
-            @Override
-            public Set<Object> getInstances() {
-                Set<Object> set = new HashSet<Object>();
-                set.add(new DefectsCustomizedResource());
-                set.add(new DefectsDefaultResource());
-                set.add(new DefectCustomizedResource());
-                set.add(new DefectDefaultResource());
-                set.add(new ExistHtmlResource());
-                set.add(new NoHtmlResource());
-                return set;
-            }
-        };
+    protected Class<?>[] getClasses() {
+        return new Class<?>[] { DefectsCustomizedResource.class, DefectsDefaultResource.class,
+            DefectCustomizedResource.class, DefectDefaultResource.class, ExistHtmlResource.class,
+            NoHtmlResource.class };
     }
 
     /**

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationCollectionCustomizedTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationCollectionCustomizedTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationCollectionCustomizedTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationCollectionCustomizedTest.java Thu Jul  2 11:14:47 2009
@@ -32,8 +32,7 @@
 
 import org.apache.wink.common.RestException;
 import org.apache.wink.common.model.synd.SyndFeed;
-import org.apache.wink.server.internal.RequestProcessor;
-import org.apache.wink.server.internal.providers.entity.html.HtmlDescriptor;
+import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 
@@ -57,6 +56,11 @@
         }
     } // class DefectsCustomizedResource
 
+    @Override
+    protected Class<?>[] getClasses() {
+        return new Class<?>[] {DefectsCustomizedResource.class};
+    }
+    
     /**
      * The method invokes the Resource and check the response.
      * 
@@ -64,10 +68,9 @@
      */
     public void testGetCollectionHtmlCust() throws Exception {
         try {
-            MockHttpServletResponse response = new MockHttpServletResponse();
-            RequestProcessor requestProcessor = getRequestProcessor(RequestProcessor.class);
-            requestProcessor.handleRequest(constructMockRequest("GET", "/defectsCustomized",
-                MediaType.TEXT_HTML), response);
+            MockHttpServletRequest request = constructMockRequest("GET", "/defectsCustomized",
+                MediaType.TEXT_HTML);
+            MockHttpServletResponse response = invoke(request);
             assertEquals("HTTP status", 200, response.getStatus());
             String content = response.getContentAsString();
             assertEquals("body", CUSTOMIZED_COLLECTION_URL, content);

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationCollectionDefaultTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationCollectionDefaultTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationCollectionDefaultTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationCollectionDefaultTest.java Thu Jul  2 11:14:47 2009
@@ -17,7 +17,7 @@
  *  under the License.
  *  
  *******************************************************************************/
- 
+
 package org.apache.wink.server.internal.providers.entity.html;
 
 import java.io.IOException;
@@ -37,21 +37,16 @@
 import org.apache.wink.common.model.synd.SyndLink;
 import org.apache.wink.common.model.synd.SyndPerson;
 import org.apache.wink.common.model.synd.SyndText;
-import org.apache.wink.server.internal.RequestProcessor;
-import org.apache.wink.server.internal.providers.entity.html.HtmlConstants;
-import org.apache.wink.server.internal.providers.entity.html.HtmlDescriptor;
-import org.apache.wink.server.internal.providers.entity.html.HtmlSyndFeedAdapter;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-
 /**
  * Test default Html Representation for collection resource.
  */
 public class HtmlRepresentationCollectionDefaultTest extends HtmlMockServletInvocationTest {
 
-    private static Date                    CURRENT_DATE        = new Date();
-    private static SimpleDateFormat simpleDateFormat    = new SimpleDateFormat("dd/MM/yyyy"); //$NON-NLS-1$
+    private static Date             CURRENT_DATE        = new Date();
+    private static SimpleDateFormat simpleDateFormat    = new SimpleDateFormat("dd/MM/yyyy");       //$NON-NLS-1$
     private static final String     COL_ID              = "10";
     private static final String     COL_TITLE           = "Collection";
     private static final String     COL_OWNER           = "Tali Col";
@@ -81,10 +76,8 @@
      */
     @Test
     public void testGetCollectionHtmlDefault() throws Exception {
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        RequestProcessor requestProcessor = getRequestProcessor(RequestProcessor.class);
-        requestProcessor.handleRequest(constructMockRequest("GET", "/defectsDefault",
-            MediaType.TEXT_HTML), response);
+        MockHttpServletResponse response = invoke(constructMockRequest("GET", "/defectsDefault",
+            MediaType.TEXT_HTML));
         assertEquals("HTTP status", 200, response.getStatus());
         String content = response.getContentAsString();
         assertEquals("body", HtmlConstants.DEFAULT_JSP_COLLECTION_PATH, content);
@@ -141,15 +134,5 @@
         return feed;
     }
 
-//    /**
-//     * The method creates DocumentMetadata with dummy data.
-//     * 
-//     * @return DocumentMetadata
-//     */
-//    public DocumentMetadata getEntryMetadata() {
-//        DocumentMetadata metadata = new DocumentMetadata();
-//        metadata.setName(ENTRY_NAME);
-//        return metadata;
-//
-//    }
+
 }

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationEntryCustomizedTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationEntryCustomizedTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationEntryCustomizedTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationEntryCustomizedTest.java Thu Jul  2 11:14:47 2009
@@ -17,7 +17,7 @@
  *  under the License.
  *  
  *******************************************************************************/
- 
+
 package org.apache.wink.server.internal.providers.entity.html;
 
 import java.io.IOException;
@@ -31,11 +31,8 @@
 import javax.ws.rs.core.MediaType;
 
 import org.apache.wink.common.model.synd.SyndEntry;
-import org.apache.wink.server.internal.RequestProcessor;
-import org.apache.wink.server.internal.providers.entity.html.HtmlDescriptor;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-
 /**
  * Test customized Html Representation for entry resource.
  */
@@ -59,10 +56,8 @@
      * @throws IOException
      */
     public void testGetEntryHtmlCust() throws Exception {
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        RequestProcessor requestProcessor = getRequestProcessor(RequestProcessor.class);
-        requestProcessor.handleRequest(constructMockRequest("GET", "/defectsCustomized/htmlDefect",
-            MediaType.TEXT_HTML), response);
+        MockHttpServletResponse response = invoke(constructMockRequest("GET",
+            "/defectsCustomized/htmlDefect", MediaType.TEXT_HTML));
         assertEquals("HTTP status", 200, response.getStatus());
         String content = response.getContentAsString();
         assertEquals("body", CUSTOMIZED_ENTRY_URL, content);

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationEntryDefaultTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationEntryDefaultTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationEntryDefaultTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationEntryDefaultTest.java Thu Jul  2 11:14:47 2009
@@ -17,7 +17,7 @@
  *  under the License.
  *  
  *******************************************************************************/
- 
+
 package org.apache.wink.server.internal.providers.entity.html;
 
 import java.io.IOException;
@@ -38,25 +38,19 @@
 import org.apache.wink.common.model.synd.SyndLink;
 import org.apache.wink.common.model.synd.SyndPerson;
 import org.apache.wink.common.model.synd.SyndText;
-import org.apache.wink.server.internal.RequestProcessor;
-import org.apache.wink.server.internal.providers.entity.html.ExpandableSectionHelper;
-import org.apache.wink.server.internal.providers.entity.html.HtmlConstants;
-import org.apache.wink.server.internal.providers.entity.html.HtmlDescriptor;
-import org.apache.wink.server.internal.providers.entity.html.HtmlSyndEntryAdapter;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-
 /**
  * Test default Html Representation for entry resource.
  */
 public class HtmlRepresentationEntryDefaultTest extends HtmlMockServletInvocationTest {
 
-    private static Date                    CURRENT_DATE          = new Date();
+    private static Date             CURRENT_DATE          = new Date();
     private static String           ID                    = "1";
     private static String           TITLE                 = "Entry 1";
     private static String           OWNER                 = "Tali";
     private static String           SUMMARY               = "summary for Entry 1";
-    private static SimpleDateFormat simpleDateFormat      = new SimpleDateFormat("dd/MM/yyyy");                                                    //$NON-NLS-1$
+    private static SimpleDateFormat simpleDateFormat      = new SimpleDateFormat("dd/MM/yyyy");                                                                            //$NON-NLS-1$
     private static final String     CATEGORY_SCHEME       = "urn:com:hp:categories:scheme";
     private static final String     CATEGORY_TERM         = "high";
     private static final String     LINK_REL              = "urn:com:hp:links:rel";
@@ -107,10 +101,8 @@
      * @throws IOException
      */
     public void testGetEntryHtmlDefault() throws Exception {
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        RequestProcessor requestProcessor = getRequestProcessor(RequestProcessor.class);
-        requestProcessor.handleRequest(constructMockRequest("GET", "/defectsDefault/htmlDefect",
-            MediaType.TEXT_HTML), response);
+        MockHttpServletResponse response = invoke(constructMockRequest("GET",
+            "/defectsDefault/htmlDefect", MediaType.TEXT_HTML));
         assertEquals("HTTP status", 200, response.getStatus());
         String content = response.getContentAsString();
         assertEquals("body", HtmlConstants.DEFAULT_JSP_ENTRY_PATH, content);

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationServiceDocumentTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationServiceDocumentTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationServiceDocumentTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlRepresentationServiceDocumentTest.java Thu Jul  2 11:14:47 2009
@@ -17,7 +17,7 @@
  *  under the License.
  *  
  *******************************************************************************/
- 
+
 package org.apache.wink.server.internal.providers.entity.html;
 
 import java.io.IOException;
@@ -30,11 +30,9 @@
 import org.apache.wink.common.RestException;
 import org.apache.wink.common.annotations.Workspace;
 import org.apache.wink.common.internal.uri.UriEncoder;
-import org.apache.wink.server.internal.RequestProcessor;
 import org.apache.wink.test.mock.MockRequestConstructor;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-
 /**
  * Test Service Document in Html Representation.
  */
@@ -73,8 +71,8 @@
     } // class NoHtmlResource
 
     /**
-     * The method invokes the Resource for Service Document in HTML and checks the
-     * response.
+     * The method invokes the Resource for Service Document in HTML and checks
+     * the response.
      * 
      * @param relPath
      *            The path to invoke
@@ -82,10 +80,8 @@
      */
     public void executeTestServiceDocumentHtml(String relPath) throws Exception {
         try {
-            MockHttpServletResponse response = new MockHttpServletResponse();
-            RequestProcessor requestProcessor = getRequestProcessor(RequestProcessor.class);
-            requestProcessor.handleRequest(MockRequestConstructor.constructMockRequest("GET",
-                relPath, MediaType.TEXT_HTML), response);
+            MockHttpServletResponse response = invoke(MockRequestConstructor.constructMockRequest(
+                "GET", relPath, MediaType.TEXT_HTML));
             assertEquals("HTTP status", 200, response.getStatus());
             // check that the content contains at least one link with HTML
             String content = response.getContentAsString();
@@ -93,7 +89,8 @@
                 content.indexOf(UriEncoder.encodeString(MediaType.TEXT_HTML)) > 0);
 
         } catch (RestException e) {
-            assertEquals("exception message","The file requested cannot be retrieved.", e.getMessage()); //$NON-NLS-1$
+            assertEquals(
+                "exception message", "The file requested cannot be retrieved.", e.getMessage()); //$NON-NLS-1$
         }
     }
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest.java Thu Jul  2 11:14:47 2009
@@ -21,11 +21,9 @@
 
 package org.apache.wink.server.internal.registry;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Properties;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -40,20 +38,18 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.wink.common.http.HttpStatus;
-import org.apache.wink.server.internal.handlers.FindRootResourceHandler;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 
 public class FindResourceMethodTest extends MockServletInvocationTest {
     
-    private static List<Class<?>> allResources = new LinkedList<Class<?>>();
-    private static List<Class<?>> resourceClasses = new LinkedList<Class<?>>();
-    private static Properties properties = new Properties();
+    static List<Class<?>> resourceClasses = new LinkedList<Class<?>>();
     
     static {
+        List<Class<?>> allResources = new LinkedList<Class<?>>();
         for (Class<?> cls : FindResourceMethodTest.class.getClasses()) {
             if (cls.getSimpleName().startsWith("Resource")) {
                 allResources.add(cls);
@@ -67,10 +63,6 @@
         return resourceClasses.toArray(new Class<?>[resourceClasses.size()]);
     }
     
-    @Override
-    protected Properties getProperties() throws IOException {
-        return properties;
-    }
 
     // /// -- Resources --
 
@@ -749,97 +741,9 @@
         assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
     }
     
-    public void testContinuedSearchSetup() {
-        // set up the environment for the continued search test thats that are coming next
-        resourceClasses.clear();
-        resourceClasses.add(ContinuedSearchResource.class);
-        resourceClasses.add(ResourceSimpleGet.class);
-        resourceClasses.add(ResourceWithSubResourceMethodSimpleGet.class);
-        resourceClasses.add(ContinuedSearchResourceLocatorBad.class);
-        properties.setProperty(FindRootResourceHandler.SEARCH_POLICY_CONTINUED_SEARCH_KEY, "false");
-    }
-    
-    public void testContinuedSearch_1_1() throws Exception {
-        MockHttpServletRequest request = null;
-        MockHttpServletResponse response = null;
-        
-        // 1. test resource method
-        // 1.1. negative test - make sure that ContinuedSearchResource is not reachable when continued search policy is off
-        request = MockRequestConstructor.constructMockRequest("PUT", "/simpleGet", "text/plain", "text/plain", null);        
-        response = invoke(request);
-        assertEquals(405, response.getStatus());
-        
-        // set the continuedSearch flag for the continued search test that is coming next
-        properties.setProperty(FindRootResourceHandler.SEARCH_POLICY_CONTINUED_SEARCH_KEY, "true");
-    }
-    
-    public void testContinuedSearch_1_2() throws Exception {
-        MockHttpServletRequest request = null;
-        MockHttpServletResponse response = null;
-
-        // 1.2. make sure that ContinuedSearchResource is reachable when continued search policy is activated 
-        request = MockRequestConstructor.constructMockRequest("PUT", "/simpleGet", "text/plain", "text/plain", null);        
-        response = invoke(request);
-        assertMethodFound(response, ContinuedSearchResource.class, "put");
-        
-        // set the continuedSearch flag for the continued search test that is coming next
-        properties.setProperty(FindRootResourceHandler.SEARCH_POLICY_CONTINUED_SEARCH_KEY, "false");
-    }
-    
-    public void testContinuedSearch_2_1() throws Exception {
-        MockHttpServletRequest request = null;
-        MockHttpServletResponse response = null;
-
-        // 2. test sub-resource method
-        // 2.1. negative test - make sure that ContinuedSearchResource is not reachable when continued search policy is off
-        request = MockRequestConstructor.constructMockRequest("PUT", "/subResourceMethodSimpleGet/1", "text/plain", "text/plain", null);        
-        response = invoke(request);
-        assertEquals(405, response.getStatus());
-
-        // set the continuedSearch flag for the continued search test that is coming next
-        properties.setProperty(FindRootResourceHandler.SEARCH_POLICY_CONTINUED_SEARCH_KEY, "true");
-    }
-
-    public void testContinuedSearch_2_2() throws Exception {
-        MockHttpServletRequest request = null;
-        MockHttpServletResponse response = null;
-        
-        // 2.2. make sure that ContinuedSearchResource is reachable when continued search policy is activated 
-        request = MockRequestConstructor.constructMockRequest("PUT", "/subResourceMethodSimpleGet/1", "text/plain", "text/plain", null);        
-        response = invoke(request);
-        assertMethodFound(response, ContinuedSearchResource.class, "subPut");
-        
-        // set the continuedSearch flag for the continued search test that is coming next
-        properties.setProperty(FindRootResourceHandler.SEARCH_POLICY_CONTINUED_SEARCH_KEY, "false");
-    }
-    
-    public void testContinuedSearch_3_1() throws Exception {
-        MockHttpServletRequest request = null;
-        MockHttpServletResponse response = null;
-        
-        // 3. test sub-resource locator
-        // 3.1. negative test - make sure that ContinuedSearchResource is not reachable when continued search policy is off
-        request = MockRequestConstructor.constructMockRequest("PUT", "/continuedSearchResourceLocatorBad/1/2", "text/plain", "text/plain", null);        
-        response = invoke(request);
-        assertEquals(405, response.getStatus());
-        
-        // set the continuedSearch flag for the continued search test that is coming next
-        properties.setProperty(FindRootResourceHandler.SEARCH_POLICY_CONTINUED_SEARCH_KEY, "true");
-    }
-
-    public void testContinuedSearch_3_2() throws Exception {
-        MockHttpServletRequest request = null;
-        MockHttpServletResponse response = null;
-
-        // 3.2. make sure that ContinuedSearchResource is reachable when continued search policy is activated 
-        request = MockRequestConstructor.constructMockRequest("PUT", "/continuedSearchResourceLocatorBad/1/2", "text/plain", "text/plain", null);        
-        response = invoke(request);
-        assertMethodFound(response, LocatedContinuedSearchResource.class, "subPut");
-    }
-
     // // -- Helpers --
 
-    private void assertMethodFound(MockHttpServletResponse response, Class<?> expectedResource, String expectedMethod) throws UnsupportedEncodingException {
+    static void assertMethodFound(MockHttpServletResponse response, Class<?> expectedResource, String expectedMethod) throws UnsupportedEncodingException {
         assertEquals(200, response.getStatus());
         String expected = expectedResource.getSimpleName() + "." + expectedMethod;
         assertEquals(expected, response.getContentAsString());

Added: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest1.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest1.java?rev=790550&view=auto
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest1.java (added)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest1.java Thu Jul  2 11:14:47 2009
@@ -0,0 +1,509 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *  
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ *  
+ *******************************************************************************/
+ 
+
+package org.apache.wink.server.internal.registry;
+
+import java.io.UnsupportedEncodingException;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
+import org.apache.wink.test.mock.MockRequestConstructor;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+
+public class FindResourceMethodTest1 extends MockServletInvocationTest {
+    
+    static List<Class<?>> resourceClasses = new LinkedList<Class<?>>();
+    
+    static {
+        resourceClasses = new LinkedList<Class<?>>();
+        resourceClasses.add(ContinuedSearchResource.class);
+        resourceClasses.add(ResourceSimpleGet.class);
+        resourceClasses.add(ResourceWithSubResourceMethodSimpleGet.class);
+        resourceClasses.add(ContinuedSearchResourceLocatorBad.class);      
+    }
+    
+    @Override
+    protected Class<?>[] getClasses() {
+        return resourceClasses.toArray(new Class<?>[resourceClasses.size()]);
+    }
+    
+
+    // /// -- Resources --
+
+    @Path("/{fallback}")
+    public static class ResourceFallback {
+
+        @GET
+        public String get() {
+            return "ResourceFallback.get";
+        }
+    }
+    
+    @Path("/simpleGet")
+    public static class ResourceSimpleGet {
+
+        @GET
+        public String get(@Context UriInfo uriInfo) {
+            List<Object> matchedResources = uriInfo.getMatchedResources();
+            assertNotNull(matchedResources);
+            assertEquals(1, matchedResources.size());
+            assertEquals(ResourceSimpleGet.class, matchedResources.get(0).getClass());
+            
+            List<String> matchedURIs = uriInfo.getMatchedURIs(false);
+            assertNotNull(matchedURIs);
+            assertEquals(1, matchedURIs.size());
+            assertEquals("simpleGet", matchedURIs.get(0));
+            
+            return "ResourceSimpleGet.get";
+        }
+    }
+
+    @Path("/simpleGetAndPost")
+    public static class ResourceSimpleGetAndPost {
+
+        @GET
+        public String get() {
+            return "ResourceSimpleGetAndPost.get";
+        }
+
+        @POST
+        public String post() {
+            return "ResourceSimpleGetAndPost.post";
+        }
+    }
+
+    @Path("/simplePostConsumes")
+    public static class ResourceSimplePostConsumes {
+
+        @POST
+        @Consumes({"application/xml"})
+        public String postXml() {
+            return "ResourceSimplePostConsumes.postXml";
+        }
+
+        @POST
+        @Consumes({"application/atom+xml"})
+        public String postAtom() {
+            return "ResourceSimplePostConsumes.postAtom";
+        }
+
+        @POST
+        @Consumes({"text/plain", "text/html"})
+        public String postText() {
+            return "ResourceSimplePostConsumes.postText";
+        }
+
+        @POST
+        @Consumes({"image/*"})
+        public String postImage() {
+            return "ResourceSimplePostConsumes.postImage";
+        }
+
+        @POST
+        @Consumes({"*/*"})
+        public String postAny() {
+            return "ResourceSimplePostConsumes.postAny";
+        }
+    }
+
+    @Path("/simpleGetProduces")
+    public static class ResourceSimpleGetProduces {
+
+        @GET
+        @Produces({"application/xml"})
+        public String getXml() {
+            return "ResourceSimpleGetProduces.getXml";
+        }
+
+        @GET
+        @Produces({"application/atom+xml"})
+        public String getAtom() {
+            return "ResourceSimpleGetProduces.getAtom";
+        }
+
+        @GET
+        @Produces({"text/plain", "text/html"})
+        public String getText() {
+            return "ResourceSimpleGetProduces.getText";
+        }
+
+        @GET
+        @Produces({"image/jpeg"})
+        public String getImageJpeg() {
+            return "ResourceSimpleGetProduces.getImageJpeg";
+        }
+
+        @GET
+        @Produces({"image/*"})
+        public String getImageAny() {
+            return "ResourceSimpleGetProduces.getImageAny";
+        }
+
+        @GET
+        @Produces({"*/*"})
+        public String getAny() {
+            return "ResourceSimpleGetProduces.getAny";
+        }
+    }
+
+    @Path("/simpleConsumesAndProduces")
+    public static class ResourceSimpleConsumesAndProduces {
+
+        @POST
+        @Consumes({"text/*"})
+        @Produces({"text/plain"})
+        public String postConsumesTextAny() {
+            return "ResourceSimpleConsumesAndProduces.postConsumesTextAny";
+        }
+
+        @POST
+        @Consumes({"text/plain"})
+        @Produces({"text/*"})
+        public String postProducesTextAny() {
+            return "ResourceSimpleConsumesAndProduces.postProducesTextAny";
+        }
+
+        @POST
+        @Consumes({"text/plain", "text/html"})
+        @Produces({"text/plain"})
+        public String postConsumesTextHtml() {
+            return "ResourceSimpleConsumesAndProduces.postConsumesTextHtml";
+        }
+
+        @POST
+        @Consumes({"text/plain"})
+        @Produces({"text/plain", "text/html"})
+        public String postProducesTextHtml() {
+            return "ResourceSimpleConsumesAndProduces.postProducesTextHtml";
+        }
+
+        @POST
+        @Consumes({"text/plain", "application/*", "image/*"})
+        @Produces({"application/xml", "image/jpeg"})
+        public String postConsumesManyProduceMany() {
+            return "ResourceSimpleConsumesAndProduces.postConsumesManyProduceMany";
+        }
+    }
+
+    @Path("/subResourceMethodSimpleGet")
+    public static class ResourceWithSubResourceMethodSimpleGet {
+        private boolean located = false;
+        public ResourceWithSubResourceMethodSimpleGet(){}
+        
+        public ResourceWithSubResourceMethodSimpleGet(boolean located) {
+            this.located = located;
+        }
+
+        @GET
+        @Produces({"application/atom+xml"})
+        public String getAtom() {
+            return "ResourceSimpleGetProduces.getAtom";
+        }
+
+        @GET
+        @Path("{id}")
+        public String getAny(@Context UriInfo uriInfo) {
+            List<Object> matchedResources = uriInfo.getMatchedResources();
+            assertNotNull(matchedResources);
+            List<String> matchedURIs = uriInfo.getMatchedURIs(false);
+            assertNotNull(matchedURIs);
+            if (located) {
+                assertEquals(2, matchedResources.size());
+                assertEquals(ResourceWithSubResourceMethodSimpleGet.class, matchedResources.get(0).getClass());
+                assertEquals(ResourceWithSubResourceLocatorSimpleGet.class, matchedResources.get(1).getClass());
+                assertEquals(3, matchedURIs.size());
+                assertEquals("subResourceLocatorSimpleGet/1/2", matchedURIs.get(0));
+                assertEquals("subResourceLocatorSimpleGet/1", matchedURIs.get(1));
+                assertEquals("subResourceLocatorSimpleGet", matchedURIs.get(2));
+            } else {
+                assertEquals(1, matchedResources.size());
+                assertEquals(ResourceWithSubResourceMethodSimpleGet.class, matchedResources.get(0).getClass());
+                assertEquals(2, matchedURIs.size());
+                assertEquals("subResourceMethodSimpleGet/1", matchedURIs.get(0));
+                assertEquals("subResourceMethodSimpleGet", matchedURIs.get(1));
+            }
+            return "ResourceWithSubResourceMethodSimpleGet.getAny";
+        }
+
+        @GET
+        @Path("{id}")
+        @Produces("text/plain")
+        public String getTextPlain() {
+            return "ResourceWithSubResourceMethodSimpleGet.getTextPlain";
+        }
+
+        @GET
+        @Path("{id}")
+        @Produces("text/html")
+        public String getTextHtml() {
+            return "ResourceWithSubResourceMethodSimpleGet.getTextHtml";
+        }
+
+        @GET
+        @Path("{id}/4")
+        @Produces("text/xhtml")
+        public String getSubId4() {
+            return "ResourceWithSubResourceMethodSimpleGet.getSubId4";
+        }
+
+        @GET
+        @Path("{id}/{sub-id}")
+        @Produces("text/xhtml")
+        public String getSubIdAny() {
+            return "ResourceWithSubResourceMethodSimpleGet.getSubIdAny";
+        }
+
+        @POST
+        @Path("{id}")
+        @Consumes("text/*")
+        @Produces("text/html")
+        public String postTextAny() {
+            return "ResourceWithSubResourceMethodSimpleGet.postTextAny";
+        }
+
+        @POST
+        @Path("{id}")
+        @Consumes("image/*")
+        @Produces("text/html")
+        public String postImageAny() {
+            return "ResourceWithSubResourceMethodSimpleGet.postImageAny";
+        }
+
+    }
+
+    @Path("/subResourceLocatorSimpleGet")
+    public static class ResourceWithSubResourceLocatorSimpleGet {
+
+        @Path("{id}")
+        public ResourceWithSubResourceMethodSimpleGet getAny(@PathParam("id") String id, @Context UriInfo uriInfo) {
+            List<Object> matchedResources = uriInfo.getMatchedResources();
+            assertNotNull(matchedResources);
+            assertEquals(1, matchedResources.size());
+            assertEquals(ResourceWithSubResourceLocatorSimpleGet.class, matchedResources.get(0).getClass());
+            
+            List<String> matchedURIs = uriInfo.getMatchedURIs(false);
+            assertNotNull(matchedURIs);
+            assertEquals(2, matchedURIs.size());
+            assertEquals("subResourceLocatorSimpleGet/"+id, matchedURIs.get(0));
+            assertEquals("subResourceLocatorSimpleGet", matchedURIs.get(1));
+            
+            return new ResourceWithSubResourceMethodSimpleGet(true);
+        }
+
+        @Path("{id}/4")
+        public ResourceWithSubResourceMethodSimpleGet getSubId4(@PathParam("id") String id) {
+            assertEquals("1", id);
+            return new ResourceWithSubResourceMethodSimpleGet();
+        }
+        
+        @Path("ignore-consumes")
+        @Consumes("text/kuku")
+        public ResourceWithSubResourceMethodSimpleGet ignoreConsumes() {
+            return new ResourceWithSubResourceMethodSimpleGet();
+        }
+
+        @Path("ignore-produces")
+        @Produces("text/kuku")
+        public ResourceWithSubResourceMethodSimpleGet ignoreProduces() {
+            return new ResourceWithSubResourceMethodSimpleGet();
+        }
+        
+        // locators cannot have an entity param
+        @Path("bad-locator")
+        public void badLocator(String entity) {
+            fail("locator method should not have been invoked");
+        }
+        
+    }
+
+    @Path("/mixed/{id}")
+    public static class ResourceMixed {
+
+        // methods
+        @GET
+        @Produces("application/xml")
+        public String getXml() {
+            return "ResourceMixed.getXml";
+        }
+
+        @POST
+        @Consumes("application/xml")
+        public String postXml() {
+            return "ResourceMixed.postXml";
+        }
+
+        @POST
+        @Consumes("image/gif")
+        @Produces("image/jpeg")
+        public String postImage() {
+            return "ResourceMixed.postImage";
+        }
+
+        // sub-resource methods
+        @GET
+        @Path("{sub-id}")
+        @Produces("text/plain")
+        public String getTextPlain() {
+            return "ResourceMixed.getTextPlain";
+        }
+
+        @Path("locate")
+        public ResourceMixed locateTextPlainSpecific() {
+            return new ResourceMixed();
+        }
+
+        @POST
+        @Path("{sub-id}")
+        @Consumes("text/*")
+        @Produces("text/html")
+        public String postTextAny() {
+            return "ResourceMixed.postTextAny";
+        }
+
+        // sub-resource locators
+        @Path("{sub-id}")
+        public ResourceMixed locateTextPlain() {
+            return new ResourceMixed();
+        }
+
+        @Path("locateNull")
+        public ResourceMixed locateNull() {
+            return null;
+        }
+    }
+    
+    // == resources for continued search policy testing 
+
+    @Path("/{continued}")
+    public static class ContinuedSearchResource {
+        @PUT
+        public String put(@Context UriInfo uriInfo) {
+            MultivaluedMap<String,String> variables = uriInfo.getPathParameters();
+            assertEquals("simpleGet", variables.getFirst("continued"));
+            return "ContinuedSearchResource.put";
+        }
+        
+        @PUT
+        @Path("{subPutId}")
+        public String subPut(@Context UriInfo uriInfo) {
+            MultivaluedMap<String,String> variables = uriInfo.getPathParameters();
+            assertEquals("subResourceMethodSimpleGet", variables.getFirst("continued"));
+            assertEquals("1", variables.getFirst("subPutId"));
+            return "ContinuedSearchResource.subPut";
+        }
+        
+        @Path("{subLocatorId}")
+        public LocatedContinuedSearchResource subLocator() {
+            return new LocatedContinuedSearchResource();
+        }
+    }
+    
+    @Path("/continuedSearchResourceLocatorBad")
+    public static class ContinuedSearchResourceLocatorBad {
+        @Path("{badSubLocatorId}")
+        public ResourceWithSubResourceMethodSimpleGet subLocator() {
+            return new ResourceWithSubResourceMethodSimpleGet();
+        }
+    }
+
+    public static class LocatedContinuedSearchResource {
+        @PUT
+        @Path("{locatedSubPutId}")
+        public String subPut(@Context UriInfo uriInfo) {
+            MultivaluedMap<String,String> variables = uriInfo.getPathParameters();
+            assertEquals("continuedSearchResourceLocatorBad", variables.getFirst("continued"));
+            assertEquals("1", variables.getFirst("subLocatorId"));
+            assertEquals("2", variables.getFirst("locatedSubPutId"));
+            assertNull(variables.getFirst("badSubLocatorId"));
+            assertNull(variables.getFirst("id"));
+            return "LocatedContinuedSearchResource.subPut";
+        }        
+    }
+    
+    // /// -- Tests --
+
+
+    
+    public void testContinuedSearch_1_1() throws Exception {
+        MockHttpServletRequest request = null;
+        MockHttpServletResponse response = null;
+        
+        // 1. test resource method
+        // 1.1. negative test - make sure that ContinuedSearchResource is not reachable when continued search policy is off
+        request = MockRequestConstructor.constructMockRequest("PUT", "/simpleGet", "text/plain", "text/plain", null);        
+        response = invoke(request);
+        assertEquals(405, response.getStatus());
+        
+    }
+    
+
+    
+    public void testContinuedSearch_2_1() throws Exception {
+        MockHttpServletRequest request = null;
+        MockHttpServletResponse response = null;
+
+        // 2. test sub-resource method
+        // 2.1. negative test - make sure that ContinuedSearchResource is not reachable when continued search policy is off
+        request = MockRequestConstructor.constructMockRequest("PUT", "/subResourceMethodSimpleGet/1", "text/plain", "text/plain", null);        
+        response = invoke(request);
+        assertEquals(405, response.getStatus());
+
+    }
+
+
+    
+    public void testContinuedSearch_3_1() throws Exception {
+        MockHttpServletRequest request = null;
+        MockHttpServletResponse response = null;
+        
+        // 3. test sub-resource locator
+        // 3.1. negative test - make sure that ContinuedSearchResource is not reachable when continued search policy is off
+        request = MockRequestConstructor.constructMockRequest("PUT", "/continuedSearchResourceLocatorBad/1/2", "text/plain", "text/plain", null);        
+        response = invoke(request);
+        assertEquals(405, response.getStatus());
+        
+    }
+
+
+
+    // // -- Helpers --
+
+    static void assertMethodFound(MockHttpServletResponse response, Class<?> expectedResource, String expectedMethod) throws UnsupportedEncodingException {
+        assertEquals(200, response.getStatus());
+        String expected = expectedResource.getSimpleName() + "." + expectedMethod;
+        assertEquals(expected, response.getContentAsString());
+    }
+
+}

Added: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest2.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest2.java?rev=790550&view=auto
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest2.java (added)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/FindResourceMethodTest2.java Thu Jul  2 11:14:47 2009
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *  
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ *  
+ *******************************************************************************/
+
+package org.apache.wink.server.internal.registry;
+
+import org.apache.wink.server.internal.registry.FindResourceMethodTest.LocatedContinuedSearchResource;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
+import org.apache.wink.test.mock.MockRequestConstructor;
+import org.apache.wink.test.mock.SpringMockServletInvocationTest;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+public class FindResourceMethodTest2 extends MockServletInvocationTest {
+
+    @Override
+    protected Class<?>[] getClasses() {
+        return FindResourceMethodTest1.resourceClasses.toArray(new Class<?>[0]);
+    }
+
+   
+    @Override
+    protected String getPropertiesFile() {
+        return SpringMockServletInvocationTest.packageToPath(FindResourceMethodTest2.class.getPackage().getName())
+            + "\\FindResourceMethodTest2.properties";
+    }
+
+    public void testContinuedSearch_1_2() throws Exception {
+        MockHttpServletRequest request = null;
+        MockHttpServletResponse response = null;
+
+        // 1.2. make sure that ContinuedSearchResource is reachable when continued search policy is activated 
+        request = MockRequestConstructor.constructMockRequest("PUT", "/simpleGet", "text/plain",
+            "text/plain", null);
+        response = invoke(request);
+        FindResourceMethodTest.assertMethodFound(response,
+            FindResourceMethodTest.ContinuedSearchResource.class, "put");
+    }
+
+    public void testContinuedSearch_2_2() throws Exception {
+        MockHttpServletRequest request = null;
+        MockHttpServletResponse response = null;
+
+        // 2.2. make sure that ContinuedSearchResource is reachable when continued search policy is activated 
+        request = MockRequestConstructor.constructMockRequest("PUT",
+            "/subResourceMethodSimpleGet/1", "text/plain", "text/plain", null);
+        response = invoke(request);
+        FindResourceMethodTest.assertMethodFound(response,
+            FindResourceMethodTest.ContinuedSearchResource.class, "subPut");
+
+    }
+
+    public void testContinuedSearch_3_2() throws Exception {
+        MockHttpServletRequest request = null;
+        MockHttpServletResponse response = null;
+
+        // 3.2. make sure that ContinuedSearchResource is reachable when continued search policy is activated 
+        request = MockRequestConstructor.constructMockRequest("PUT",
+            "/continuedSearchResourceLocatorBad/1/2", "text/plain", "text/plain", null);
+        response = invoke(request);
+        FindResourceMethodTest.assertMethodFound(response, LocatedContinuedSearchResource.class,
+            "subPut");
+    }
+}

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/InjectableDataTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/InjectableDataTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/InjectableDataTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/InjectableDataTest.java Thu Jul  2 11:14:47 2009
@@ -45,8 +45,8 @@
 
 import org.apache.wink.common.internal.MultivaluedMapImpl;
 import org.apache.wink.common.internal.PathSegmentImpl;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/PrototypeResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/PrototypeResourceTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/PrototypeResourceTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/PrototypeResourceTest.java Thu Jul  2 11:14:47 2009
@@ -29,8 +29,8 @@
 
 import org.apache.wink.common.annotations.Scope;
 import org.apache.wink.common.annotations.Scope.ScopeType;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResponseDispatchTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResponseDispatchTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResponseDispatchTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResponseDispatchTest.java Thu Jul  2 11:14:47 2009
@@ -32,8 +32,8 @@
 import javax.ws.rs.core.Response;
 
 import org.apache.wink.common.model.synd.SyndEntry;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ValueConvertorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ValueConvertorTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ValueConvertorTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ValueConvertorTest.java Thu Jul  2 11:14:47 2009
@@ -36,8 +36,8 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/utils/LinksBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/utils/LinksBuilderTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/utils/LinksBuilderTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/utils/LinksBuilderTest.java Thu Jul  2 11:14:47 2009
@@ -35,12 +35,12 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.wink.common.model.synd.SyndLink;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.server.utils.LinkBuilders;
 import org.apache.wink.server.utils.SingleLinkBuilder;
 import org.apache.wink.server.utils.SystemLinksBuilder;
 import org.apache.wink.server.utils.SystemLinksBuilder.LinkType;
 import org.apache.wink.test.mock.MockRequestConstructor;
-import org.apache.wink.test.mock.MockServletInvocationTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 

Added: incubator/wink/trunk/wink-server/src/test/resources/org/apache/wink/server/internal/registry/FindResourceMethodTest2.properties
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/resources/org/apache/wink/server/internal/registry/FindResourceMethodTest2.properties?rev=790550&view=auto
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/resources/org/apache/wink/server/internal/registry/FindResourceMethodTest2.properties (added)
+++ incubator/wink/trunk/wink-server/src/test/resources/org/apache/wink/server/internal/registry/FindResourceMethodTest2.properties Thu Jul  2 11:14:47 2009
@@ -0,0 +1 @@
+wink.searchPolicyContinuedSearch=true
\ No newline at end of file

Modified: incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/model/AbstractWebDAVModelTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/model/AbstractWebDAVModelTest.java?rev=790550&r1=790549&r2=790550&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/model/AbstractWebDAVModelTest.java (original)
+++ incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/model/AbstractWebDAVModelTest.java Thu Jul  2 11:14:47 2009
@@ -23,7 +23,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import org.apache.wink.test.mock.MockServletInvocationTest;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 
 
 public abstract class AbstractWebDAVModelTest extends