This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 3fd71d8 org.apache.juneau.http tests.
3fd71d8 is described below
commit 3fd71d8b72e55db38230951c6d6f803a4afead4a
Author: JamesBognar <[email protected]>
AuthorDate: Sat Jul 11 10:54:37 2020 -0400
org.apache.juneau.http tests.
---
.../org/apache/juneau/http/SerializedHeader.java | 7 +-----
.../org/apache/juneau/http/BasicHeader_Test.java | 3 +++
.../apache/juneau/http/BasicHttpResource_Test.java | 3 ++-
.../apache/juneau/http/HeaderSupplier_Test.java | 2 +-
.../org/apache/juneau/http/HttpHeader_Test.java | 26 ++++++++++++++++++++++
.../juneau/http/NameValuePairSupplier_Test.java | 2 ++
.../rest/client2/RestClient_Headers_Test.java | 1 +
7 files changed, 36 insertions(+), 8 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
index 5e0b97c..d3409d7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
@@ -36,7 +36,7 @@ import org.apache.juneau.urlencoding.*;
* request.setEntity(<jk>new</jk> UrlEncodedFormEntity(params));
* </p>
*/
-public class SerializedHeader extends BasicStringHeader implements
NameValuePairable {
+public class SerializedHeader extends BasicStringHeader {
private static final long serialVersionUID = 1L;
private final Object value;
@@ -150,9 +150,4 @@ public class SerializedHeader extends BasicStringHeader
implements NameValuePair
throw new BasicRuntimeException(e, "Serialization error
on request {0} parameter ''{1}''", HttpPartType.HEADER, getName());
}
}
-
- @Override /* NameValuePairable */
- public NameValuePair asNameValuePair() {
- return new SerializedNameValuePair(getName(), value,
HttpPartType.HEADER, serializer, schema, skipIfEmpty);
- }
}
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
index eba86ca..7c7b5d5 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
@@ -77,6 +77,7 @@ public class BasicHeader_Test {
return header("X8","8");
}
};
+ SerializedNameValuePair x9 =
SerializedNameValuePair.of("X9",()->"9");
assertObject(BasicHeader.cast(x1)).isType(Header.class).json().is("'X1: 1'");
assertObject(BasicHeader.cast(x2)).isType(Header.class).json().is("'X2: 2'");
@@ -86,6 +87,7 @@ public class BasicHeader_Test {
assertObject(BasicHeader.cast(x6)).isType(Header.class).json().is("'X6: 6'");
assertObject(BasicHeader.cast(x7)).isType(Header.class).json().is("'X7: 7'");
assertObject(BasicHeader.cast(x8)).isType(Header.class).json().is("'X8: 8'");
+
assertObject(BasicHeader.cast(x9)).isType(Header.class).json().is("'X9: 9'");
assertThrown(()->BasicHeader.cast("X")).is("Object of type
java.lang.String could not be converted to a Header.");
assertThrown(()->BasicHeader.cast(null)).is("Object of type
null could not be converted to a Header.");
@@ -98,6 +100,7 @@ public class BasicHeader_Test {
assertTrue(BasicHeader.canCast(x6));
assertTrue(BasicHeader.canCast(x7));
assertTrue(BasicHeader.canCast(x8));
+ assertTrue(BasicHeader.canCast(x9));
assertFalse(BasicHeader.canCast("X"));
assertFalse(BasicHeader.canCast(null));
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
index a6a71c6..9d0bf5a 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
@@ -85,12 +85,13 @@ public class BasicHttpResource_Test {
assertStream(x.getContent()).string().doesNotExist();
assertStream(x.getContent()).string().doesNotExist();
assertTrue(x.isRepeatable());
+ x.writeTo(new ByteArrayOutputStream());
assertLong(of("foo").getContentLength()).is(3l);
assertLong(of("foo".getBytes()).getContentLength()).is(3l);
assertLong(of(f).getContentLength()).is(0l);
- x = of("foo").header("Foo","bar").header("Foo","baz");
+ x =
of("foo").header("Foo","bar").header("Foo","baz").header(null,"bar").header("foo",null).header(null);
assertString(x.getStringHeader("Foo")).is("baz");
assertString(x.getStringHeader("Bar")).doesNotExist();
assertString(x.getFirstHeader("Foo").toString()).is("Foo: bar");
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
index b89ebf2..f9732a8 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
@@ -46,7 +46,7 @@ public class HeaderSupplier_Test {
x.add((HeaderSupplier)null);
assertObject(x.iterator()).json().is("['Foo: bar','Foo:
baz','Foo: qux','Foo: q2x','Foo: q3x','Foo: q4x','Foo: q5x']");
- assertObject(new HeaderSupplier.Null()).json().is("[]");
+ assertObject(new
HeaderSupplier.Null().iterator()).json().is("[]");
}
@Test
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/HttpHeader_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/HttpHeader_Test.java
new file mode 100644
index 0000000..01332c4
--- /dev/null
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/HttpHeader_Test.java
@@ -0,0 +1,26 @@
+//
***************************************************************************************************************************
+// * 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.juneau.http;
+
+import static org.junit.runners.MethodSorters.*;
+
+import org.junit.*;
+
+@FixMethodOrder(NAME_ASCENDING)
+public class HttpHeader_Test {
+
+ @Test
+ public void a01_basic() {
+ new HttpMethod();
+ }
+}
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/NameValuePairSupplier_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/NameValuePairSupplier_Test.java
index a4b7abd..bb3014c 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/NameValuePairSupplier_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/http/NameValuePairSupplier_Test.java
@@ -45,6 +45,8 @@ public class NameValuePairSupplier_Test {
assertObject(x.iterator()).json().is("['Foo=bar','Foo=baz','Foo=qux','Foo=q2x','Foo=q3x','Foo=q4x','Foo=q5x']");
x.add((NameValuePairSupplier)null);
assertObject(x.iterator()).json().is("['Foo=bar','Foo=baz','Foo=qux','Foo=q2x','Foo=q3x','Foo=q4x','Foo=q5x']");
+
+ assertObject(new
NameValuePairSupplier.Null().iterator()).json().is("[]");
}
@Test
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
index 1ad982e..c3d4131 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
@@ -112,6 +112,7 @@ public class RestClient_Headers_Test {
checkFooClient().headers(pair("Foo","bar")).build().get("/headers").headers(pair("Foo","baz")).run().assertBody().is("['bar','baz']");
checkFooClient().headers(SerializedNameValuePair.of("Foo","Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedNameValuePair.of("Foo","Baz").serializer(OpenApiSerializer.DEFAULT)).debug().run().assertBody().is("['Bar','Baz']");
checkFooClient().headers(SerializedHeader.of("Foo","Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedHeader.of("Foo","Baz").serializer(OpenApiSerializer.DEFAULT)).debug().run().assertBody().is("['Bar','Baz']");
+
checkFooClient().headers(SerializedHeader.of("Foo",()->"Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedHeader.of("Foo",()->"Baz").serializer(OpenApiSerializer.DEFAULT)).debug().run().assertBody().is("['Bar','Baz']");
checkFooClient().headers((Object)new
Header[]{header("Foo","bar")}).build().get("/headers").headers((Object)new
Header[]{header("Foo","baz")}).debug().run().assertBody().is("['bar','baz']");
checkFooClient().headers(HeaderSupplier.of(header("Foo","bar"))).build().get("/headers").headers(HeaderSupplier.of(header("Foo","baz"))).run().assertBody().is("['bar','baz']");
checkFooClient().headers(AList.of(header("Foo","bar"))).build().get("/headers").headers(AList.of(header("Foo","baz"))).run().assertBody().is("['bar','baz']");
