Revert "[arm] Shorter test names for parameterized tests."

test/compiler-unittests/change-lowering-unittest.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/change-lowering.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/node-properties-inl.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/compiler/typer.h"
 #include "test/compiler-unittests/graph-unittest.h"
@@ skipping 95 matching lines @@
   }
 
  private:
   SimplifiedOperatorBuilder simplified_;
 };
 
 
 // -----------------------------------------------------------------------------
 // Common.
 
-namespace {
 
-class Common : public ChangeLoweringTest,
-               public ::testing::WithParamInterface<MachineType> {
+class ChangeLoweringCommonTest
+    : public ChangeLoweringTest,
+      public ::testing::WithParamInterface<MachineType> {
  public:
-  virtual ~Common() {}
+  virtual ~ChangeLoweringCommonTest() {}
 
   virtual MachineType WordRepresentation() const V8_FINAL V8_OVERRIDE {
     return GetParam();
   }
 };
 
 
-TARGET_TEST_P(Common, ChangeBitToBool) {
+TARGET_TEST_P(ChangeLoweringCommonTest, ChangeBitToBool) {
   Node* val = Parameter(0);
   Node* node = graph()->NewNode(simplified()->ChangeBitToBool(), val);
   Reduction reduction = Reduce(node);
   ASSERT_TRUE(reduction.Changed());
 
   Node* phi = reduction.replacement();
   Capture<Node*> branch;
   EXPECT_THAT(phi,
               IsPhi(IsTrue(), IsFalse(),
                     IsMerge(IsIfTrue(AllOf(CaptureEq(&branch),
                                            IsBranch(val, graph()->start()))),
                             IsIfFalse(CaptureEq(&branch)))));
 }
 
 
-TARGET_TEST_P(Common, ChangeBoolToBit) {
+TARGET_TEST_P(ChangeLoweringCommonTest, ChangeBoolToBit) {
   Node* val = Parameter(0);
   Node* node = graph()->NewNode(simplified()->ChangeBoolToBit(), val);
   Reduction reduction = Reduce(node);
   ASSERT_TRUE(reduction.Changed());
 
   EXPECT_THAT(reduction.replacement(), IsWordEqual(val, IsTrue()));
 }
 
 
-TARGET_TEST_P(Common, ChangeFloat64ToTagged) {
+TARGET_TEST_P(ChangeLoweringCommonTest, ChangeFloat64ToTagged) {
   Node* val = Parameter(0);
   Node* node = graph()->NewNode(simplified()->ChangeFloat64ToTagged(), val);
   Reduction reduction = Reduce(node);
   ASSERT_TRUE(reduction.Changed());
 
   Node* finish = reduction.replacement();
   Capture<Node*> heap_number;
   EXPECT_THAT(
       finish,
       IsFinish(
           AllOf(CaptureEq(&heap_number),
                 IsAllocateHeapNumber(IsValueEffect(val), graph()->start())),
           IsStore(kMachFloat64, kNoWriteBarrier, CaptureEq(&heap_number),
                   IsInt32Constant(HeapNumberValueOffset()), val,
                   CaptureEq(&heap_number), graph()->start())));
 }
 
 
-TARGET_TEST_P(Common, StringAdd) {
+TARGET_TEST_P(ChangeLoweringCommonTest, StringAdd) {
   Node* node =
       graph()->NewNode(simplified()->StringAdd(), Parameter(0), Parameter(1));
   Reduction reduction = Reduce(node);
   EXPECT_FALSE(reduction.Changed());
 }
 
-}  // namespace
 
-
-INSTANTIATE_TEST_CASE_P(ChangeLoweringTest, Common,
+INSTANTIATE_TEST_CASE_P(ChangeLoweringTest, ChangeLoweringCommonTest,
                         ::testing::Values(kRepWord32, kRepWord64));
 
 
 // -----------------------------------------------------------------------------
 // 32-bit
 
 
 class ChangeLowering32Test : public ChangeLoweringTest {
  public:
   virtual ~ChangeLowering32Test() {}
@@ skipping 155 matching lines @@
             IsMerge(AllOf(CaptureEq(&if_true), IsIfTrue(CaptureEq(&branch))),
                     IsIfFalse(AllOf(
                         CaptureEq(&branch),
                         IsBranch(IsWord64And(val, IsInt32Constant(kSmiTagMask)),
                                  graph()->start()))))));
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8