clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r910335 [2/2] - in /incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs: ./ org.apache.clerezza.triaxrs.tests/ org.apache.clerezza.triaxrs/ org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/ org.apache.cler...
Date Mon, 15 Feb 2010 21:07:11 GMT
Modified: incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestWriterDeterminedContentType.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestWriterDeterminedContentType.java?rev=910335&r1=910334&r2=910335&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestWriterDeterminedContentType.java
(original)
+++ incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/TestWriterDeterminedContentType.java
Mon Feb 15 21:06:58 2010
@@ -96,10 +96,11 @@
 
 		Request requestMock = EasyMock.createNiceMock(Request.class);
 		ResponseImpl responseImpl = new ResponseImpl();
-		expect(requestMock.getMethod()).andReturn(Method.GET);
+		expect(requestMock.getMethod()).andReturn(Method.GET).anyTimes();
 		RequestURI requestURI = EasyMock.createNiceMock(RequestURI.class);
 		expect(requestURI.getPath()).andReturn("/");
-		expect(requestMock.getRequestURI()).andReturn(requestURI);
+		expect(requestMock.getRequestURI()).andReturn(requestURI).anyTimes();
+		expect(requestURI.getType()).andReturn(null).anyTimes();
 		replay(requestMock);
 		replay(requestURI);
 		handler.handle(requestMock, responseImpl);

Modified: incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/WildcardWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/WildcardWriterTest.java?rev=910335&r1=910334&r2=910335&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/WildcardWriterTest.java
(original)
+++ incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/WildcardWriterTest.java
Mon Feb 15 21:06:58 2010
@@ -126,10 +126,10 @@
 
 		Request requestMock = EasyMock.createNiceMock(Request.class);
 		ResponseImpl responseImpl = new ResponseImpl();
-		expect(requestMock.getMethod()).andReturn(Method.GET);
+		expect(requestMock.getMethod()).andReturn(Method.GET).anyTimes();
 		RequestURI requestURI = EasyMock.createNiceMock(RequestURI.class);
 		expect(requestURI.getPath()).andReturn("/");
-		expect(requestMock.getRequestURI()).andReturn(requestURI);
+		expect(requestMock.getRequestURI()).andReturn(requestURI).anyTimes();
 		String[] acceptHeaders = {"test/string2", "*/*;q=.95"};
 		expect(requestMock.getHeaderNames()).andReturn(
 				Collections.singleton(HeaderName.ACCEPT)).anyTimes();

Modified: incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/SelectWriterBasedOnAcceptTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/SelectWriterBasedOnAcceptTest.java?rev=910335&r1=910334&r2=910335&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/SelectWriterBasedOnAcceptTest.java
(original)
+++ incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/SelectWriterBasedOnAcceptTest.java
Mon Feb 15 21:06:58 2010
@@ -182,7 +182,7 @@
 		Request requestMock = EasyMock.createNiceMock(Request.class);
 		ResponseImpl responseImpl = new ResponseImpl();
 
-		expect(requestMock.getMethod()).andReturn(Method.GET);
+		expect(requestMock.getMethod()).andReturn(Method.GET).anyTimes();
 		String[] acceptHeaders = {"test/string1;q=.8", "test/string2;q=.7"};
 		expect(requestMock.getHeaderNames()).andReturn(
 				Collections.singleton(HeaderName.ACCEPT)).anyTimes();
@@ -190,7 +190,7 @@
 				.andReturn(acceptHeaders).anyTimes();
 		RequestURI requestURI = EasyMock.createNiceMock(RequestURI.class);
 		expect(requestURI.getPath()).andReturn("/");
-		expect(requestMock.getRequestURI()).andReturn(requestURI);
+		expect(requestMock.getRequestURI()).andReturn(requestURI).anyTimes();
 		replay(requestMock);
 		replay(requestURI);
 		handler.handle(requestMock, responseImpl);
@@ -213,7 +213,7 @@
 		Request requestMock = EasyMock.createNiceMock(Request.class);
 		ResponseImpl responseImpl = new ResponseImpl();
 
-		expect(requestMock.getMethod()).andReturn(Method.GET);
+		expect(requestMock.getMethod()).andReturn(Method.GET).anyTimes();
 		String[] acceptHeaders = {"test/string2;q=.8", "test/string1;q=.7"};
 		expect(requestMock.getHeaderNames()).andReturn(
 				Collections.singleton(HeaderName.ACCEPT)).anyTimes();
@@ -221,7 +221,7 @@
 				.andReturn(acceptHeaders).anyTimes();
 		RequestURI requestURI = EasyMock.createNiceMock(RequestURI.class);
 		expect(requestURI.getPath()).andReturn("/");
-		expect(requestMock.getRequestURI()).andReturn(requestURI);
+		expect(requestMock.getRequestURI()).andReturn(requestURI).anyTimes();
 		replay(requestMock);
 		replay(requestURI);
 		handler.handle(requestMock, responseImpl);
