Fixes #393. Name and value are mandatory for Cookie now. Also value check added
diff --git a/LibTest/io/Cookie/Cookie_A01_t01.dart b/LibTest/io/Cookie/Cookie_A01_t01.dart
index 2cce21e..e698e3e 100644
--- a/LibTest/io/Cookie/Cookie_A01_t01.dart
+++ b/LibTest/io/Cookie/Cookie_A01_t01.dart
@@ -4,11 +4,10 @@
* BSD-style license that can be found in the LICENSE file.
*/
/**
- * @assertion Cookie([String name, String value])
+ * @assertion Cookie(String name, String value)
* Creates a new cookie optionally setting the name and value.
* By default the value of httpOnly will be set to true.
- * @description Checks that this constructor creates a new Cookie object. Test
- * default parameters
+ * @description Checks that it is a runtime exception if name is null
* @issue 29463
* @author sgrekhov@unipro.ru
*/
@@ -16,8 +15,7 @@
import "../../../Utils/expect.dart";
main() {
- Cookie cookie = new Cookie();
- Expect.isNull(cookie.name);
- Expect.isNull(cookie.value);
- Expect.isTrue(cookie.httpOnly);
+ Expect.throws(() {
+ new Cookie(null, "some value");
+ });
}
diff --git a/LibTest/io/Cookie/Cookie_A01_t02.dart b/LibTest/io/Cookie/Cookie_A01_t02.dart
index 05629ff..98fd3f2 100644
--- a/LibTest/io/Cookie/Cookie_A01_t02.dart
+++ b/LibTest/io/Cookie/Cookie_A01_t02.dart
@@ -4,20 +4,28 @@
* BSD-style license that can be found in the LICENSE file.
*/
/**
- * @assertion Cookie([String name, String value])
- * Creates a new cookie optionally setting the name and value.
+ * @assertion Cookie(String name, String value)
+ * Creates a new cookie setting the name and value.
* By default the value of httpOnly will be set to true.
- * @description Checks that this constructor creates a new Cookie object. Test
- * name parameter
+ * @description Checks that it is runtime error if cookie value is invalid (see
+ * https://tools.ietf.org/html/rfc6265)
* @issue 29463
* @author sgrekhov@unipro.ru
*/
import "dart:io";
import "../../../Utils/expect.dart";
+const invalidCharacters = [0x20, 0x22, 0x2C, 0x3B, 0x5C, 0x7F];
+
main() {
- Cookie cookie = new Cookie("cname");
- Expect.equals("cname", cookie.name);
- Expect.isNull(cookie.value);
- Expect.isTrue(cookie.httpOnly);
+ Expect.throws(() {new Cookie("cname", '"');});
+ Expect.throws(() {new Cookie("cname", 'v"v');});
+ Expect.throws(() {new Cookie("cname", '"v');});
+ Expect.throws(() {new Cookie("cname", 'v"');});
+ Expect.throws(() {new Cookie("cname", 's"s');});
+ for (int charCode in invalidCharacters) {
+ String v = new String.fromCharCode(charCode);
+ Expect.throws(() {new Cookie("cname", v);}, null,
+ "Exception expected for character $v ($charCode)");
+ }
}
diff --git a/LibTest/io/Cookie/Cookie_A01_t03.dart b/LibTest/io/Cookie/Cookie_A01_t03.dart
index 48364c2..533d600 100644
--- a/LibTest/io/Cookie/Cookie_A01_t03.dart
+++ b/LibTest/io/Cookie/Cookie_A01_t03.dart
@@ -4,8 +4,8 @@
* BSD-style license that can be found in the LICENSE file.
*/
/**
- * @assertion Cookie([String name, String value])
- * Creates a new cookie optionally setting the name and value.
+ * @assertion Cookie(String name, String value)
+ * Creates a new cookie setting the name and value.
* By default the value of httpOnly will be set to true.
* @description Checks that this constructor creates a new Cookie object. Test
* name and value parameters
diff --git a/LibTest/io/Cookie/Cookie_A01_t04.dart b/LibTest/io/Cookie/Cookie_A01_t04.dart
index d6be9d5e..e0c6ce4 100644
--- a/LibTest/io/Cookie/Cookie_A01_t04.dart
+++ b/LibTest/io/Cookie/Cookie_A01_t04.dart
@@ -4,8 +4,8 @@
* BSD-style license that can be found in the LICENSE file.
*/
/**
- * @assertion Cookie([String name, String value])
- * Creates a new cookie optionally setting the name and value.
+ * @assertion Cookie(String name, String value)
+ * Creates a new cookie setting the name and value.
* By default the value of httpOnly will be set to true.
* @description Checks that this constructor creates a new Cookie object. Test
* empty name and value parameters
diff --git a/LibTest/io/Cookie/Cookie_A01_t05.dart b/LibTest/io/Cookie/Cookie_A01_t05.dart
index d109af5..ac3ab94 100644
--- a/LibTest/io/Cookie/Cookie_A01_t05.dart
+++ b/LibTest/io/Cookie/Cookie_A01_t05.dart
@@ -4,8 +4,8 @@
* BSD-style license that can be found in the LICENSE file.
*/
/**
- * @assertion Cookie([String name, String value])
- * Creates a new cookie optionally setting the name and value.
+ * @assertion Cookie(String name, String value)
+ * Creates a new cookie setting the name and value.
* By default the value of httpOnly will be set to true.
* @description Checks that this constructor creates a new Cookie object. Test
* character not allowed for cookie name (see
