Refactor some certificate verification tests in preparation to adding

net/data/verify_certificate_chain_unittest/generate-key-rollover.py

Index: net/data/verify_certificate_chain_unittest/generate-key-rollover.py
diff --git a/net/data/verify_certificate_chain_unittest/generate-key-rollover.py b/net/data/verify_certificate_chain_unittest/generate-key-rollover.py
index 01deacbd50c085632fd87018cfb9096f22fa48a1..e3de21c48b2e374281c250fa2f213a7ed1bd808b 100755
--- a/net/data/verify_certificate_chain_unittest/generate-key-rollover.py
+++ b/net/data/verify_certificate_chain_unittest/generate-key-rollover.py
@@ -69,24 +69,30 @@ newintermediate.set_validity_range(JANUARY_2_2015_UTC,
 # Target certificate.
 target = common.create_end_entity_certificate('Target', oldintermediate)
 
-oldchain = [target, oldintermediate]
-rolloverchain = [target, newintermediate, newrootrollover]
-longrolloverchain = [target, newintermediate, newroot, newrootrollover]
-oldtrusted = [oldroot]
-
-newchain = [target, newintermediate]
-newtrusted = [newroot]
-
-time = common.DEFAULT_TIME
-verify_result = True
-
-common.write_test_file(__doc__, oldchain, oldtrusted, time, verify_result,
-                       out_pem="key-rollover-oldchain.pem")
-common.write_test_file(__doc__, rolloverchain, oldtrusted, time, verify_result,
-                       out_pem="key-rollover-rolloverchain.pem")
-common.write_test_file(__doc__, longrolloverchain, oldtrusted, time,
-                       verify_result,
-                       out_pem="key-rollover-longrolloverchain.pem")
-common.write_test_file(__doc__, newchain, newtrusted, time, verify_result,
-                       out_pem="key-rollover-newchain.pem")
-
+oldtrusted = common.TrustAnchor(oldroot, constrained=False)
+newtrusted = common.TrustAnchor(newroot, constrained=False)
+
+test = common.TestData()
+test.description = __doc__
+test.verify_result = True
+test.utc_time = common.DEFAULT_TIME
+
+# Write out a test for oldchain.
+test.chain = [target, oldintermediate]
+test.trust_anchor = oldtrusted
+test.write_to_file("key-rollover-oldchain.pem")
+
+# Write out a test for rolloverchain.
+test.chain = [target, newintermediate, newrootrollover]
+test.trust_anchor = oldtrusted
+test.write_to_file("key-rollover-rolloverchain.pem")
+
+# Write out a test for longrolloverchain.
+test.chain = [target, newintermediate, newroot, newrootrollover]
+test.trust_anchor = oldtrusted
+test.write_to_file("key-rollover-longrolloverchain.pem")
+
+# Write out a test for newchain.
+test.chain = [target, newintermediate]
+test.trust_anchor = newtrusted
+test.write_to_file("key-rollover-newchain.pem")