Commit Graph

2488 Commits

Author SHA1 Message Date
Joakim Erdfelt 22f815ddfd Issue #1650 - testing improvements 2017-07-07 13:16:31 -07:00
Joakim Erdfelt 90d9823307 Issue #1650 - restoring 2 more testcases 2017-07-07 08:41:31 -07:00
Joakim Erdfelt ee8d4c1587 gitattributes followup 2017-07-06 16:24:31 -07:00
Joakim Erdfelt 986e49ab35 Issue #1650 - fixing Suspend/Resume in websockets 2017-07-06 16:24:07 -07:00
Joakim Erdfelt 2d65605de1 Issue #1650 - fixing CDI + websocket integration 2017-07-03 09:19:17 -07:00
Joakim Erdfelt 38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
Joakim Erdfelt 67cccd610a Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket 2017-06-26 13:11:33 -07:00
Joakim Erdfelt a037d8bbcb More websocket test fixes 2017-06-26 11:59:55 -07:00
Joakim Erdfelt f5e273b4a3 Enabling more websocket tests 2017-06-26 11:59:54 -07:00
Joakim Erdfelt 0d43636658 Turning down logging level 2017-06-26 11:59:53 -07:00
Joakim Erdfelt e9ab0b3994 Correcting dumps to only occur during DEBUG 2017-06-26 11:59:52 -07:00
Joakim Erdfelt db9997a792 Fixing WebSocket MessageReceivingTest 2017-06-26 11:59:52 -07:00
Joakim Erdfelt 52ded32ea0 Restoring JSR356 Session.setMax*MessageBufferSize() spec behavior 2017-06-26 11:59:51 -07:00
Joakim Erdfelt 9e2b25bae2 Removing bad log silencing technique 2017-06-26 11:59:50 -07:00
Joakim Erdfelt 6f762f645f Hightlighting double-close issue better in logs 2017-06-26 11:59:50 -07:00
Joakim Erdfelt 03dc425fe1 Reader-Self not relevant, removing 2017-06-26 11:59:49 -07:00
Joakim Erdfelt 871e404623 Issue #1616 - Making test more reliable 2017-06-26 11:59:48 -07:00
Joakim Erdfelt 93b565acec Testing / UntrustedWSServer improvements 2017-06-26 11:59:48 -07:00
Joakim Erdfelt 877fdaba8b Correcting error message 2017-06-26 11:59:47 -07:00
Joakim Erdfelt b333fad9c2 Issue #1616 enabling debug output for CI testing 2017-06-26 11:59:46 -07:00
Joakim Erdfelt 4ee342c55e Disabling test in master 2017-06-26 11:59:46 -07:00
Joakim Erdfelt 310bbda38a WebSocket SuspendResume updated tests and notes from review 2017-06-26 11:59:45 -07:00
Joakim Erdfelt 0c8d264ae6 WebSocket Client sending Close/ProtocolError should also see onError 2017-06-26 11:59:44 -07:00
Joakim Erdfelt f36f8fa0b8 Squelching Stacktraces 2017-06-26 11:59:44 -07:00
Joakim Erdfelt 091a79a850 Reviewing more @Ignore'd WebSocket tests 2017-06-26 11:59:43 -07:00
Joakim Erdfelt 61fc95aa36 Issue #1599 - WebSocketClient early close scenarios
+ Connection timeout results in:
  endpoint.onError(WebSocketTimeoutException)
  localSession.close(SHUTDOWN)
