You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2016/03/10 14:35:23 UTC
[06/12] lucy-clownfish git commit: Remove Perl test t/502-clash.t
Remove Perl test t/502-clash.t
This test is part of C test suite now.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/df605b50
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/df605b50
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/df605b50
Branch: refs/heads/master
Commit: df605b501d441251871450f9f46ab11b601781f4
Parents: e3ecf10
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Mar 5 18:17:00 2016 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Mar 5 18:18:36 2016 +0100
----------------------------------------------------------------------
compiler/perl/t/502-clash.t | 108 -------------------
compiler/perl/t/cfclash/bar/Bar.cfh | 25 -----
compiler/perl/t/cfclash/bar/Bar.cfp | 4 -
compiler/perl/t/cfclash/bar/Baz.cfh | 25 -----
.../perl/t/cfclash/class/Animal/DogClash.cfh | 28 -----
.../perl/t/cfclash/class/AnimalExtension.cfp | 5 -
compiler/perl/t/cfclash/file/Animal/Dog.cfh | 28 -----
compiler/perl/t/cfclash/foo/Foo.cfh | 25 -----
compiler/perl/t/cfclash/foo/Foo.cfp | 4 -
9 files changed, 252 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/502-clash.t
----------------------------------------------------------------------
diff --git a/compiler/perl/t/502-clash.t b/compiler/perl/t/502-clash.t
deleted file mode 100644
index 4cf870b..0000000
--- a/compiler/perl/t/502-clash.t
+++ /dev/null
@@ -1,108 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF 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.
-
-use strict;
-use warnings;
-
-use Test::More tests => 4;
-
-use Clownfish::CFC::Model::Hierarchy;
-use File::Spec::Functions qw( catdir catfile splitpath );
-use File::Path qw( rmtree );
-
-my $base_dir = catdir(qw( t cfbase ));
-my $ext_dir = catdir(qw( t cfext ));
-my $dest_dir = catdir(qw( t cfdest ));
-my $class_clash_dir = catdir(qw( t cfclash class ));
-my $file_clash_dir = catdir(qw( t cfclash file ));
-
-SKIP: {
- skip( 'Exceptions leak', 1 )
- if $ENV{LUCY_VALGRIND};
-
- my $hierarchy = Clownfish::CFC::Model::Hierarchy->new(dest => $dest_dir);
-
- $hierarchy->add_source_dir($base_dir);
- $hierarchy->add_source_dir($file_clash_dir);
-
- eval { $hierarchy->build; };
-
- my $filename = catfile(qw( Animal Dog.cfh ));
- like( $@, qr|\Q$filename\E .* \Q$base_dir\E .* \Q$file_clash_dir\E|,
- "source/source filename clash" );
-
- Clownfish::CFC::Model::Class->_clear_registry();
- Clownfish::CFC::Model::Parcel->reap_singletons();
-}
-
-SKIP: {
- skip( 'Exceptions leak', 1 )
- if $ENV{LUCY_VALGRIND};
-
- my $hierarchy = Clownfish::CFC::Model::Hierarchy->new(dest => $dest_dir);
-
- $hierarchy->add_source_dir($class_clash_dir);
- $hierarchy->add_include_dir($base_dir);
-
- eval { $hierarchy->build; };
-
- like( $@, qr/Two classes with name/, "source/include class name clash" );
-
- Clownfish::CFC::Model::Class->_clear_registry();
- Clownfish::CFC::Model::Parcel->reap_singletons();
-}
-
-{
- my $hierarchy = Clownfish::CFC::Model::Hierarchy->new(dest => $dest_dir);
-
- $hierarchy->add_source_dir($base_dir);
- $hierarchy->add_include_dir($file_clash_dir);
-
- $hierarchy->build;
-
- my $classes = $hierarchy->ordered_classes;
- is( scalar @$classes, 4, "source/include filename clash" );
-
- Clownfish::CFC::Model::Class->_clear_registry();
- Clownfish::CFC::Model::Parcel->reap_singletons();
-}
-
-# Parcel/class include mismatch
-
-my $foo_dir = catdir(qw( t cfclash foo ));
-my $bar_dir = catdir(qw( t cfclash bar ));
-
-SKIP: {
- skip( 'Exceptions leak', 1 )
- if $ENV{LUCY_VALGRIND};
-
- my $hierarchy = Clownfish::CFC::Model::Hierarchy->new(dest => $dest_dir);
-
- $hierarchy->add_source_dir($bar_dir);
- $hierarchy->add_include_dir($foo_dir);
- $hierarchy->add_include_dir($base_dir);
-
- eval { $hierarchy->build; };
-
- like( $@, qr/Class .* from source dir .* parcel .* from include dir/,
- "source class with included parcel" );
-
- Clownfish::CFC::Model::Class->_clear_registry();
- Clownfish::CFC::Model::Parcel->reap_singletons();
-}
-
-# Clean up.
-rmtree($dest_dir);
-
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/cfclash/bar/Bar.cfh
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfclash/bar/Bar.cfh b/compiler/perl/t/cfclash/bar/Bar.cfh
deleted file mode 100644
index 89e798e..0000000
--- a/compiler/perl/t/cfclash/bar/Bar.cfh
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.
- */
-
-parcel Bar;
-
-public class Bar inherits Clownfish::Obj {
- int var;
-
- public void
- Method(Bar *self);
-}
-
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/cfclash/bar/Bar.cfp
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfclash/bar/Bar.cfp b/compiler/perl/t/cfclash/bar/Bar.cfp
deleted file mode 100644
index e5868f6..0000000
--- a/compiler/perl/t/cfclash/bar/Bar.cfp
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "name": "Bar",
- "version": "v1.0.0"
-}
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/cfclash/bar/Baz.cfh
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfclash/bar/Baz.cfh b/compiler/perl/t/cfclash/bar/Baz.cfh
deleted file mode 100644
index 00e4033..0000000
--- a/compiler/perl/t/cfclash/bar/Baz.cfh
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.
- */
-
-parcel Foo;
-
-public class Baz inherits Clownfish::Obj {
- int var;
-
- public void
- Method(Baz *self);
-}
-
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/cfclash/class/Animal/DogClash.cfh
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfclash/class/Animal/DogClash.cfh b/compiler/perl/t/cfclash/class/Animal/DogClash.cfh
deleted file mode 100644
index 3eba020..0000000
--- a/compiler/perl/t/cfclash/class/Animal/DogClash.cfh
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.
- */
-
-parcel AnimalExtension;
-
-class Animal::Dog inherits Clownfish::Obj {
- public inert incremented Dog*
- new();
-
- public inert Dog*
- init(Dog *self);
-
- public void
- Bark(Dog *self);
-}
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/cfclash/class/AnimalExtension.cfp
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfclash/class/AnimalExtension.cfp b/compiler/perl/t/cfclash/class/AnimalExtension.cfp
deleted file mode 100644
index 76f31d3..0000000
--- a/compiler/perl/t/cfclash/class/AnimalExtension.cfp
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "name": "AnimalExtension",
- "nickname": "AniExt",
- "version": "v0.1.0"
-}
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/cfclash/file/Animal/Dog.cfh
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfclash/file/Animal/Dog.cfh b/compiler/perl/t/cfclash/file/Animal/Dog.cfh
deleted file mode 100644
index 1357109..0000000
--- a/compiler/perl/t/cfclash/file/Animal/Dog.cfh
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.
- */
-
-parcel Animal;
-
-class Animal::AnotherDog inherits Animal {
- public inert incremented AnotherDog*
- new();
-
- public inert AnotherDog*
- init(AnotherDog *self);
-
- public void
- Bark(AnotherDog *self);
-}
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/cfclash/foo/Foo.cfh
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfclash/foo/Foo.cfh b/compiler/perl/t/cfclash/foo/Foo.cfh
deleted file mode 100644
index b770d8a..0000000
--- a/compiler/perl/t/cfclash/foo/Foo.cfh
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.
- */
-
-parcel Foo;
-
-public class Foo inherits Clownfish::Obj {
- int var;
-
- public void
- Method(Foo *self);
-}
-
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/df605b50/compiler/perl/t/cfclash/foo/Foo.cfp
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfclash/foo/Foo.cfp b/compiler/perl/t/cfclash/foo/Foo.cfp
deleted file mode 100644
index 2995169..0000000
--- a/compiler/perl/t/cfclash/foo/Foo.cfp
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "name": "Foo",
- "version": "v1.0.0"
-}