test/native/gc/g1/test_workerDataArray.cpp

rev 13064 : [mq]: 8178148-ehelin-review

*** 32,42 ****
  template<typename T>
  class WorkerDataArrayTest : public ::testing::Test {
   protected:
    WorkerDataArrayTest() :
      title("Test array"),
!     array(3, title) {
    }
  
    const char* print_summary() {
      stringStream out;
      array.print_summary_on(&out);
--- 32,46 ----
  template<typename T>
  class WorkerDataArrayTest : public ::testing::Test {
   protected:
    WorkerDataArrayTest() :
      title("Test array"),
!     array(3, title),
!     sub_item_title("Sub item array"),
!     sub_item(3, sub_item_title) {
! 
!     array.link_thread_work_items(&sub_item);
    }
  
    const char* print_summary() {
      stringStream out;
      array.print_summary_on(&out);
*** 63,72 ****
--- 67,79 ----
      T min, double avg, T max, T diff, T sum, size_t workers);
  
    const char* title;
    WorkerDataArray<T> array;
  
+   const char* sub_item_title;
+   WorkerDataArray<size_t> sub_item;
+ 
   private:
    virtual const char* expected_summary() = 0;
    virtual const char* expected_details() = 0;
  
    static const char* prepend_with(const char* str, const char* orig) {
*** 109,118 ****
--- 116,129 ----
   protected:
    BasicWorkerDataArrayTest() {
      array.set(0, 5);
      array.set(1, 3);
      array.set(2, 7);
+ 
+     array.set_thread_work_item(0, 1);
+     array.set_thread_work_item(1, 2);
+     array.set_thread_work_item(2, 3);
    }
  
   private:
    virtual const char* expected_summary() {
      return format_summary(3, 5.0, 7, 4, 15, 3);
*** 123,136 ****
--- 134,149 ----
    }
  };
  
  TEST_VM_F(BasicWorkerDataArrayTest, sum_test) {
    ASSERT_EQ(15u, array.sum());
+   ASSERT_EQ(6u, array.thread_work_items(0)->sum());
  }
  
  TEST_VM_F(BasicWorkerDataArrayTest, average_test) {
    ASSERT_NEAR(5.0, array.average(), epsilon);
+   ASSERT_NEAR(2.0, array.thread_work_items(0)->average(), epsilon);
  }
  
  TEST_VM_F(BasicWorkerDataArrayTest, print_summary_on_test) {
    ASSERT_STREQ(print_expected_summary(), print_summary());
  }
*** 147,156 ****
--- 160,179 ----
      array.set(2, 7);
  
      for (uint i = 0; i < 3; i++) {
        array.add(i, 1);
      }
+ 
+     WorkerDataArray<size_t>* sub_items = array.thread_work_items(0);
+ 
+     sub_items->set(0, 1);
+     sub_items->set(1, 2);
+     sub_items->set(2, 3);
+ 
+     for (uint i = 0; i < 3; i++) {
+       array.add_thread_work_item(i, 1);
+     }
    }
  
   private:
    virtual const char* expected_summary() {
      return format_summary(4, 6.0, 8, 4, 18, 3);
*** 161,174 ****
--- 184,199 ----
    }
  };
  
  TEST_VM_F(AddWorkerDataArrayTest, sum_test) {
    ASSERT_EQ(18u, array.sum());
+   ASSERT_EQ(9u, array.thread_work_items(0)->sum());
  }
  
  TEST_VM_F(AddWorkerDataArrayTest, average_test) {
    ASSERT_NEAR(6.0, array.average(), epsilon);
+   ASSERT_NEAR(3.0, array.thread_work_items(0)->average(), epsilon);
  }
  
  TEST_VM_F(AddWorkerDataArrayTest, print_summary_on_test) {
    ASSERT_STREQ(print_expected_summary(), print_summary());
  }