Change 'composed-type' to 'composedtype' in test specs

The dash causes difficulties in PHP. (I thought the dash might be a bad idea when I created the tests originally, but for some reason I kept it anyway...)
rjbs · Mar 9, 2011 · 100c5a5 · 100c5a5
1 parent 32fdd35
commit 100c5a5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/perl/t/lib/Test/RxSpec.pm b/perl/t/lib/Test/RxSpec.pm
@@ -80,20 +80,20 @@ sub test_spec {
 
   my $rx = Data::Rx->new;
 
-  if ($schema_test->{'composed-type'}) {
+  if ($schema_test->{'composedtype'}) {
     my $rc =
-      eval { $rx->learn_type($schema_test->{'composed-type'}{'uri'},
-                             $schema_test->{'composed-type'}{'schema'});
+      eval { $rx->learn_type($schema_test->{'composedtype'}{'uri'},
+                             $schema_test->{'composedtype'}{'schema'});
              1 };
     my $error = $@;
 
-    if ($schema_test->{'composed-type'}{'invalid'}) {
+    if ($schema_test->{'composedtype'}{'invalid'}) {
       ok($error && !$rc, "BAD COMPOSED TYPE: $schema_fn");
       return;
     }
 
-    $rx->add_prefix(@{$schema_test->{'composed-type'}{'prefix'}})
-      if $schema_test->{'composed-type'}{'prefix'};
+    $rx->add_prefix(@{$schema_test->{'composedtype'}{'prefix'}})
+      if $schema_test->{'composedtype'}{'prefix'};
   }
 
   my $schema = eval { $rx->make_schema($schema_test->{schema}) };

diff --git a/spec/schemata/composed-person-prefix.json b/spec/schemata/composed-person-prefix.json
@@ -1,5 +1,5 @@
 {
-  "composed-type": {
+  "composedtype": {
     "uri": "tag:www.example.com:types/rx/person",
     "prefix": ["example", "tag:www.example.com:types/rx/"],
     "schema": {

diff --git a/spec/schemata/composed-person.json b/spec/schemata/composed-person.json
@@ -1,5 +1,5 @@
 {
-  "composed-type": {
+  "composedtype": {
     "uri": "tag:www.example.com:types/rx/person",
     "schema": {
       "type": "//rec",

diff --git a/spec/schemata/invalid/composed-cycle.json b/spec/schemata/invalid/composed-cycle.json
@@ -1,5 +1,5 @@
 {
-  "composed-type": {
+  "composedtype": {
     "uri": "tag:www.example.com:rx/cycle",
     "schema": {
       "type": "tag:www.example.com:rx/cycle"

diff --git a/spec/schemata/invalid/composed-invalid.json b/spec/schemata/invalid/composed-invalid.json
@@ -1,5 +1,5 @@
 {
-  "composed-type": {
+  "composedtype": {
     "uri": "tag:www.example.com:rx/person",
     "schema": {
       "type": "//rec",

diff --git a/spec/schemata/invalid/composed-unknown-arg.json b/spec/schemata/invalid/composed-unknown-arg.json
@@ -1,5 +1,5 @@
 {
-  "composed-type": {
+  "composedtype": {
     "uri": "tag:www.example.com:rx/person",
     "schema": {
       "type": "//rec",