Index: test/unittests/runtime/runtime-interpreter-unittest.cc |
diff --git a/test/unittests/runtime/runtime-interpreter-unittest.cc b/test/unittests/runtime/runtime-interpreter-unittest.cc |
index 97b7992af9fd750f116f89c5ce4b1ed458262954..c10ddcd3191374b05f1ddebdc883201f91c878d7 100644 |
--- a/test/unittests/runtime/runtime-interpreter-unittest.cc |
+++ b/test/unittests/runtime/runtime-interpreter-unittest.cc |
@@ -23,12 +23,6 @@ class RuntimeInterpreterTest : public TestWithIsolateAndZone { |
bool TestOperatorWithObjects(RuntimeMethod method, Handle<Object> lhs, |
Handle<Object> rhs, bool expected); |
- bool TestOperator(RuntimeMethod method, int32_t lhs, int32_t rhs, |
- bool expected); |
- bool TestOperator(RuntimeMethod method, double lhs, double rhs, |
- bool expected); |
- bool TestOperator(RuntimeMethod method, const char* lhs, const char* rhs, |
- bool expected); |
}; |
@@ -44,99 +38,6 @@ bool RuntimeInterpreterTest::TestOperatorWithObjects(RuntimeMethod method, |
} |
-bool RuntimeInterpreterTest::TestOperator(RuntimeMethod method, int32_t lhs, |
- int32_t rhs, bool expected) { |
- Handle<Object> x = isolate()->factory()->NewNumberFromInt(lhs); |
- Handle<Object> y = isolate()->factory()->NewNumberFromInt(rhs); |
- return TestOperatorWithObjects(method, x, y, expected); |
-} |
- |
- |
-bool RuntimeInterpreterTest::TestOperator(RuntimeMethod method, double lhs, |
- double rhs, bool expected) { |
- Handle<Object> x = isolate()->factory()->NewNumber(lhs); |
- Handle<Object> y = isolate()->factory()->NewNumber(rhs); |
- CHECK_EQ(HeapNumber::cast(*x)->value(), lhs); |
- CHECK_EQ(HeapNumber::cast(*y)->value(), rhs); |
- return TestOperatorWithObjects(method, x, y, expected); |
-} |
- |
- |
-bool RuntimeInterpreterTest::TestOperator(RuntimeMethod method, const char* lhs, |
- const char* rhs, bool expected) { |
- Handle<Object> x = isolate()->factory()->NewStringFromAsciiChecked(lhs); |
- Handle<Object> y = isolate()->factory()->NewStringFromAsciiChecked(rhs); |
- return TestOperatorWithObjects(method, x, y, expected); |
-} |
- |
- |
-TEST_F(RuntimeInterpreterTest, TestOperatorsWithIntegers) { |
- int32_t inputs[] = {kMinInt, Smi::kMinValue, -17, -1, 0, 1, |
- 991, Smi::kMaxValue, kMaxInt}; |
- TRACED_FOREACH(int, lhs, inputs) { |
- TRACED_FOREACH(int, rhs, inputs) { |
-#define INTEGER_OPERATOR_CHECK(r, op, x, y) \ |
- CHECK(TestOperator(Runtime_Interpreter##r, x, y, x op y)) |
- INTEGER_OPERATOR_CHECK(Equals, ==, lhs, rhs); |
- INTEGER_OPERATOR_CHECK(NotEquals, !=, lhs, rhs); |
- INTEGER_OPERATOR_CHECK(StrictEquals, ==, lhs, rhs); |
- INTEGER_OPERATOR_CHECK(StrictNotEquals, !=, lhs, rhs); |
- INTEGER_OPERATOR_CHECK(LessThan, <, lhs, rhs); |
- INTEGER_OPERATOR_CHECK(GreaterThan, >, lhs, rhs); |
- INTEGER_OPERATOR_CHECK(LessThanOrEqual, <=, lhs, rhs); |
- INTEGER_OPERATOR_CHECK(GreaterThanOrEqual, >=, lhs, rhs); |
-#undef INTEGER_OPERATOR_CHECK |
- } |
- } |
-} |
- |
- |
-TEST_F(RuntimeInterpreterTest, TestOperatorsWithDoubles) { |
- double inputs[] = {std::numeric_limits<double>::min(), |
- std::numeric_limits<double>::max(), |
- -0.001, |
- 0.01, |
- 3.14, |
- -6.02214086e23}; |
- TRACED_FOREACH(double, lhs, inputs) { |
- TRACED_FOREACH(double, rhs, inputs) { |
-#define DOUBLE_OPERATOR_CHECK(r, op, x, y) \ |
- CHECK(TestOperator(Runtime_Interpreter##r, x, y, x op y)) |
- DOUBLE_OPERATOR_CHECK(Equals, ==, lhs, rhs); |
- DOUBLE_OPERATOR_CHECK(NotEquals, !=, lhs, rhs); |
- DOUBLE_OPERATOR_CHECK(StrictEquals, ==, lhs, rhs); |
- DOUBLE_OPERATOR_CHECK(StrictNotEquals, !=, lhs, rhs); |
- DOUBLE_OPERATOR_CHECK(LessThan, <, lhs, rhs); |
- DOUBLE_OPERATOR_CHECK(GreaterThan, >, lhs, rhs); |
- DOUBLE_OPERATOR_CHECK(LessThanOrEqual, <=, lhs, rhs); |
- DOUBLE_OPERATOR_CHECK(GreaterThanOrEqual, >=, lhs, rhs); |
-#undef DOUBLE_OPERATOR_CHECK |
- } |
- } |
-} |
- |
- |
-TEST_F(RuntimeInterpreterTest, TestOperatorsWithString) { |
- const char* inputs[] = {"abc", "a", "def", "0"}; |
- TRACED_FOREACH(const char*, lhs, inputs) { |
- TRACED_FOREACH(const char*, rhs, inputs) { |
-#define STRING_OPERATOR_CHECK(r, op, x, y) \ |
- CHECK(TestOperator(Runtime_Interpreter##r, x, y, \ |
- std::string(x) op std::string(y))) |
- STRING_OPERATOR_CHECK(Equals, ==, lhs, rhs); |
- STRING_OPERATOR_CHECK(NotEquals, !=, lhs, rhs); |
- STRING_OPERATOR_CHECK(StrictEquals, ==, lhs, rhs); |
- STRING_OPERATOR_CHECK(StrictNotEquals, !=, lhs, rhs); |
- STRING_OPERATOR_CHECK(LessThan, <, lhs, rhs); |
- STRING_OPERATOR_CHECK(GreaterThan, >, lhs, rhs); |
- STRING_OPERATOR_CHECK(LessThanOrEqual, <=, lhs, rhs); |
- STRING_OPERATOR_CHECK(GreaterThanOrEqual, >=, lhs, rhs); |
-#undef STRING_OPERATOR_CHECK |
- } |
- } |
-} |
- |
- |
TEST_F(RuntimeInterpreterTest, ToBoolean) { |
double quiet_nan = std::numeric_limits<double>::quiet_NaN(); |
std::pair<Handle<Object>, bool> cases[] = { |