r64793 - in /branches/upstream/libmoosex-nonmoose-perl/current: ./ lib/MooseX/ lib/MooseX/NonMoose/ lib/MooseX/NonMoose/Meta/Role/ t/

ansgar at users.alioth.debian.org ansgar at users.alioth.debian.org
Fri Nov 12 18:22:44 UTC 2010


Author: ansgar
Date: Fri Nov 12 18:22:00 2010
New Revision: 64793

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64793
Log:
[svn-upgrade] new version libmoosex-nonmoose-perl (0.17)

Added:
    branches/upstream/libmoosex-nonmoose-perl/current/t/52-hashref-constructor.t
Removed:
    branches/upstream/libmoosex-nonmoose-perl/current/t/052-hashref-constructor.t
Modified:
    branches/upstream/libmoosex-nonmoose-perl/current/Changes
    branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST
    branches/upstream/libmoosex-nonmoose-perl/current/META.json
    branches/upstream/libmoosex-nonmoose-perl/current/META.yml
    branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL
    branches/upstream/libmoosex-nonmoose-perl/current/README
    branches/upstream/libmoosex-nonmoose-perl/current/dist.ini
    branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm
    branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm
    branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm
    branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm
    branches/upstream/libmoosex-nonmoose-perl/current/t/51-buggy-constructors.t
    branches/upstream/libmoosex-nonmoose-perl/current/t/60-extends-version.t

Modified: branches/upstream/libmoosex-nonmoose-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/Changes?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/Changes (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/Changes Fri Nov 12 18:22:00 2010
@@ -1,4 +1,7 @@
 Revision history for MooseX-NonMoose
+
+0.17  2010-11-08
+      - convert to Test::Fatal, and dep on it
 
 0.16  2010-10-05
       - Make it work with Moose 1.15 (Dave Rolsky).

Modified: branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST Fri Nov 12 18:22:00 2010
@@ -16,7 +16,6 @@
 t/03-attrs.t
 t/04-multi-level.t
 t/05-moose.t
-t/052-hashref-constructor.t
 t/06-disable.t
 t/07-extends-moose-object.t
 t/10-immutable.t
@@ -33,6 +32,7 @@
 t/40-destructor.t
 t/50-buggy-constructor-inlining.t
 t/51-buggy-constructors.t
+t/52-hashref-constructor.t
 t/60-extends-version.t
 t/release-eol.t
 t/release-no-tabs.t

Modified: branches/upstream/libmoosex-nonmoose-perl/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/META.json?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/META.json (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/META.json Fri Nov 12 18:22:00 2010
@@ -4,7 +4,7 @@
       "Jesse Luehrs <doy at tozt dot net>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.102340, CPAN::Meta::Converter version 2.101670",
+   "generated_by" : "Dist::Zilla version 4.102342, CPAN::Meta::Converter version 2.101670",
    "license" : [
       "perl_5"
    ],
@@ -24,6 +24,11 @@
             "List::MoreUtils" : 0,
             "Moose" : "1.15"
          }
+      },
+      "test" : {
+         "requires" : {
+            "Test::Fatal" : 0
+         }
       }
    },
    "release_status" : "stable",
@@ -33,88 +38,88 @@
          "url" : "git://github.com/doy/moosex-nonmoose.git"
       }
    },
