@@ -381,11 +381,11 @@ TEST(GENERATED_MESSAGE_TEST_NAME, CopyFrom) {
381381 UNITTEST::TestAllTypes message1, message2;
382382
383383 TestUtil::SetAllFields (&message1);
384- message2. CopyFrom ( message1) ;
384+ message2 = message1;
385385 TestUtil::ExpectAllFieldsSet (message2);
386386
387387 // Copying from self should be a no-op.
388- message2. CopyFrom ( message2) ;
388+ message2 = message2;
389389 TestUtil::ExpectAllFieldsSet (message2);
390390}
391391
@@ -821,7 +821,7 @@ TEST(GENERATED_MESSAGE_TEST_NAME, TestOptimizedForSize) {
821821 UNITTEST::TestOptimizedForSize message, message2;
822822 message.set_i (1 );
823823 message.mutable_msg ()->set_c (2 );
824- message2. CopyFrom ( message) ;
824+ message2 = message;
825825 EXPECT_EQ (1 , message2.i ());
826826 EXPECT_EQ (2 , message2.msg ().c ());
827827}
@@ -1764,12 +1764,12 @@ TEST_F(OneofTest, CopyFrom) {
17641764 message1.set_foo_enum (UNITTEST::TestOneof2::BAR);
17651765 EXPECT_TRUE (message1.has_foo_enum ());
17661766
1767- message2. CopyFrom ( message1) ;
1767+ message2 = message1;
17681768 EXPECT_TRUE (message2.has_foo_enum ());
17691769 EXPECT_EQ (message2.foo_enum (), UNITTEST::TestOneof2::BAR);
17701770
17711771 // Copying from self should be a no-op.
1772- message2. CopyFrom ( message2) ;
1772+ message2 = message2;
17731773 EXPECT_TRUE (message2.has_foo_enum ());
17741774 EXPECT_EQ (message2.foo_enum (), UNITTEST::TestOneof2::BAR);
17751775}
0 commit comments