5 files changed, 14 insertions, 149 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/Def.py b/lib/asn1/test/asn1_SUITE_data/Def.py
deleted file mode 100644
index ff08ed6386..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Def.py
+++ /dev/null
@@ -1,31 +0,0 @@
-Def DEFINITIONS IMPLICIT TAGS ::= 
-
-BEGIN
-
-Def1 ::=  SEQUENCE 
-{
-  bool0 [0] BOOLEAN,
-  bool1 [1] BOOLEAN DEFAULT false,
-  bool2 [2] BOOLEAN DEFAULT false,
-  bool3 [3] BOOLEAN DEFAULT false
-}
-
-
-Def2 ::=  SEQUENCE 
-{
-  bool10 [10] BOOLEAN,
-  bool11 [11] BOOLEAN DEFAULT false,
-  bool12 [12] BOOLEAN DEFAULT false,
-  bool13 [13] BOOLEAN 
-}
-
-
-Def3 ::=  SEQUENCE 
-{
-  bool30 [30] BOOLEAN DEFAULT false,
-  bool31 [31] BOOLEAN DEFAULT false,
-  bool32 [32] BOOLEAN DEFAULT false,
-  bool33 [33] BOOLEAN DEFAULT false 
-}
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/NullTest.asn1 b/lib/asn1/test/asn1_SUITE_data/NullTest.asn1
new file mode 100644
index 0000000000..041b20a4c1
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/NullTest.asn1
@@ -0,0 +1,14 @@
+NullTest DEFINITIONS ::=
+BEGIN
+
+NullTestData ::= SEQUENCE {
+  body  NullBody,
+  tail  INTEGER
+}
+
+NullBody ::= CHOICE {
+  null    [0] NULL,
+  notNull [1] INTEGER
+}
+
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/Opt.py b/lib/asn1/test/asn1_SUITE_data/Opt.py
deleted file mode 100644
index 48c2a09b64..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Opt.py
+++ /dev/null
@@ -1,31 +0,0 @@
-Opt DEFINITIONS IMPLICIT TAGS ::= 
-
-BEGIN
-
-Opt1 ::=  SEQUENCE 
-{
-  bool0 [0] BOOLEAN,
-  bool1 [1] BOOLEAN OPTIONAL,
-  bool2 [2] BOOLEAN OPTIONAL,
-  bool3 [3] BOOLEAN OPTIONAL
-}
-
-
-Opt2 ::=  SEQUENCE 
-{
-  bool10 [10] BOOLEAN,
-  bool11 [11] BOOLEAN OPTIONAL,
-  bool12 [12] BOOLEAN OPTIONAL,
-  bool13 [13] BOOLEAN 
-}
-
-
-Opt3 ::=  SEQUENCE 
-{
-  bool30 [30] BOOLEAN OPTIONAL,
-  bool31 [31] BOOLEAN OPTIONAL,
-  bool32 [32] BOOLEAN OPTIONAL,
-  bool33 [33] BOOLEAN OPTIONAL 
-}
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqOf.py b/lib/asn1/test/asn1_SUITE_data/SeqOf.py
deleted file mode 100644
index c941418934..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/SeqOf.py
+++ /dev/null
@@ -1,45 +0,0 @@
-SeqOf DEFINITIONS IMPLICIT TAGS ::= 
-
-BEGIN
-
-
-Seq1 ::= SEQUENCE 
-{
-  bool1  BOOLEAN,
-  int1  INTEGER,
-  seq1  SEQUENCE OF SeqIn DEFAULT {}
-}
-
-Seq2 ::= SEQUENCE 
-{
-  seq2  SEQUENCE OF SeqIn DEFAULT {},
-  bool2  BOOLEAN,
-  int2  INTEGER
-}
-
-Seq3 ::= SEQUENCE 
-{
-  bool3  BOOLEAN,
-  seq3  SEQUENCE OF SeqIn DEFAULT {},
-  int3  INTEGER
-}
-
-Seq4 ::= SEQUENCE 
-{
-  seq41 [41] SEQUENCE OF SeqIn DEFAULT {},
-  seq42 [42] SEQUENCE OF SeqIn DEFAULT {},
-  seq43 [43] SEQUENCE OF SeqIn DEFAULT {}
-}
-
-
-
-SeqIn ::= SEQUENCE 
-{
-  boolIn  BOOLEAN,
-  intIn  INTEGER
-}
-
-
-
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/SetOf.py b/lib/asn1/test/asn1_SUITE_data/SetOf.py
deleted file mode 100644
index 4e2ea16fcc..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/SetOf.py
+++ /dev/null
@@ -1,42 +0,0 @@
-SetOf DEFINITIONS IMPLICIT TAGS ::= 
-
-BEGIN
-
-
-Set1 ::= SET 
-{
-  bool1  BOOLEAN,
-  int1  INTEGER,
-  set1  SET OF SetIn DEFAULT {}
-}
-
-Set2 ::= SET 
-{
-  set2  SET OF SetIn DEFAULT {},
-  bool2  BOOLEAN,
-  int2  INTEGER
-}
-
-Set3 ::= SET 
-{
-  bool3  BOOLEAN,
-  set3  SET OF SetIn DEFAULT {},
-  int3  INTEGER
-}
-
-Set4 ::= SET 
-{
-  set41 [41] SET OF SetIn DEFAULT {},
-  set42 [42] SET OF SetIn DEFAULT {},
-  set43 [43] SET OF SetIn DEFAULT {}
-}
-
-
-
-SetIn ::= SET 
-{
-  boolIn  BOOLEAN,
-  intIn  INTEGER
-}
-
-END