@@ -243,7 +243,7 @@
 		Request requestMock = EasyMock.createNiceMock(Request.class);
 		ResponseImpl responseImpl = new ResponseImpl();
 
-		expect(requestMock.getMethod()).andReturn(Method.GET);
+		expect(requestMock.getMethod()).andReturn(Method.GET).anyTimes();
 		String[] acceptHeaders = {"test/string2", "*/*"};
 		expect(requestMock.getHeaderNames()).andReturn(
 				Collections.singleton(HeaderName.ACCEPT)).anyTimes();
@@ -251,7 +251,7 @@
 				.andReturn(acceptHeaders).anyTimes();
 		RequestURI requestURI = EasyMock.createNiceMock(RequestURI.class);
 		expect(requestURI.getPath()).andReturn("/");
-		expect(requestMock.getRequestURI()).andReturn(requestURI);
+		expect(requestMock.getRequestURI()).andReturn(requestURI).anyTimes();
 		replay(requestMock);
 		replay(requestURI);
 		handler.handle(requestMock, responseImpl);
@@ -274,7 +274,7 @@
 		Request requestMock = EasyMock.createNiceMock(Request.class);
 		ResponseImpl responseImpl = new ResponseImpl();
 
-		expect(requestMock.getMethod()).andReturn(Method.GET);
+		expect(requestMock.getMethod()).andReturn(Method.GET).anyTimes();
 		String[] acceptHeaders = {"test/string2;q=.9", "anything/else"};
 		expect(requestMock.getHeaderNames()).andReturn(
 				Collections.singleton(HeaderName.ACCEPT)).anyTimes();
@@ -282,7 +282,7 @@
 				.andReturn(acceptHeaders).anyTimes();
 		RequestURI requestURI = EasyMock.createNiceMock(RequestURI.class);
 		expect(requestURI.getPath()).andReturn("/");
-		expect(requestMock.getRequestURI()).andReturn(requestURI);
+		expect(requestMock.getRequestURI()).andReturn(requestURI).anyTimes();
 		replay(requestMock);
 		replay(requestURI);
 		handler.handle(requestMock, responseImpl);

Modified: incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/WriterAcceptTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/WriterAcceptTest.java?rev=910335&r1=910334&r2=910335&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/WriterAcceptTest.java
(original)
+++ incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/blackbox/writers/WriterAcceptTest.java
Mon Feb 15 21:06:58 2010
@@ -146,7 +146,7 @@
 		Request requestMock = EasyMock.createNiceMock(Request.class);
 		ResponseImpl responseImpl = new ResponseImpl();
 
-		expect(requestMock.getMethod()).andReturn(Method.GET);
+		expect(requestMock.getMethod()).andReturn(Method.GET).anyTimes();
 		String[] acceptHeaders = {"test/string2;q=.8", "test/string1;q=.7"};
 		expect(requestMock.getHeaderNames()).andReturn(
 				Collections.singleton(HeaderName.ACCEPT)).anyTimes();
@@ -154,7 +154,7 @@
 				.andReturn(acceptHeaders).anyTimes();
 		RequestURI requestURI = EasyMock.createNiceMock(RequestURI.class);
 		expect(requestURI.getPath()).andReturn("/");
-		expect(requestMock.getRequestURI()).andReturn(requestURI);
+		expect(requestMock.getRequestURI()).andReturn(requestURI).anyTimes();
 		replay(requestMock);
 		replay(requestURI);
 		handler.handle(requestMock, responseImpl);
@@ -203,7 +203,7 @@
 
 		//triaxrs has default writer for String, so the following isn't true:
 		//responseMock.setResponseStatus(ResponseStatus.NOT_ACCEPTABLE);
-		expect(requestMock.getMethod()).andReturn(Method.GET);
+		expect(requestMock.getMethod()).andReturn(Method.GET).anyTimes();
 		String[] acceptHeaders = {"test/string2;q=.8", "test/string4;q=.7"};
 		expect(requestMock.getHeaderNames()).andReturn(
 				Collections.singleton(HeaderName.ACCEPT)).anyTimes();
@@ -211,7 +211,7 @@
 				.andReturn(acceptHeaders).anyTimes();
 		RequestURI requestURI = EasyMock.createNiceMock(RequestURI.class);
 		expect(requestURI.getPath()).andReturn("/");
-		expect(requestMock.getRequestURI()).andReturn(requestURI);
+		expect(requestMock.getRequestURI()).andReturn(requestURI).anyTimes();
 		replay(requestMock);
 		replay(requestURI);
 		replay(responseMock);

Modified: incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/providers/SelectableProvidersTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/providers/SelectableProvidersTest.java?rev=910335&r1=910334&r2=910335&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/providers/SelectableProvidersTest.java
(original)
+++ incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/providers/SelectableProvidersTest.java
Mon Feb 15 21:06:58 2010
@@ -37,7 +37,7 @@
 public class SelectableProvidersTest {
 
 	@Produces("text/html")
-	public class ExampleProvider {
+	public static class ExampleProvider {
 
 	}
 	



Mime
View raw message