2017-06-26 11:59:42 -07:00
Joakim Erdfelt 1ac16dd19b Reduce testing noise 2017-06-26 11:59:42 -07:00
Joakim Erdfelt f3fa1f8d4a Disabling problematic test temporarily 2017-06-26 11:59:41 -07:00
Greg Wilkins 17f6c28c7d Issue #1503 Optionally strip IPv6. Default true 2017-06-26 11:59:40 -07:00
Joakim Erdfelt ccf35e62f4 Adding more leniency on connection fault tests 2017-06-26 11:59:39 -07:00
Joakim Erdfelt 8dbe1798bd WebSocket test fix 2017-06-26 11:59:38 -07:00
Joakim Erdfelt a1d65325fc No more websocket test errors (need to work on issues) 2017-06-26 11:59:38 -07:00
Joakim Erdfelt e3f1fb4bde Fixing javadoc error 2017-06-26 11:59:37 -07:00
Joakim Erdfelt 8f57fe9da9 Fixing merge problems with issue-207 -> master 2017-06-26 11:59:36 -07:00
Joakim Erdfelt b8e10ce9ef Issue #207 - Close Handshake Test refactor 2017-06-26 11:59:35 -07:00
Joakim Erdfelt a8503a2932 Issue #207 - removing scheduler 2017-06-26 11:59:34 -07:00
Joakim Erdfelt 32f478c1cd Issue #207 - stabilizing testcase 2017-06-26 11:59:33 -07:00
Joakim Erdfelt ae2bda4dc8 Post-merge cleanup 2017-06-26 11:59:33 -07:00
Joakim Erdfelt 51363668ed Issue #207 - UntrustedWSServlet should have a slightly higher then default max message size 2017-06-26 11:59:32 -07:00
Joakim Erdfelt 38e8202b9e Issue #207 - Improved testing reliability 2017-06-26 11:59:31 -07:00
Joakim Erdfelt 0e2656b938 Issue #207 - Improved Close notification and testing 2017-06-26 11:59:30 -07:00
Joakim Erdfelt 30595ccdaa Issue #207 - Adding toString() 2017-06-26 11:59:29 -07:00
Joakim Erdfelt c0727348d6 Issue #207 - Identify non-echo client endpoint options for testing 2017-06-26 11:59:29 -07:00
Joakim Erdfelt 135e452509 Issue #207 - Change in test expectation 2017-06-26 11:59:28 -07:00
Joakim Erdfelt 644c14253d Issue #207 - better client connect/upgrade error handling 2017-06-26 11:59:27 -07:00
Joakim Erdfelt 04afed1338 Issue #207 - stabilizing testing of Dispatched MessageSinks 2017-06-26 11:59:26 -07:00
Joakim Erdfelt 8c1d7ed8d5 Issue #207 - test compilation fix 2017-06-26 11:59:25 -07:00
Joakim Erdfelt 55fd254161 Issue #207 - All websocket tests moved to /websocket-tests/ module
# Conflicts:
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
2017-06-26 11:59:09 -07:00
Joakim Erdfelt d43c8e7776 Issue #207 - MessageOutputStream fix 2017-06-26 11:57:26 -07:00
Joakim Erdfelt 239f88c158 Issue #207 - javadoc fix 2017-06-26 11:57:25 -07:00
Joakim Erdfelt 0c8d4dec9f Issue #207 - cleaning up dispatched MessageSink threading 2017-06-26 11:57:24 -07:00
Joakim Erdfelt 8c0d9179cd Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope 2017-06-26 11:57:23 -07:00
Joakim Erdfelt 92573f1f30 Issue #207 - testing JsrSessionTest needs started ClientContainer 2017-06-26 11:57:23 -07:00
Joakim Erdfelt 262781b732 Issue #207 - testing JsrEndpointFunctions need started ClientContainer 2017-06-26 11:57:22 -07:00
Joakim Erdfelt 3931336633 Issue #207 - Restoring fillAndParse callback 2017-06-26 11:57:21 -07:00
Joakim Erdfelt 6b203f5187 Issue #207 - more test fixes 2017-06-26 11:57:20 -07:00
Joakim Erdfelt ad29d65229 Issue #207 - more test induced fixes
# Conflicts:
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/IdleTimeoutTest.java
2017-06-26 11:57:00 -07:00
Joakim Erdfelt 79f30041a1 Issue #207 - More test fixes
# Conflicts:
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/BinaryStreamTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java
2017-06-26 11:55:36 -07:00
Joakim Erdfelt 4a4069d0c2 Issue #207 - more testing updates and mainline code fixes 2017-06-26 11:53:30 -07:00
Joakim Erdfelt c065f7d125 Issue #207 - simplifying OnUpgradeTo prefill + parse, with test 2017-06-26 11:53:29 -07:00
Joakim Erdfelt 92f8f594d1 Issue #207 - removing ignoreBrokenPipe 2017-06-26 11:53:28 -07:00
Joakim Erdfelt 5ab7bf37b2 Issue #207 - websocket-client test cleanup 2017-06-26 11:53:27 -07:00
Joakim Erdfelt 2bab817c6b Issue #207 - common test cleanup 2017-06-26 11:53:26 -07:00
Joakim Erdfelt 9345bc3d5a Issue #207 - more test fixes 2017-06-26 11:53:26 -07:00
Joakim Erdfelt 9fd70d3d6f Issue #207 - more test failure fixes 2017-06-26 11:53:25 -07:00
Joakim Erdfelt 4cea9f307a Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier 2017-06-26 11:53:24 -07:00
Joakim Erdfelt 8e889287fa Issue #207 - Final removal of BlockheadClient
# Conflicts:
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/XBlockheadClient.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RequestHeadersTest.java
2017-06-26 11:52:46 -07:00
Joakim Erdfelt e4790fea72 Issue #207 - Removing BlockheadServer 2017-06-26 11:51:51 -07:00
Joakim Erdfelt 88b2c47904 Issue #207 - moved some JSR356 tests to websocket-tests
# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderTest.java
2017-06-26 11:51:47 -07:00
Joakim Erdfelt 06f204f794 Issue #207 - moved client tests to websocket-tests
# Conflicts:
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java
2017-06-26 11:50:54 -07:00
Joakim Erdfelt 590aa59c37 Issue #207 - fixing javadoc 2017-06-26 11:50:13 -07:00
Joakim Erdfelt 1d18522a99 Issue #207 - allowing untrusted sessions to have non-validating generators 2017-06-26 11:50:13 -07:00
Joakim Erdfelt 36f40689cc Issue #207 - websocket-common test fixes 2017-06-26 11:50:12 -07:00
Joakim Erdfelt 3d6263aafb Issue #207 - more review rework 2017-06-26 11:50:11 -07:00
Joakim Erdfelt 5e8a7078eb Issue #207 - more testing updates 2017-06-26 11:50:10 -07:00
Greg Wilkins 7148db67dc tidy up close 2017-06-26 11:50:09 -07:00
Joakim Erdfelt dddf066e90 Issue #207 - Simplifying Connection and Close states
+ Removing IOState
+ Adding AtomicConnectionState
+ Adding AtomicClose
+ Reworking AbstractWebSocketConnection to be focused solely on
  low level Connection handling, with little to none websocket
  specifics.
