You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cxf.apache.org by GitBox <gi...@apache.org> on 2021/02/26 22:03:55 UTC
[GitHub] [cxf] alanmehio opened a new pull request #755: CXF-8432
alanmehio opened a new pull request #755:
URL: https://github.com/apache/cxf/pull/755
adding a simple test method to verify the filepath striping.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r591780538
##########
File path: core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
##########
@@ -173,4 +171,23 @@ private void setupSchemaValidationValue(Object value, boolean isRequestor) {
control.replay();
}
-}
\ No newline at end of file
+
+ @Test
+ public void testMakeNamespaceFromClassName() {
+ String nameSpace = ServiceUtils.makeNamespaceFromClassName("Foo", "http");
+ assertEquals("http://DefaultNamespace", nameSpace);
+
+ nameSpace = ServiceUtils.makeNamespaceFromClassName(this.getClass().getName(), "http");
+ assertEquals("http://helpers.cxf.apache.org/", nameSpace);
+
+ }
+
+ @Test
+ public void testMakePackageName() {
+ String packageName = ServiceUtils.makePackageName("http://www.w3.org/TR/html4/");
+ assertEquals("org.w3.www.TR.html4", packageName);
+
+ packageName = ServiceUtils.makePackageName("http://www.w3.org");
Review comment:
@reta . Done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r590908598
##########
File path: core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
##########
@@ -49,6 +49,10 @@ private synchronized void load() {
if (dataSource == null) {
for (Attachment a : attachments) {
if (a.getId().equals(id)) {
+ if (a.getDataHandler() == null) {
Review comment:
👍
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r591791656
##########
File path: core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
##########
@@ -49,6 +49,10 @@ private synchronized void load() {
if (dataSource == null) {
for (Attachment a : attachments) {
if (a.getId().equals(id)) {
+ if (a.getDataHandler() == null) {
Review comment:
Thanks
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio closed pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio closed pull request #755:
URL: https://github.com/apache/cxf/pull/755
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r590906387
##########
File path: core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
##########
@@ -173,4 +171,23 @@ private void setupSchemaValidationValue(Object value, boolean isRequestor) {
control.replay();
}
-}
\ No newline at end of file
+
+ @Test
+ public void testMakeNamespaceFromClassName() {
+ String nameSpace = ServiceUtils.makeNamespaceFromClassName("Foo", "http");
+ assertEquals("http://DefaultNamespace", nameSpace);
+
+ nameSpace = ServiceUtils.makeNamespaceFromClassName(this.getClass().getName(), "http");
Review comment:
Better to split in 2 test cases I think
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r591963744
##########
File path: core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
##########
@@ -79,4 +78,15 @@ public void testGetFiles() throws URISyntaxException {
assertEquals(foundFiles, foundFiles2);
}
+
+ @Test
+ public void testStripPath() {
+ String name = "c:\\boo\foo\\file.txt";
Review comment:
Thank you
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on pull request #755:
URL: https://github.com/apache/cxf/pull/755#issuecomment-803463519
Closing this PR since the PR was based on CXF master which was lagging behind the latest branch 3.4.x-fixes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r590907534
##########
File path: core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
##########
@@ -29,32 +29,77 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class IOUtilsTest {
-
@Test
public void testIsEmpty() throws Exception {
- assertTrue(IOUtils.isEmpty(new ByteArrayInputStream(new byte[]{})));
+ assertTrue(IOUtils.isEmpty(new ByteArrayInputStream(new byte[] {})));
}
+
@Test
public void testNonEmpty() throws Exception {
InputStream is = new ByteArrayInputStream("Hello".getBytes());
assertFalse(IOUtils.isEmpty(is));
assertEquals("Hello", IOUtils.toString(is));
}
+
@Test
public void testNonEmptyWithPushBack() throws Exception {
- InputStream is = new PushbackInputStream(
- new ByteArrayInputStream("Hello".getBytes()));
+ InputStream is = new PushbackInputStream(new ByteArrayInputStream("Hello".getBytes()));
assertFalse(IOUtils.isEmpty(is));
assertEquals("Hello", IOUtils.toString(is));
}
+
@Test
public void testInputStreamWithNoMark() throws Exception {
String data = "this is some data";
InputStream is = new UnMarkedInputStream(data.getBytes());
assertFalse(IOUtils.isEmpty(is));
assertEquals(data, IOUtils.toString(is));
}
-}
\ No newline at end of file
+
+ @Test
+ public void testCopy() throws IOException {
+ byte[] inBytes = "Foo".getBytes(IOUtils.UTF8_CHARSET);
+ ByteArrayInputStream is = new ByteArrayInputStream(inBytes);
+ ByteArrayOutputStream os = new ByteArrayOutputStream(inBytes.length);
+ IOUtils.copy(is, os);
+ byte[] outBytes = os.toByteArray();
+ String expectedString = new String(outBytes, IOUtils.UTF8_CHARSET);
+ assertEquals("Foo", expectedString);
+ }
+
+ @Test(expected = IOException.class)
+ public void testCopyAndCloseInput() throws IOException {
+ InputStream is = getClass().getResourceAsStream("/wsdl/foo.wsdl");
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ IOUtils.copyAndCloseInput(is, os);
+ is.read();
+ fail("InputStream should be closed");
+ }
+
+ @Test
+ public void testCopyAtLeast() throws IOException {
Review comment:
Would be good to have 3 test cases:
- `>=` size of the stream
- `==` size of the stream
- `<=` size of the stream
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r590906750
##########
File path: core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
##########
@@ -173,4 +171,23 @@ private void setupSchemaValidationValue(Object value, boolean isRequestor) {
control.replay();
}
-}
\ No newline at end of file
+
+ @Test
+ public void testMakeNamespaceFromClassName() {
+ String nameSpace = ServiceUtils.makeNamespaceFromClassName("Foo", "http");
+ assertEquals("http://DefaultNamespace", nameSpace);
+
+ nameSpace = ServiceUtils.makeNamespaceFromClassName(this.getClass().getName(), "http");
+ assertEquals("http://helpers.cxf.apache.org/", nameSpace);
+
+ }
+
+ @Test
+ public void testMakePackageName() {
+ String packageName = ServiceUtils.makePackageName("http://www.w3.org/TR/html4/");
+ assertEquals("org.w3.www.TR.html4", packageName);
+
+ packageName = ServiceUtils.makePackageName("http://www.w3.org");
Review comment:
Also better to have 2 test cases for different asserts
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on pull request #755:
URL: https://github.com/apache/cxf/pull/755#issuecomment-803463474
Closing this PR since the PR was based on CXF master which was lagging behind the latest branch 3.4.x-fixes .
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on pull request #755:
URL: https://github.com/apache/cxf/pull/755#issuecomment-796299581
@alanmehio the only outstanding issue it the failing CodeQL checks
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r590908407
##########
File path: core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
##########
@@ -79,4 +78,15 @@ public void testGetFiles() throws URISyntaxException {
assertEquals(foundFiles, foundFiles2);
}
+
+ @Test
+ public void testStripPath() {
+ String name = "c:\\boo\foo\\file.txt";
Review comment:
Please split into two test cases:
- Windows style
- Unix style
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r591788556
##########
File path: core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
##########
@@ -29,32 +29,77 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class IOUtilsTest {
-
@Test
public void testIsEmpty() throws Exception {
- assertTrue(IOUtils.isEmpty(new ByteArrayInputStream(new byte[]{})));
+ assertTrue(IOUtils.isEmpty(new ByteArrayInputStream(new byte[] {})));
}
+
@Test
public void testNonEmpty() throws Exception {
InputStream is = new ByteArrayInputStream("Hello".getBytes());
assertFalse(IOUtils.isEmpty(is));
assertEquals("Hello", IOUtils.toString(is));
}
+
@Test
public void testNonEmptyWithPushBack() throws Exception {
- InputStream is = new PushbackInputStream(
- new ByteArrayInputStream("Hello".getBytes()));
+ InputStream is = new PushbackInputStream(new ByteArrayInputStream("Hello".getBytes()));
assertFalse(IOUtils.isEmpty(is));
assertEquals("Hello", IOUtils.toString(is));
}
+
@Test
public void testInputStreamWithNoMark() throws Exception {
String data = "this is some data";
InputStream is = new UnMarkedInputStream(data.getBytes());
assertFalse(IOUtils.isEmpty(is));
assertEquals(data, IOUtils.toString(is));
}
-}
\ No newline at end of file
+
+ @Test
+ public void testCopy() throws IOException {
+ byte[] inBytes = "Foo".getBytes(IOUtils.UTF8_CHARSET);
+ ByteArrayInputStream is = new ByteArrayInputStream(inBytes);
+ ByteArrayOutputStream os = new ByteArrayOutputStream(inBytes.length);
+ IOUtils.copy(is, os);
+ byte[] outBytes = os.toByteArray();
+ String expectedString = new String(outBytes, IOUtils.UTF8_CHARSET);
+ assertEquals("Foo", expectedString);
+ }
+
+ @Test(expected = IOException.class)
+ public void testCopyAndCloseInput() throws IOException {
+ InputStream is = getClass().getResourceAsStream("/wsdl/foo.wsdl");
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ IOUtils.copyAndCloseInput(is, os);
+ is.read();
+ fail("InputStream should be closed");
+ }
+
+ @Test
+ public void testCopyAtLeast() throws IOException {
Review comment:
@reta Done . Thanks
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on pull request #755:
URL: https://github.com/apache/cxf/pull/755#issuecomment-798872002
> @alanmehio the only outstanding issue is the failing CodeQL checks
@reta thanks for informing me. I will handle this outstanding issue first
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r591791255
##########
File path: core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
##########
@@ -79,4 +78,15 @@ public void testGetFiles() throws URISyntaxException {
assertEquals(foundFiles, foundFiles2);
}
+
+ @Test
+ public void testStripPath() {
+ String name = "c:\\boo\foo\\file.txt";
Review comment:
@reta Done. It is much better to have very specific unit test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r591791255
##########
File path: core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
##########
@@ -79,4 +78,15 @@ public void testGetFiles() throws URISyntaxException {
assertEquals(foundFiles, foundFiles2);
}
+
+ @Test
+ public void testStripPath() {
+ String name = "c:\\boo\foo\\file.txt";
Review comment:
@reda-alaoui Done. It is much better to have very specific unit test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r591964261
##########
File path: core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
##########
@@ -173,4 +171,23 @@ private void setupSchemaValidationValue(Object value, boolean isRequestor) {
control.replay();
}
-}
\ No newline at end of file
+
+ @Test
+ public void testMakeNamespaceFromClassName() {
+ String nameSpace = ServiceUtils.makeNamespaceFromClassName("Foo", "http");
+ assertEquals("http://DefaultNamespace", nameSpace);
+
+ nameSpace = ServiceUtils.makeNamespaceFromClassName(this.getClass().getName(), "http");
+ assertEquals("http://helpers.cxf.apache.org/", nameSpace);
+
+ }
+
+ @Test
+ public void testMakePackageName() {
+ String packageName = ServiceUtils.makePackageName("http://www.w3.org/TR/html4/");
+ assertEquals("org.w3.www.TR.html4", packageName);
+
+ packageName = ServiceUtils.makePackageName("http://www.w3.org");
Review comment:
Thank you
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] alanmehio commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
alanmehio commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r591779149
##########
File path: core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
##########
@@ -173,4 +171,23 @@ private void setupSchemaValidationValue(Object value, boolean isRequestor) {
control.replay();
}
-}
\ No newline at end of file
+
+ @Test
+ public void testMakeNamespaceFromClassName() {
+ String nameSpace = ServiceUtils.makeNamespaceFromClassName("Foo", "http");
+ assertEquals("http://DefaultNamespace", nameSpace);
+
+ nameSpace = ServiceUtils.makeNamespaceFromClassName(this.getClass().getName(), "http");
Review comment:
@reta Good idea since we have two different cases. Done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta commented on a change in pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta commented on a change in pull request #755:
URL: https://github.com/apache/cxf/pull/755#discussion_r590907534
##########
File path: core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
##########
@@ -29,32 +29,77 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class IOUtilsTest {
-
@Test
public void testIsEmpty() throws Exception {
- assertTrue(IOUtils.isEmpty(new ByteArrayInputStream(new byte[]{})));
+ assertTrue(IOUtils.isEmpty(new ByteArrayInputStream(new byte[] {})));
}
+
@Test
public void testNonEmpty() throws Exception {
InputStream is = new ByteArrayInputStream("Hello".getBytes());
assertFalse(IOUtils.isEmpty(is));
assertEquals("Hello", IOUtils.toString(is));
}
+
@Test
public void testNonEmptyWithPushBack() throws Exception {
- InputStream is = new PushbackInputStream(
- new ByteArrayInputStream("Hello".getBytes()));
+ InputStream is = new PushbackInputStream(new ByteArrayInputStream("Hello".getBytes()));
assertFalse(IOUtils.isEmpty(is));
assertEquals("Hello", IOUtils.toString(is));
}
+
@Test
public void testInputStreamWithNoMark() throws Exception {
String data = "this is some data";
InputStream is = new UnMarkedInputStream(data.getBytes());
assertFalse(IOUtils.isEmpty(is));
assertEquals(data, IOUtils.toString(is));
}
-}
\ No newline at end of file
+
+ @Test
+ public void testCopy() throws IOException {
+ byte[] inBytes = "Foo".getBytes(IOUtils.UTF8_CHARSET);
+ ByteArrayInputStream is = new ByteArrayInputStream(inBytes);
+ ByteArrayOutputStream os = new ByteArrayOutputStream(inBytes.length);
+ IOUtils.copy(is, os);
+ byte[] outBytes = os.toByteArray();
+ String expectedString = new String(outBytes, IOUtils.UTF8_CHARSET);
+ assertEquals("Foo", expectedString);
+ }
+
+ @Test(expected = IOException.class)
+ public void testCopyAndCloseInput() throws IOException {
+ InputStream is = getClass().getResourceAsStream("/wsdl/foo.wsdl");
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ IOUtils.copyAndCloseInput(is, os);
+ is.read();
+ fail("InputStream should be closed");
+ }
+
+ @Test
+ public void testCopyAtLeast() throws IOException {
Review comment:
Would be good to have 3 test cases:
- >= size of the stream
- == size of the stream
- <= size of the stream
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cxf] reta edited a comment on pull request #755: CXF-8432
Posted by GitBox <gi...@apache.org>.
reta edited a comment on pull request #755:
URL: https://github.com/apache/cxf/pull/755#issuecomment-796299581
@alanmehio the only outstanding issue is the failing CodeQL checks
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org