Merge branch 'release/0.66'

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.reaktivity</groupId>
   <artifactId>nukleus-tls.spec</artifactId>
-  <version>0.65</version>
+  <version>0.66</version>
   <name>TLS Nukleus Specification</name>
   <description>TLS Nukleus Specification</description>
   <url>https://github.com/reaktivity/nukleus-tls.spec</url>

src/main/scripts/org/reaktivity/specification/nukleus/tls/streams/application/client.sent.write.close.read.closed/client.rpt

@@ -0,0 +1,33 @@
+#
+# Copyright 2016-2021 The Reaktivity Project
+#
+# The Reaktivity Project 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.
+#
+
+connect "nukleus://streams/app#0"
+  option nukleus:window 65536
+  option nukleus:transmission "duplex"
+
+write nukleus:begin.ext ${proxy:beginEx()
+                               .typeId(nukleus:id("proxy"))
+                               .addressNone()
+                                 .build()
+                               .info()
+                                 .authority("localhost")
+                                 .build()
+                               .build()}
+
+connected
+
+write close
+read closed

src/main/scripts/org/reaktivity/specification/nukleus/tls/streams/application/client.sent.write.close.read.closed/server.rpt

@@ -0,0 +1,32 @@
+#
+# Copyright 2016-2021 The Reaktivity Project
+#
+# The Reaktivity Project 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.
+#
+
+accept "nukleus://streams/app#0"
+  option nukleus:window 65536
+  option nukleus:transmission "duplex"
+accepted
+
+read nukleus:begin.ext ${proxy:matchBeginEx()
+                              .typeId(nukleus:id("proxy"))
+                              .info()
+                                .authority("localhost")
+                                .build()
+                              .build()}
+
+connected
+
+read closed
+write close

src/main/scripts/org/reaktivity/specification/nukleus/tls/streams/network/client.sent.write.close.read.closed/client.rpt

@@ -0,0 +1,26 @@
+#
+# Copyright 2016-2021 The Reaktivity Project
+#
+# The Reaktivity Project 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.
+#
+
+connect "tls://localhost:9090"
+  option tls:transport "nukleus://streams/net#0"
+  option tls:trustStoreFile "src/test/democa/client/trust"
+  option tls:trustStorePassword "generated"
+  option nukleus:window 65536
+  option nukleus:transmission "duplex"
+connected
+
+write close
+read closed

src/main/scripts/org/reaktivity/specification/nukleus/tls/streams/network/client.sent.write.close.read.closed/server.rpt

@@ -0,0 +1,27 @@
+#
+# Copyright 2016-2021 The Reaktivity Project
+#
+# The Reaktivity Project 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.
+#
+
+accept "tls://localhost:9090"
+  option tls:transport "nukleus://streams/net#0"
+  option tls:keyStoreFile "src/test/democa/server/keys"
+  option tls:keyStorePassword "generated"
+  option nukleus:window 65536
+  option nukleus:transmission "duplex"
+accepted
+connected
+
+read closed
+write close

src/test/java/org/reaktivity/specification/nukleus/tls/stream/ApplicationIT.java

@@ -174,6 +174,15 @@ public void shouldReceiveClientSentWriteClose() throws Exception
         k3po.finish();
     }
 
+    @Test
+    @Specification({
+        "${app}/client.sent.write.close.read.closed/client",
+        "${app}/client.sent.write.close.read.closed/server"})
+    public void shouldReceiveClientSentWriteCloseReadClosed() throws Exception
+    {
+        k3po.finish();
+    }
+
     @Test
     @Specification({
         "${app}/client.sent.write.close.before.handshake/client",

src/test/java/org/reaktivity/specification/nukleus/tls/stream/NetworkIT.java

@@ -186,6 +186,15 @@ public void shouldReceiveClientSentWriteClose() throws Exception
         k3po.finish();
     }
 
+    @Test
+    @Specification({
+        "${net}/client.sent.write.close.read.closed/client",
+        "${net}/client.sent.write.close.read.closed/server"})
+    public void shouldReceiveClientSentWriteCloseReadClosed() throws Exception
+    {
+        k3po.finish();
+    }
+
     @Test
     @Specification({
         "${net}/server.sent.write.abort/client",