-   "version" : "0.16",
+   "version" : "0.17",
    "x_Dist_Zilla" : {
       "plugins" : [
          {
             "class" : "Dist::Zilla::Plugin::GatherDir",
             "name" : "@DOY/GatherDir",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::PruneCruft",
             "name" : "@DOY/PruneCruft",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::ManifestSkip",
             "name" : "@DOY/ManifestSkip",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaYAML",
             "name" : "@DOY/MetaYAML",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::License",
             "name" : "@DOY/License",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::Readme",
             "name" : "@DOY/Readme",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::ExtraTests",
             "name" : "@DOY/ExtraTests",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::ExecDir",
             "name" : "@DOY/ExecDir",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::ShareDir",
             "name" : "@DOY/ShareDir",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::MakeMaker",
             "name" : "@DOY/MakeMaker",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::Manifest",
             "name" : "@DOY/Manifest",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::TestRelease",
             "name" : "@DOY/TestRelease",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::ConfirmRelease",
             "name" : "@DOY/ConfirmRelease",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaConfig",
             "name" : "@DOY/MetaConfig",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaJSON",
             "name" : "@DOY/MetaJSON",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::NextRelease",
             "name" : "@DOY/NextRelease",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::CheckChangesHasContent",
@@ -124,17 +129,17 @@
          {
             "class" : "Dist::Zilla::Plugin::PkgVersion",
             "name" : "@DOY/PkgVersion",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodCoverageTests",
             "name" : "@DOY/PodCoverageTests",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
             "name" : "@DOY/PodSyntaxTests",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::NoTabsTests",
@@ -179,38 +184,49 @@
          {
             "class" : "Dist::Zilla::Plugin::UploadToCPAN",
             "name" : "@DOY/UploadToCPAN",
-            "version" : "4.102340"
-         },
-         {
-            "class" : "Dist::Zilla::Plugin::Prereq",
+            "version" : "4.102342"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs",
             "config" : {
                "Dist::Zilla::Plugin::Prereqs" : {
                   "phase" : "runtime",
                   "type" : "requires"
                }
             },
-            "name" : "Prereq",
-            "version" : "4.102340"
+            "name" : "Prereqs",
+            "version" : "4.102342"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs",
+            "config" : {
+               "Dist::Zilla::Plugin::Prereqs" : {
+                  "phase" : "test",
+                  "type" : "requires"
+               }
+            },
+            "name" : "TestRequires",
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":InstallModules",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":TestFiles",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ExecFiles",
-            "version" : "4.102340"
+            "version" : "4.102342"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ShareFiles",
-            "version" : "4.102340"
+            "version" : "4.102342"
          }
       ],
       "zilla" : {
@@ -218,7 +234,7 @@
          "config" : {
             "is_trial" : 0
          },
-         "version" : "4.102340"
+         "version" : "4.102342"
       }
    }
 }

Modified: branches/upstream/libmoosex-nonmoose-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/META.yml?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/META.yml (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/META.yml Fri Nov 12 18:22:00 2010
@@ -2,11 +2,12 @@
 abstract: 'easy subclassing of non-Moose classes'
 author:
   - 'Jesse Luehrs <doy at tozt dot net>'
-build_requires: {}
+build_requires:
+  Test::Fatal: 0
 configure_requires:
   ExtUtils::MakeMaker: 6.31
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.102340, CPAN::Meta::Converter version 2.101670'
+generated_by: 'Dist::Zilla version 4.102342, CPAN::Meta::Converter version 2.101670'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -17,73 +18,73 @@
   Moose: 1.15
 resources:
   repository: git://github.com/doy/moosex-nonmoose.git
-version: 0.16
+version: 0.17
 x_Dist_Zilla:
   plugins:
     -
       class: Dist::Zilla::Plugin::GatherDir
       name: '@DOY/GatherDir'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::PruneCruft
       name: '@DOY/PruneCruft'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::ManifestSkip
       name: '@DOY/ManifestSkip'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::MetaYAML
       name: '@DOY/MetaYAML'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::License
       name: '@DOY/License'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::Readme
       name: '@DOY/Readme'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::ExtraTests
       name: '@DOY/ExtraTests'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::ExecDir
       name: '@DOY/ExecDir'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::ShareDir
       name: '@DOY/ShareDir'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::MakeMaker
       name: '@DOY/MakeMaker'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::Manifest
       name: '@DOY/Manifest'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::TestRelease
       name: '@DOY/TestRelease'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::ConfirmRelease
       name: '@DOY/ConfirmRelease'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::MetaConfig
       name: '@DOY/MetaConfig'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::MetaJSON
       name: '@DOY/MetaJSON'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::NextRelease
       name: '@DOY/NextRelease'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::CheckChangesHasContent
       name: '@DOY/CheckChangesHasContent'
@@ -91,15 +92,15 @@
     -
       class: Dist::Zilla::Plugin::PkgVersion
       name: '@DOY/PkgVersion'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::PodCoverageTests
       name: '@DOY/PodCoverageTests'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::PodSyntaxTests
       name: '@DOY/PodSyntaxTests'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::NoTabsTests
       name: '@DOY/NoTabsTests'
@@ -135,33 +136,41 @@
     -
       class: Dist::Zilla::Plugin::UploadToCPAN
       name: '@DOY/UploadToCPAN'
-      version: 4.102340
+      version: 4.102342
     -
-      class: Dist::Zilla::Plugin::Prereq
+      class: Dist::Zilla::Plugin::Prereqs
       config:
         Dist::Zilla::Plugin::Prereqs:
           phase: runtime
           type: requires
-      name: Prereq
-      version: 4.102340
+      name: Prereqs
+      version: 4.102342
+    -
+      class: Dist::Zilla::Plugin::Prereqs
+      config:
+        Dist::Zilla::Plugin::Prereqs:
+          phase: test
+          type: requires
+      name: TestRequires
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':InstallModules'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':TestFiles'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ExecFiles'
-      version: 4.102340
+      version: 4.102342
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ShareFiles'
-      version: 4.102340
+      version: 4.102342
   zilla:
     class: Dist::Zilla::Dist::Builder
     config:
       is_trial: 0
-    version: 4.102340
+    version: 4.102342

Modified: branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL Fri Nov 12 18:22:00 2010
@@ -11,7 +11,9 @@
 my %WriteMakefileArgs = (
   'ABSTRACT' => 'easy subclassing of non-Moose classes',
   'AUTHOR' => 'Jesse Luehrs <doy at tozt dot net>',
-  'BUILD_REQUIRES' => {},
+  'BUILD_REQUIRES' => {
+    'Test::Fatal' => '0'
+  },
   'CONFIGURE_REQUIRES' => {
     'ExtUtils::MakeMaker' => '6.31'
   },
@@ -23,7 +25,7 @@
     'List::MoreUtils' => '0',
     'Moose' => '1.15'
   },
-  'VERSION' => '0.16',
+  'VERSION' => '0.17',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: branches/upstream/libmoosex-nonmoose-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/README?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/README (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/README Fri Nov 12 18:22:00 2010
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution MooseX-NonMoose,
-version 0.16:
+version 0.17:
 
   easy subclassing of non-Moose classes
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/dist.ini
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/dist.ini?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/dist.ini (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/dist.ini Fri Nov 12 18:22:00 2010
@@ -6,6 +6,9 @@
 [@DOY]
 dist = MooseX-NonMoose
 
-[Prereq]
+[Prereqs]
 Moose           = 1.15
 List::MoreUtils = 0
+
+[Prereqs / TestRequires]
+Test::Fatal = 0

Modified: branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm Fri Nov 12 18:22:00 2010
@@ -1,6 +1,6 @@
 package MooseX::NonMoose;
 BEGIN {
-  $MooseX::NonMoose::VERSION = '0.16';
+  $MooseX::NonMoose::VERSION = '0.17';
 }
 use Moose::Exporter;
 # ABSTRACT: easy subclassing of non-Moose classes
@@ -35,7 +35,7 @@
 
 =head1 VERSION
 
-version 0.16
+version 0.17
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm Fri Nov 12 18:22:00 2010
@@ -1,6 +1,6 @@
 package MooseX::NonMoose::InsideOut;
 BEGIN {
-  $MooseX::NonMoose::InsideOut::VERSION = '0.16';
+  $MooseX::NonMoose::InsideOut::VERSION = '0.17';
 }
 use Moose::Exporter;
 # ABSTRACT: easy subclassing of non-Moose non-hashref classes
@@ -36,7 +36,7 @@
 
 =head1 VERSION
 
-version 0.16
+version 0.17
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm Fri Nov 12 18:22:00 2010
@@ -1,6 +1,6 @@
 package MooseX::NonMoose::Meta::Role::Class;
 BEGIN {
-  $MooseX::NonMoose::Meta::Role::Class::VERSION = '0.16';
+  $MooseX::NonMoose::Meta::Role::Class::VERSION = '0.17';
 }
 use Moose::Role;
 use List::MoreUtils qw(any);
@@ -215,7 +215,7 @@
 
 =head1 VERSION
 
-version 0.16
+version 0.17
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm Fri Nov 12 18:22:00 2010
@@ -1,6 +1,6 @@
 package MooseX::NonMoose::Meta::Role::Constructor;
 BEGIN {
-  $MooseX::NonMoose::Meta::Role::Constructor::VERSION = '0.16';
+  $MooseX::NonMoose::Meta::Role::Constructor::VERSION = '0.17';
 }
 use Moose::Role;
 # ABSTRACT: constructor method trait for L<MooseX::NonMoose>
@@ -99,7 +99,7 @@
 
 =head1 VERSION
 
-version 0.16
+version 0.17
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/t/51-buggy-constructors.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/t/51-buggy-constructors.t?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/t/51-buggy-constructors.t (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/t/51-buggy-constructors.t Fri Nov 12 18:22:00 2010
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use Test::More;
-use Test::Exception;
+use Test::Fatal;
 use Test::Moose;
 
 {
@@ -21,9 +21,8 @@
 
 with_immutable {
     my $foo;
-    lives_ok {
-        $foo = Foo::Sub->new;
-    } "subclassing nonmoose classes with correct constructors works";
+    is(exception { $foo = Foo::Sub->new }, undef,
+       "subclassing nonmoose classes with correct constructors works");
     isa_ok($foo, 'Foo');
     isa_ok($foo, 'Foo::Sub');
 } 'Foo::Sub';
@@ -44,9 +43,8 @@
 
 with_immutable {
     my $foo;
-    lives_ok {
-        $foo = BadFoo::Sub->new;
-    } "subclassing nonmoose classes with incorrect constructors works";
+    is(exception { $foo = BadFoo::Sub->new }, undef,
+       "subclassing nonmoose classes with incorrect constructors works");
     isa_ok($foo, 'BadFoo');
     isa_ok($foo, 'BadFoo::Sub');
 } 'BadFoo::Sub';
@@ -67,10 +65,9 @@
 
 with_immutable {
     my $foo;
-    throws_ok {
-        $foo = BadFoo2::Sub->new;
-    } qr/\QThe constructor for BadFoo2 did not return a blessed instance/,
-      "subclassing nonmoose classes with incorrect constructors dies properly";
+    like(exception { $foo = BadFoo2::Sub->new; },
+         qr/\QThe constructor for BadFoo2 did not return a blessed instance/,
+         "subclassing nonmoose classes with incorrect constructors dies properly");
 } 'BadFoo2::Sub';
 
 {
@@ -89,10 +86,9 @@
 
 with_immutable {
     my $foo;
-    throws_ok {
-        $foo = BadFoo3::Sub->new;
-    } qr/\QThe constructor for BadFoo3 returned an object whose class is not a parent of BadFoo3::Sub/,
-      "subclassing nonmoose classes with incorrect constructors dies properly";
+    like(exception { $foo = BadFoo3::Sub->new },
+         qr/\QThe constructor for BadFoo3 returned an object whose class is not a parent of BadFoo3::Sub/,
+         "subclassing nonmoose classes with incorrect constructors dies properly");
 } 'BadFoo3::Sub';
 
 done_testing;

Added: branches/upstream/libmoosex-nonmoose-perl/current/t/52-hashref-constructor.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/t/52-hashref-constructor.t?rev=64793&op=file
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/t/52-hashref-constructor.t (added)
+++ branches/upstream/libmoosex-nonmoose-perl/current/t/52-hashref-constructor.t Fri Nov 12 18:22:00 2010
@@ -1,0 +1,67 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+use Test::Fatal;
+
+{
+    package Foo;
+
+    sub new {
+        my $class = shift;
+        bless { ref($_[0]) ? %{$_[0]} : @_ }, $class;
+    }
+
+    sub foo {
+        my $self = shift;
+        $self->{foo};
+    }
+}
+
+{
+    package Bar;
+    use Moose;
+    use MooseX::NonMoose;
+
+    extends 'Foo';
+
+    has _bar => (
+        init_arg => 'bar',
+        reader   => 'bar',
+    );
+
+    __PACKAGE__->meta->make_immutable;
+}
+
+{
+    package Baz;
+    use Moose;
+
+    extends 'Bar';
+
+    has _baz => (
+        init_arg => 'baz',
+        reader   => 'baz',
+    );
+}
+
+{
+    my $baz;
+    is(exception { $baz = Baz->new( foo => 1, bar => 2, baz => 3 ) }, undef,
+       "constructor lives");
+    is($baz->foo, 1, "foo set");
+    is($baz->bar, 2, "bar set");
+    is($baz->baz, 3, "baz set");
+
+}
+
+{
+    my $baz;
+    is(exception { $baz = Baz->new({foo => 1, bar => 2, baz => 3}) }, undef,
+       "constructor lives (hashref)");
+    is($baz->foo, 1, "foo set (hashref)");
+    is($baz->bar, 2, "bar set (hashref)");
+    is($baz->baz, 3, "baz set (hashref)");
+}
+
+done_testing;

Modified: branches/upstream/libmoosex-nonmoose-perl/current/t/60-extends-version.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/t/60-extends-version.t?rev=64793&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/t/60-extends-version.t (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/t/60-extends-version.t Fri Nov 12 18:22:00 2010
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use Test::More;
-use Test::Exception;
+use Test::Fatal;
 
 {
     package Foo;
@@ -14,8 +14,8 @@
     package Bar;
     use Moose;
     use MooseX::NonMoose;
-    ::lives_ok { extends 'Foo' => { -version => '0.02' } }
-               "specifying arguments to superclasses doesn't break";
+    ::is(::exception { extends 'Foo' => { -version => '0.02' } }, undef,
+         "specifying arguments to superclasses doesn't break");
 }
 
 done_testing;




More information about the Pkg-perl-cvs-commits mailing list