You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by jl...@apache.org on 2007/10/25 19:37:29 UTC

svn commit: r588289 - in /incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf: jaxrs/ jaxrs/model/ jaxrs/model/URITemplateTest.java rs/

Author: jliu
Date: Thu Oct 25 10:37:29 2007
New Revision: 588289

URL: http://svn.apache.org/viewvc?rev=588289&view=rev
Log:
Added unit tests for URITemplate util

Added:
    incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/
    incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/
    incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java   (with props)
Removed:
    incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/rs/

Added: incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java?rev=588289&view=auto
==============================================================================
--- incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java (added)
+++ incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java Thu Oct 25 10:37:29 2007
@@ -0,0 +1,100 @@
+/**
+ * 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.cxf.jaxrs.model;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class URITemplateTest extends Assert {
+
+    @Before
+    public void setUp() throws Exception {
+
+    }
+
+    @Test
+    public void testMatchBasic() throws Exception {
+        URITemplate uriTemplate = new URITemplate("/customers/{id}",
+                                                  URITemplate.NONE_SUB_RESOURCE_REGEX_SUFFIX);
+        Map<String, String> values = new HashMap<String, String>();
+        
+        boolean match = uriTemplate.match("/customers/123/", values);
+        assertTrue(match);
+        String value = values.get("id");
+        assertEquals("123", value);
+    }
+    
+    @Test
+    public void testMatchBasicTwoParametersVariation1() throws Exception {
+        URITemplate uriTemplate = new URITemplate("/customers/{name}/{department}",
+                                                  URITemplate.NONE_SUB_RESOURCE_REGEX_SUFFIX);
+        Map<String, String> values = new HashMap<String, String>();
+        
+        boolean match = uriTemplate.match("/customers/john/CS", values);
+        assertTrue(match);
+        String name = values.get("name");
+        String department = values.get("department");
+        assertEquals("john", name);
+        assertEquals("CS", department);
+    }
+    
+    @Test
+    public void testMatchBasicTwoParametersVariation2() throws Exception {
+        URITemplate uriTemplate = new URITemplate("/customers/name/{name}/dep/{department}",
+                                                  URITemplate.NONE_SUB_RESOURCE_REGEX_SUFFIX);
+        Map<String, String> values = new HashMap<String, String>();
+        
+        boolean match = uriTemplate.match("/customers/name/john/dep/CS", values);
+        assertTrue(match);
+        String name = values.get("name");
+        String department = values.get("department");
+        assertEquals("john", name);
+        assertEquals("CS", department);
+    }    
+    
+    @Test
+    public void testURITemplateWithSubResource() throws Exception {
+        //So "/customers" is the URITemplate for the root resource class
+        URITemplate uriTemplate = new URITemplate("/customers", URITemplate.SUB_RESOURCE_REGEX_SUFFIX);
+        Map<String, String> values = new HashMap<String, String>();
+        
+        boolean match = uriTemplate.match("/customers/123", values);
+        assertTrue(match);
+        String subResourcePath = values.values().iterator().next();
+        assertEquals("/123", subResourcePath);
+    }
+    
+    
+    @Test
+    public void testURITemplateWithSubResourceVariation2() throws Exception {
+        //So "/customers" is the URITemplate for the root resource class
+        URITemplate uriTemplate = new URITemplate("/customers", URITemplate.SUB_RESOURCE_REGEX_SUFFIX);
+        Map<String, String> values = new HashMap<String, String>();
+        
+        boolean match = uriTemplate.match("/customers/name/john/dep/CS", values);
+        assertTrue(match);
+        String subResourcePath = values.values().iterator().next();
+        assertEquals("/name/john/dep/CS", subResourcePath);
+    }
+}

Propchange: incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date