+ WebSocketSession simplified
2017-06-26 11:50:08 -07:00
Joakim Erdfelt fcb8693c52 Issue #207 - testcase rework due to new async behaviors
# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/RegexMatcher.java
2017-06-26 11:49:53 -07:00
Joakim Erdfelt 3888cd5347 Issue #207 - improve port handling in URI conversions 2017-06-26 11:43:27 -07:00
Joakim Erdfelt affda23876 Issue #207 - ongoing testing improvements 2017-06-26 11:43:26 -07:00
Joakim Erdfelt b2fa9cd23a Issue #207 - fixing compilation error 2017-06-26 11:43:25 -07:00
Joakim Erdfelt 38fefa6471 Issue #207 - Improved Error Handling 2017-06-26 11:43:24 -07:00
Joakim Erdfelt d5151ddc90 Issue #207 - remove IncomingFrames#incomingError(throwable) 2017-06-26 11:43:22 -07:00
Joakim Erdfelt b93925e03e Issue #207 - more work on policy / buffer behaviors 2017-06-26 11:43:21 -07:00
Joakim Erdfelt aae4a24726 Issue #207 - reworking I/O to allow streaming backpressure 2017-06-26 11:43:20 -07:00
Joakim Erdfelt be747c44e1 Issue #207 - removing unused section 2017-06-26 11:43:19 -07:00
Joakim Erdfelt fa10576bc6 Issue #207 - initial pass through for Stream backpressure 2017-06-26 11:43:18 -07:00
Joakim Erdfelt c3bb6ae535 Issue #207 - Cleaning up Args vs Signature classes
# Conflicts:
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/reflect/ArgSwitch.java
2017-06-26 11:37:11 -07:00
Joakim Erdfelt 2ee819c2c6 Issue #207 - adding addMessageHandler(<lambda>) tests 2017-06-26 11:33:34 -07:00
Joakim Erdfelt 0672f621e5 Issue #207 - Cannot catch PING in JSR356 2017-06-26 11:33:33 -07:00
Joakim Erdfelt 1c4d658be2 Issue #207 - Careful distinction between container policy, vs session policy
# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
2017-06-26 11:33:09 -07:00
Joakim Erdfelt 70d4850ed1 Issue #207 - working @PathParam support 2017-06-26 11:31:42 -07:00
Joakim Erdfelt d8f06df8b2 Fixing master tests (no longer need to specify Configuration) 2017-06-26 11:31:41 -07:00
Joakim Erdfelt 3c790ab64e Issue #207 - fixing EchoTest 2017-06-26 11:31:40 -07:00
Christoph Dreis 41d4b59c19 Precompile pattern for checking of classes in javax package in ReflectUtils
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-06-26 11:31:39 -07:00
Joakim Erdfelt 75c5793f38 Issue #207 - @PathParam support fixes
+ Arg.tag is now exposed for general use
+ JsrEndpointFunctions now decode (into primitives) the URI template
  exposed @PathParam static arguments
+ JsrEndpointFunctions simplified tracking of static args
+ ServerContainer.assertValidEndpoint() now validates
  added endpoints with @PathParam immediately (per spec)
  using a UriTemplate where each variable is an empty string
2017-06-26 11:31:37 -07:00
Joakim Erdfelt f790bf75d8 Issue #207 - prevent overlapping websocket streaming dispatch
+ when FIN==true, wait for dispatch to return before processing
  more frames
2017-06-26 11:31:36 -07:00
Joakim Erdfelt 52a8101cd2 Issue #207 - ensuring WebSocketServerFactory init occurs earlier 2017-06-26 11:31:35 -07:00
Joakim Erdfelt 61dc476342 Removing eclipse detrius 2017-06-26 11:31:34 -07:00
Joakim Erdfelt 527e5f8e4c Issue #207 - improving errors for Encoders/Decoders 2017-06-26 11:31:33 -07:00