Author: sergeyb
Date: Mon Mar 25 16:09:20 2013
New Revision: 1460742
URL: http://svn.apache.org/r1460742
Log:
Fixing the checkstyle errors, disabling one more test for now
Added:
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
- copied, changed from r1460735,
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/TestLinkBuilderImpl.java
Removed:
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/TestLinkBuilderImpl.java
Copied:
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
(from r1460735,
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/TestLinkBuilderImpl.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java?p2=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/TestLinkBuilderImpl.java&r1=1460735&r2=1460742&rev=1460742&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/TestLinkBuilderImpl.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
Mon Mar 25 16:09:20 2013
@@ -1,7 +1,23 @@
+/**
+ * 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.impl;
-import static org.junit.Assert.assertEquals;
-
import java.net.URI;
import javax.ws.rs.core.Link;
@@ -9,17 +25,22 @@ import javax.ws.rs.core.Link;
import org.junit.Ignore;
import org.junit.Test;
-public class TestLinkBuilderImpl {
- Link.Builder linkBuilder = new LinkBuilderImpl();
+import static org.junit.Assert.assertEquals;
+
+public class LinkBuilderImplTest {
+
@Test
public void build() throws Exception {
+ Link.Builder linkBuilder = new LinkBuilderImpl();
Link prevLink =
linkBuilder.uri("http://example.com/page1").rel("previous").build();
assertEquals("<http://example.com/page1>;rel=\"previous\"",
prevLink.toString());
}
+ @Ignore("Ignored due to CXF-4919")
@Test
public void relativeBuild() throws Exception {
+ Link.Builder linkBuilder = new LinkBuilderImpl();
URI base = URI.create("http://example.com/page2");
Link prevLink =
linkBuilder.uri("http://example.com/page1").rel("previous").buildRelativized(base);
assertEquals("<page1>;rel=\"previous\"", prevLink.toString());
@@ -27,12 +48,14 @@ public class TestLinkBuilderImpl {
@Test
public void severalAttributes() throws Exception {
+ Link.Builder linkBuilder = new LinkBuilderImpl();
Link prevLink =
linkBuilder.uri("http://example.com/page1").rel("previous").title("A
title").build();
assertEquals("<http://example.com/page1>;rel=\"previous\";title=\"A
title\"", prevLink.toString());
}
@Test
public void copyOnBuild() throws Exception {
+ Link.Builder linkBuilder = new LinkBuilderImpl();
Link prevLink =
linkBuilder.uri("http://example.com/page1").rel("previous").build();
Link nextLink =
linkBuilder.uri("http://example.com/page3").rel("next").build();
@@ -44,6 +67,7 @@ public class TestLinkBuilderImpl {
@Ignore("Ignored due to CXF-4919")
@Test
public void copyOnRelativeBuild() throws Exception {
+ Link.Builder linkBuilder = new LinkBuilderImpl();
URI base = URI.create("http://example.com/page2");
Link prevLink =
linkBuilder.uri("http://example.com/page1").rel("previous").buildRelativized(base);
Link nextLink =
linkBuilder.uri("http://example.com/page3").rel("next").buildRelativized(base);