From 2b6ef3df7e0d141cb3622dfa32cb846b1b04fa25 Mon Sep 17 00:00:00 2001 From: Xinyuan Lin Date: Fri, 31 Jul 2026 23:20:37 -0700 Subject: [PATCH 1/3] test(amber): cover WebSocket payload tuning --- .../WebsocketPayloadSizeTunerSpec.scala | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala diff --git a/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala b/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala new file mode 100644 index 00000000000..f425c576618 --- /dev/null +++ b/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala @@ -0,0 +1,57 @@ +/* + * 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.texera.web.resource + +import org.scalamock.scalatest.MockFactory +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers + +import javax.servlet.{ServletContext, ServletContextEvent} +import javax.websocket.server.ServerContainer + +class WebsocketPayloadSizeTunerSpec extends AnyFlatSpec with Matchers with MockFactory { + + private def eventWith(container: ServerContainer): ServletContextEvent = { + val servletContext = mock[ServletContext] + (servletContext + .getAttribute(_: String)) + .expects(classOf[ServerContainer].getName) + .returning(container) + .once() + new ServletContextEvent(servletContext) + } + + "contextInitialized" should "look up the server container by its class name and tune both limits" in { + val maxKB = 64 + val container = mock[ServerContainer] + (container.setDefaultMaxTextMessageBufferSize(_: Int)).expects(maxKB * 1024).once() + (container.setDefaultMaxBinaryMessageBufferSize(_: Int)).expects(maxKB * 1024).once() + + new WebsocketPayloadSizeTuner(maxKB).contextInitialized(eventWith(container)) + } + + it should "convert a one-KiB payload limit to exactly 1024 bytes" in { + val container = mock[ServerContainer] + (container.setDefaultMaxTextMessageBufferSize(_: Int)).expects(1024).once() + (container.setDefaultMaxBinaryMessageBufferSize(_: Int)).expects(1024).once() + + new WebsocketPayloadSizeTuner(1).contextInitialized(eventWith(container)) + } +} From 7ac6ec1d4700482c87624396369d781739684e3a Mon Sep 17 00:00:00 2001 From: Xinyuan Lin Date: Sat, 1 Aug 2026 00:01:35 -0700 Subject: [PATCH 2/3] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Xinyuan Lin --- .../texera/web/resource/WebsocketPayloadSizeTunerSpec.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala b/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala index f425c576618..249c13feac5 100644 --- a/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala +++ b/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala @@ -39,10 +39,10 @@ class WebsocketPayloadSizeTunerSpec extends AnyFlatSpec with Matchers with MockF } "contextInitialized" should "look up the server container by its class name and tune both limits" in { - val maxKB = 64 + val maxKiB = 64 val container = mock[ServerContainer] - (container.setDefaultMaxTextMessageBufferSize(_: Int)).expects(maxKB * 1024).once() - (container.setDefaultMaxBinaryMessageBufferSize(_: Int)).expects(maxKB * 1024).once() + (container.setDefaultMaxTextMessageBufferSize(_: Int)).expects(maxKiB * 1024).once() + (container.setDefaultMaxBinaryMessageBufferSize(_: Int)).expects(maxKiB * 1024).once() new WebsocketPayloadSizeTuner(maxKB).contextInitialized(eventWith(container)) } From 34cc1744ce500a57a3b17e39f45b9a3df935697d Mon Sep 17 00:00:00 2001 From: Xinyuan Lin Date: Sat, 1 Aug 2026 01:28:08 -0700 Subject: [PATCH 3/3] test(amber): fix WebSocket payload spec typo --- .../texera/web/resource/WebsocketPayloadSizeTunerSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala b/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala index 249c13feac5..dc4d7abda4e 100644 --- a/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala +++ b/amber/src/test/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTunerSpec.scala @@ -44,7 +44,7 @@ class WebsocketPayloadSizeTunerSpec extends AnyFlatSpec with Matchers with MockF (container.setDefaultMaxTextMessageBufferSize(_: Int)).expects(maxKiB * 1024).once() (container.setDefaultMaxBinaryMessageBufferSize(_: Int)).expects(maxKiB * 1024).once() - new WebsocketPayloadSizeTuner(maxKB).contextInitialized(eventWith(container)) + new WebsocketPayloadSizeTuner(maxKiB).contextInitialized(eventWith(container)) } it should "convert a one-KiB payload limit to exactly 1024 bytes" in {