summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorvalmat <ufabiz@gmail.com>2014-04-06 00:10:59 +0600
committervalmat <ufabiz@gmail.com>2014-04-06 00:10:59 +0600
commitcdae9845ac7c223d12bafc0fcd146cfae2c61363 (patch)
tree99b1a2a30734fcfb5286e432cbae5d15258ae596 /tests
parent61374e5ddd285f9a125a52005ad7eaefd3585f02 (diff)
Changed the test php/phpt/class_obj/005-static-prop.phpt Included checking the static properties:
https://github.com/CopernicaMarketingSoftware/PHP-CPP/commit/ffdccb83d460791202bdb258dbb9106da877da3b
Diffstat (limited to 'tests')
-rw-r--r--tests/cpp/main.cpp7
-rw-r--r--tests/php/dbg.php12
-rw-r--r--tests/php/phpt/class_obj/004-static-prop.phpt19
-rw-r--r--tests/php/phpt/class_obj/005-static-prop.phpt32
4 files changed, 50 insertions, 20 deletions
diff --git a/tests/cpp/main.cpp b/tests/cpp/main.cpp
index 6d1eab3..84d95d8 100644
--- a/tests/cpp/main.cpp
+++ b/tests/cpp/main.cpp
@@ -52,7 +52,12 @@ extern "C"
customClass.property("CONSTANT1", "some string", Php::Const);
customClass.property("EXP", 2.718281828459, Php::Const);
customClass.property("CONSTANT2", -2582341, Php::Const);
- customClass.property("CONSTANT1", true, Php::Const);
+ customClass.property("CONSTANT3", true, Php::Const);
+
+ customClass.property("StatProp1", "some string", Php::Static);
+ customClass.property("Exp", 2.718281828459, Php::Static);
+ customClass.property("StatProp2", -2582341, Php::Static);
+ customClass.property("StatProp3", true, Php::Static);
// add the class to the extension
extension.add(customClass);
diff --git a/tests/php/dbg.php b/tests/php/dbg.php
index 2040f01..003c494 100644
--- a/tests/php/dbg.php
+++ b/tests/php/dbg.php
@@ -12,3 +12,15 @@
+
+var_dump( TestBaseClass\MyClass::CONSTANT1 );
+var_dump( TestBaseClass\MyClass::EXP );
+var_dump( TestBaseClass\MyClass::CONSTANT2 );
+var_dump( TestBaseClass\MyClass::CONSTANT3 );
+
+var_dump( TestBaseClass\MyClass::$StatProp1 );
+var_dump( TestBaseClass\MyClass::$Exp );
+var_dump( TestBaseClass\MyClass::$StatProp2 );
+var_dump( TestBaseClass\MyClass::$StatProp3 );
+TestBaseClass\MyClass::$StatProp2 = "otherval";
+var_dump( TestBaseClass\MyClass::$StatProp2 );
diff --git a/tests/php/phpt/class_obj/004-static-prop.phpt b/tests/php/phpt/class_obj/004-static-prop.phpt
deleted file mode 100644
index 4073247..0000000
--- a/tests/php/phpt/class_obj/004-static-prop.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Test class with static property and class constant
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-
-var_dump( TestBaseClass\MyClass::CONSTANT1 );
-var_dump( TestBaseClass\MyClass::EXP );
-var_dump( TestBaseClass\MyClass::CONSTANT2 );
-var_dump( TestBaseClass\MyClass::CONSTANT1 );
-
-
-//echo PHP_EOL;
---EXPECT--
-bool(true)
-float(2.718281828459)
-int(-2582341)
-bool(true) \ No newline at end of file
diff --git a/tests/php/phpt/class_obj/005-static-prop.phpt b/tests/php/phpt/class_obj/005-static-prop.phpt
new file mode 100644
index 0000000..c0aa2ef
--- /dev/null
+++ b/tests/php/phpt/class_obj/005-static-prop.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Test class with static property and class constant
+--SKIPIF--
+<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
+--FILEEOF--
+<?php
+
+
+var_dump( TestBaseClass\MyClass::CONSTANT1 );
+var_dump( TestBaseClass\MyClass::EXP );
+var_dump( TestBaseClass\MyClass::CONSTANT2 );
+var_dump( TestBaseClass\MyClass::CONSTANT3 );
+
+var_dump( TestBaseClass\MyClass::$StatProp1 );
+var_dump( TestBaseClass\MyClass::$Exp );
+var_dump( TestBaseClass\MyClass::$StatProp2 );
+var_dump( TestBaseClass\MyClass::$StatProp3 );
+TestBaseClass\MyClass::$StatProp2 = "otherval";
+var_dump( TestBaseClass\MyClass::$StatProp2 );
+
+
+//echo PHP_EOL;
+--EXPECT--
+string(11) "some string"
+float(2.718281828459)
+int(-2582341)
+bool(true)
+string(11) "some string"
+float(2.718281828459)
+int(-2582341)
+bool(true)
+string(8) "otherval" \ No newline at end of file