imply-cheddar commented on code in PR #14975: URL: https://github.com/apache/druid/pull/14975#discussion_r1325914741
########## server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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.druid.server; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Throwables; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.server.QueryResultPusher.ResultsWriter; +import org.junit.Test; + +import javax.servlet.AsyncContext; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class QueryResultPusherTest +{ + @Test + public void testResultPusherRetainsNestedExceptionBacktraces() + { + HttpServletRequest request = mock(HttpServletRequest.class); + ObjectMapper jsonMapper = new ObjectMapper(); Review Comment: `new DefaultObjectMapper();` is generally better. It includes various configs that we use and some default serde stuff. ########## server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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.druid.server; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Throwables; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.server.QueryResultPusher.ResultsWriter; +import org.junit.Test; + +import javax.servlet.AsyncContext; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class QueryResultPusherTest +{ + @Test + public void testResultPusherRetainsNestedExceptionBacktraces() + { + HttpServletRequest request = mock(HttpServletRequest.class); Review Comment: There is a `MockHttpServletRequest` that you can `new` up instead. ########## server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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.druid.server; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Throwables; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.server.QueryResultPusher.ResultsWriter; +import org.junit.Test; + +import javax.servlet.AsyncContext; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class QueryResultPusherTest +{ + @Test + public void testResultPusherRetainsNestedExceptionBacktraces() + { + HttpServletRequest request = mock(HttpServletRequest.class); + ObjectMapper jsonMapper = new ObjectMapper(); + ResponseContextConfig responseContextConfig = ResponseContextConfig.newConfig(true); + DruidNode selfNode = mock(DruidNode.class); + QueryResource.QueryMetricCounter counter = mock(QueryResource.QueryMetricCounter.class); Review Comment: Just make a local `public static class NoopQueryMetricCounter` and new that up. Your IDE should be able to generate it all with just a few keystrokes. ########## server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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.druid.server; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Throwables; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.server.QueryResultPusher.ResultsWriter; +import org.junit.Test; + +import javax.servlet.AsyncContext; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class QueryResultPusherTest +{ + @Test + public void testResultPusherRetainsNestedExceptionBacktraces() + { + HttpServletRequest request = mock(HttpServletRequest.class); + ObjectMapper jsonMapper = new ObjectMapper(); + ResponseContextConfig responseContextConfig = ResponseContextConfig.newConfig(true); + DruidNode selfNode = mock(DruidNode.class); + QueryResource.QueryMetricCounter counter = mock(QueryResource.QueryMetricCounter.class); + String queryId = "someQuery"; + MediaType contentType = mock(MediaType.class); Review Comment: `MediaType.APPLICATION_JSON_TYPE`??? Can just grab anything really. ########## server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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.druid.server; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Throwables; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.server.QueryResultPusher.ResultsWriter; +import org.junit.Test; + +import javax.servlet.AsyncContext; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; Review Comment: Generally speaking, we try to use mocks sparingly. And, Mockito is the less-preferred of libraries versus EasyMock (we had a test once that used Mockito to mock a `ByteBuffer` which 4x'd the runtime of all tests because it ended up rewriting the byte code of `ByteBuffer` which slowed down all other tests in that JVM). ########## server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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.druid.server; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Throwables; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.server.QueryResultPusher.ResultsWriter; +import org.junit.Test; + +import javax.servlet.AsyncContext; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class QueryResultPusherTest +{ + @Test + public void testResultPusherRetainsNestedExceptionBacktraces() + { + HttpServletRequest request = mock(HttpServletRequest.class); + ObjectMapper jsonMapper = new ObjectMapper(); + ResponseContextConfig responseContextConfig = ResponseContextConfig.newConfig(true); + DruidNode selfNode = mock(DruidNode.class); + QueryResource.QueryMetricCounter counter = mock(QueryResource.QueryMetricCounter.class); + String queryId = "someQuery"; + MediaType contentType = mock(MediaType.class); + Map<String, String> extraHeaders = new HashMap<String, String>(); + + ResultsWriter resultWriter = mock(ResultsWriter.class); Review Comment: Can just create a local anonymous-inner-class that throws the exception out of the accumulate call. And returns an actual fake QueryResponse object. ########## server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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.druid.server; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Throwables; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.server.QueryResultPusher.ResultsWriter; +import org.junit.Test; + +import javax.servlet.AsyncContext; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class QueryResultPusherTest +{ + @Test + public void testResultPusherRetainsNestedExceptionBacktraces() + { + HttpServletRequest request = mock(HttpServletRequest.class); + ObjectMapper jsonMapper = new ObjectMapper(); + ResponseContextConfig responseContextConfig = ResponseContextConfig.newConfig(true); + DruidNode selfNode = mock(DruidNode.class); + QueryResource.QueryMetricCounter counter = mock(QueryResource.QueryMetricCounter.class); + String queryId = "someQuery"; + MediaType contentType = mock(MediaType.class); + Map<String, String> extraHeaders = new HashMap<String, String>(); + + ResultsWriter resultWriter = mock(ResultsWriter.class); + @SuppressWarnings("unchecked") + List<Exception> loggedExceptions = mock(List.class); Review Comment: This seems like it would make sense as just an ArrayList? ########## server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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.druid.server; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Throwables; +import org.apache.druid.java.util.common.guava.Sequence; +import org.apache.druid.server.QueryResultPusher.ResultsWriter; +import org.junit.Test; + +import javax.servlet.AsyncContext; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class QueryResultPusherTest +{ + @Test + public void testResultPusherRetainsNestedExceptionBacktraces() + { + HttpServletRequest request = mock(HttpServletRequest.class); + ObjectMapper jsonMapper = new ObjectMapper(); + ResponseContextConfig responseContextConfig = ResponseContextConfig.newConfig(true); + DruidNode selfNode = mock(DruidNode.class); Review Comment: I understand that there are lots of constructor parameters, but this object is `new`-able. One pattern we follow sometimes when we get tired of using all of those parameters is to have a `TestDruidNode` or a `TestDruidNodeBuilder` that can be used to simplify the building of it. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
