Fix cert and csr test fixtures

The test csr (and the certificate generated from it)
where both missing a proper subject.  This fix replaces
both of these with fixtures which contain a proper
X509 Subject and adds additional tests to check
whether or not the X509 subject in the certificate
returned by enrollment matches the expected
enrollmentID.

Also modified enrollmentID to match the ID used in
the csr fixture

Change-Id: If226906c5848dffc6989d656a3aa10354c9edefb
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

test/fixtures/fabriccop/ecert.pem

@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIUAeWmGIvYO6Lt7u7l+oFt9vtYb00wCgYIKoZIzj0EAwIw
+MIIB8zCCAZqgAwIBAgIUWvyWRhnNjkgI240frgUO1ajr/qMwCgYIKoZIzj0EAwIw
 YzELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQH
 EwdSYWxlaWdoMRswGQYDVQQKExJIeXBlcmxlZGdlciBGYWJyaWMxDDAKBgNVBAsT
-A0NPUDAeFw0xNjExMjExNTQwMDBaFw0xNzExMjExNTQwMDBaMAAwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAAS67vg2BmNtNCqcrIIWRlF8lh8L25mbZnMxV4PX591H
-nLmPO+c7RHpR6tnP0yX66agijNaUsMx9oSCk8G1KyyY0o38wfTAOBgNVHQ8BAf8E
-BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQC
-MAAwHQYDVR0OBBYEFITzL4hoCtVw3p3xBq1hfhuXxNyMMB8GA1UdIwQYMBaAFODb
-8NwdS9aimQJXEujDqfrfL/1CMAoGCCqGSM49BAMCA0gAMEUCIQDLQyurOjG+cQuP
-PFo+5ucgMPnzGWYScG78aymca4HNPQIgcmKaD4OTtRF57HkTIAeHFLCs65tkfmEj
-lPpXk7ZzPaQ=
+A0NPUDAeFw0xNjExMjcxMjI0MDBaFw0xNzExMjcxMjI0MDBaMBAxDjAMBgNVBAMT
+BWFkbWluMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnrhMQCKVUaJVZywJtkeb
+dg4HHoYz7lb6knfglfX3R7OuX504snLlgCsSL8FgjMEMWINVQRA/NtT9kec2j5I7
+OaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSMVEXbf7pQjqpf2G/bW6S6DTHD
+HjAfBgNVHSMEGDAWgBTg2/DcHUvWopkCVxLow6n63y/9QjAKBggqhkjOPQQDAgNH
+ADBEAiBH2XyV4MxNb11tyljqo+4iF53GjF26w+JBxHg5T/oOxwIgSUpFO4z0Zd0O
+b/f7YhvdYtAhJqqJDv5u21oZrugjXIw=
 -----END CERTIFICATE-----

test/fixtures/fabriccop/enroll-csr.pem

@@ -1,6 +1,7 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIG8MGICAQAwADBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLru+DYGY200Kpys
-ghZGUXyWHwvbmZtmczFXg9fn3UecuY875ztEelHq2c/TJfrpqCKM1pSwzH2hIKTw
-bUrLJjSgADAMBggqhkjOPQQDAgUAA0gAMEUCIH7xysvTaG1GanUqVdRyHeJH+cyh
-WU6YI3fK7Ye3JfiAAiEAqNGqNvODUe2WUKXUbrqOg5ajry3MfQgx+fZA2ogtlJc=
+MIHQMHUCAQAwEzERMA8GA1UEAwwIdGVzdFVzZXIwWTATBgcqhkjOPQIBBggqhkjO
+PQMBBwNCAASSduelwzsHgCoVVJtMqaEbqkDVXQZiE68ffFc2OMnljKlx0/ndzB2H
+jWU9GhEG+zmjMBcARr6b/xas96wZeQ7LoAAwDAYIKoZIzj0EAwIFAANJADBGAiEA
+8ODGpt+sqGIMj517SFkNtpMMAlcharmLFsDMWhxlcioCIQDfSU0pOkaEEn0/pWOU
+LxB2qFcakcohWyEFQHHDNJVFRw==
 -----END CERTIFICATE REQUEST-----

test/unit/fabriccopservices-tests.js

@@ -18,7 +18,11 @@ var tape = require('tape');
 var _test = require('tape-promise');
 var test = _test(tape);
 
+
 var hfc = require('hfc');
+
+var X509 = require('jsrsasign').X509;
+
 var util = require('util');
 var fs = require('fs');
 var path = require('path');
@@ -174,8 +178,8 @@ test('FabricCOPClient: Test enroll with missing parameters', function (t) {
 		});
 });
 
-var enrollmentID = 'sdk';
-var enrollmentSecret = 'sdkpw';
+var enrollmentID = 'testUser';
+var enrollmentSecret = 'user1';
 var csr = fs.readFileSync(path.resolve(__dirname, '../fixtures/fabriccop/enroll-csr.pem'));
 
 
@@ -189,9 +193,14 @@ test('FabricCOPClient: Test enroll', function (t) {
 
 	//
 	return client.enroll(enrollmentID,enrollmentSecret, csr)
-		.then(function (csr) {
-			t.comment(csr);
-			t.pass('Successfully enrolled with enrollmentID \''+ enrollmentID + '\'');
+		.then(function (pem) {
+			t.comment(pem);
+			t.pass('Successfully invoked enroll API with enrollmentID \''+ enrollmentID + '\'');
+			//check that we got back the expected certificate
+			var cert = new X509();
+			cert.readCertPEM(pem);
+			t.comment(cert.getSubjectString());
+			t.equal(cert.getSubjectString(),'/CN='+enrollmentID,'Subject should be /CN='+enrollmentID);
 		})
 		.catch(function (err) {
 			t.fail('Failed to enroll \'' + enrollmentID + '\'.  ' + err);
@@ -291,8 +300,14 @@ test('FabricCOPServices: Test enroll()', function (t) {
 	return cop.enroll(req)
 		.then(
 		function (enrollment) {
-			console.log(enrollment.toString());
+
 			t.pass('Successfully enrolled \'' + req.enrollmentID + '\'.');
+
+			//check that we got back the expected certificate
+			var cert = new X509();
+			cert.readCertPEM(enrollment.certificate);
+			t.comment(cert.getSubjectString());
+			t.equal(cert.getSubjectString(),'/CN='+req.enrollmentID,'Subject should be /CN='+req.enrollmentID);
 		},
 		function (err) {
 			t.fail('Failed to enroll \'' + req.enrollmentID + '\'.  ' + err);