Merge branch 'ttp-dev' of https://github.com/siteadmin/ett into ttp-test

onc-healthit · Mar 6, 2017 · b8934f3 · b8934f3
2 parents a269371 + 6f54ea9
commit b8934f3
Show file tree

Hide file tree

Showing 11 changed files with 671 additions and 229 deletions.
diff --git a/direct/src/main/java/gov/nist/healthcare/ttt/direct/messageProcessor/PartValidation.java b/direct/src/main/java/gov/nist/healthcare/ttt/direct/messageProcessor/PartValidation.java
@@ -266,7 +266,7 @@ public void processLeafPart(PartModel part) throws Exception {
 			validateCCDAwithMDHT(part);
 		}
 
-		if(p.isMimeType("application/zip")) {
+		if(p.isMimeType("application/zip") || p.isMimeType("application/octet-stream") || p.isMimeType("application/x-zip-compressed")) {
 			validateXDM(part);
 		}
 	}

diff --git a/gui/src/app/certification/certh1/certh1.js b/gui/src/app/certification/certh1/certh1.js
@@ -30,8 +30,8 @@ certCerth1.config(['$stateProvider',
 	}
 ]);
 
-certCerth1.controller('Certh1Ctrl', ['$scope', '$stateParams','LogInfo','growl','SMTPLogFactory','SMTPTestCasesDescription','CriteriaDescription','SMTPTestCases','XDRTestCasesTemplate','XDRTestCases','XDRRunTestCases','SMTPProfileFactory','SettingsFactory', 'PropertiesFactory',  '$timeout','$window','CCDADocumentsFactory', 'DirectRICertFactory','DirectCertsLinkFactory','$filter','$state','$location','$anchorScroll',
-	function($scope, $stateParams, LogInfo,growl,SMTPLogFactory, SMTPTestCasesDescription,CriteriaDescription,SMTPTestCases,XDRTestCasesTemplate,XDRTestCases,XDRRunTestCases,SMTPProfileFactory,SettingsFactory, PropertiesFactory, $timeout,$window,CCDADocumentsFactory, DirectRICertFactory,DirectCertsLinkFactory,$filter, $state,$location,$anchorScroll) {
+certCerth1.controller('Certh1Ctrl', ['$scope', '$stateParams','LogInfo','growl','SMTPLogFactory','ApiUrl','SMTPTestCasesDescription','CriteriaDescription','SMTPTestCases','XDRTestCasesTemplate','XDRTestCases','XDRRunTestCases','SMTPProfileFactory','SettingsFactory', 'PropertiesFactory',  '$timeout','$window','CCDADocumentsFactory', 'DirectRICertFactory','DirectCertsLinkFactory','$filter','$state','$location','$anchorScroll',
+	function($scope, $stateParams, LogInfo,growl,SMTPLogFactory, ApiUrl,SMTPTestCasesDescription,CriteriaDescription,SMTPTestCases,XDRTestCasesTemplate,XDRTestCases,XDRRunTestCases,SMTPProfileFactory,SettingsFactory, PropertiesFactory, $timeout,$window,CCDADocumentsFactory, DirectRICertFactory,DirectCertsLinkFactory,$filter, $state,$location,$anchorScroll) {
          $scope.paramCri =  $stateParams.paramCri;
          $scope.pageTitle= $state.current.data.pageTitle;
 		$scope.filterCrit = $state.current.data.filterCrit;
@@ -94,18 +94,16 @@ certCerth1.controller('Certh1Ctrl', ['$scope', '$stateParams','LogInfo','growl',
 				}
 			});
 		};
+				$scope.apiUrl = ApiUrl.get();
+
+
 		$scope.successUpload = function(message) {
-			console.log("successUpload......."+message);
 			$scope.fileInfo = angular.fromJson(message);
 			var validExts = new Array(".der", ".pem");
 			var fileExt = $scope.fileInfo.flowFilename.substring($scope.fileInfo.flowFilename.lastIndexOf('.'));
-					console.log("fileExt......."+fileExt);
-					console.log("validExts......."+validExts);
-					console.log("validExts.indexOf(fileExt)......."+validExts.indexOf(fileExt));
 			if (validExts.indexOf(fileExt) >= 0) {
 				var certFilePath = $scope.fileInfo.flowRelativePath;
 				DirectRICertFactory.save(certFilePath, function(data) {
-					console.log("data.criteriaMet.......");
 					if (data.criteriaMet == "FALSE"){
 						growl.error("Failed to Upload Certificate", {});
 					}else{
@@ -195,10 +193,10 @@ certCerth1.controller('Certh1Ctrl', ['$scope', '$stateParams','LogInfo','growl',
                  $scope.selectedCrit = $scope.filterObj.indexOf( selectedItem );
                  $scope.testBench =  [];
                  $scope.isXdrTest = false;
-                 console.log("Criteria selectedItem :::::"+angular.toJson(selectedItem, true));
                 /* if (selectedItem.criteria === "'h1-1'"){
                         $scope.uploadOption = true;
                  }*/
+                 $scope.uploadOption = selectedItem.uploadOption;
                  $scope.isXdrTest = selectedItem.xdrTest;
                  $scope.redirectLink = selectedItem.redirect;
                  $scope.openInNewWindow = "";

diff --git a/gui/src/assets/Criteria.json b/gui/src/assets/Criteria.json
@@ -54,7 +54,8 @@
       "name":"Criteria (ii) Delivery Notifications",
       "xdrTest":false,
       "testList":"['h1']",
-      "criteria":"'h1-1'"
+      "criteria":"'h1-1'",
+      "uploadOption":true
    },
    {
       "name":"Criteria (i) Certificate Discovery / Hosting - 2015 DCDT",
@@ -132,7 +133,7 @@
          "hreflabel":"170.315(h)(2)",
          "hrefback":"certification.certh2.main"
       },
-      "selectOption":"['6','4','B','5']"
+      "selectOption":"['2','6','4','B','5']"
    },
    {
       "name":"Criteria (i)(B) Send using SOAP+XDR",

diff --git a/gui/src/assets/smtptestCases.json b/gui/src/assets/smtptestCases.json
diff --git a/gui/src/assets/xdrtestCases.json b/gui/src/assets/xdrtestCases.json
diff --git a/gui/src/common/templates/smtpTemplates/SingleTestCaseTemplate.tpl.html b/gui/src/common/templates/smtpTemplates/SingleTestCaseTemplate.tpl.html
@@ -57,7 +57,12 @@ <h2 class="title">{{test.name}}</h2>
 				<div class="col-md-7 small-padding" ng-switch on="field.datatype">
 
 					<!-- When String -->
-					<input type="{{field.datatype | inputFilter}}" placeholder="{{field.name}}" ng-model="fieldInput[field.name]" id="{{field.name}}" class="form-control" ng-disabled="{{field.readOnly}}" ng-switch-when="String" />
+					<div ng-if="field.placeHolder">
+					    <input type="{{field.datatype | inputFilter}}" placeholder="{{field.placeHolder}}" ng-model="fieldInput[field.name]" id="{{field.name}}" class="form-control" ng-disabled="{{field.readOnly}}" ng-switch-when="String" />
+					</div>
+					<div ng-if="!field.placeHolder">
+					    <input type="{{field.datatype | inputFilter}}" placeholder="{{field.name}}" ng-model="fieldInput[field.name]" id="{{field.name}}" class="form-control" ng-disabled="{{field.readOnly}}" ng-switch-when="String" />
+					</div>
 
 					<!-- When ListedString -->
 					<div class="input-group" ng-switch-when="ListedString" ng-if="field.allowedValues">
@@ -101,4 +106,4 @@ <h2 class="title">{{test.name}}</h2>
 			</li>
 		</ul>
 	</div>
-</li>
+</li>
diff --git a/gui/src/common/templates/xdrTemplates/xdrSenderTestCaseTemplate.tpl.html b/gui/src/common/templates/xdrTemplates/xdrSenderTestCaseTemplate.tpl.html
@@ -72,10 +72,19 @@ <h2 class="title">{{test.name}}</h2>
 					<p><strong>Step 1:</strong> Provide your <span ng-repeat="input in test.inputs">{{input.name}}{{$last ? '. ':($index==test.inputs.length-2) ? ', and ':', a '}}</span>{{runText}}</p>
 				</div>
 				<div ng-repeat="input in test.inputs">
-					<label for="{{input.key}}" class="col-md-1 small-padding control-label">
-						{{input.name}}:
-						<i class="glyphicon glyphicon-question-sign" tooltips tooltip-title="{{input.name}}" tooltip-side="top"></i>
-					</label>
+					<div ng-if="input.hoverlabel">
+						<label for="{{input.key}}" class="col-md-1 small-padding control-label">
+							{{input.name}}:
+						      <i class="glyphicon glyphicon-question-sign" tooltips tooltip-title="{{input.hoverlabel}}" tooltip-side="top"></i>
+						</label>
+					</div>
+					<div ng-if="!input.hoverlabel">
+						<label for="{{input.key}}" class="col-md-1 small-padding control-label">
+							{{input.name}}:
+						      <i class="glyphicon glyphicon-question-sign" tooltips tooltip-title="{{input.name}}" tooltip-side="top"></i>
+						</label>
+					</div>
+
 					<div ng-switch on="input.type">
 
 						<div ng-switch-when="string">

diff --git a/mail protocols/src/main/java/gov/nist/healthcare/ttt/smtp/SMTPTestRunner.java b/mail protocols/src/main/java/gov/nist/healthcare/ttt/smtp/SMTPTestRunner.java
@@ -593,7 +593,7 @@ public ITestResult[] runTestCase(int i, TestInput ti) {
 
 			TestResult tr119;
 			try {
-				tr119 = tTest.fetchManualTest(ti);
+				tr119 = tTest.fetchandSendMDN(ti);
 				tr119.id = 119;
 				res.add(tr119);
 			} catch (IOException e) {
@@ -608,7 +608,7 @@ public ITestResult[] runTestCase(int i, TestInput ti) {
 
 			TestResult tr120;
 			try {
-				tr120 = tTest.fetchManualTest(ti);
+				tr120 = tTest.fetchandSendMDN(ti);
 				tr120.id = 120;
 				res.add(tr120);
 			} catch (IOException e) {
@@ -819,7 +819,7 @@ public ITestResult[] runTestCase(int i, TestInput ti) {
 				file.close();
 				ti.useTLS = true;
 				TestResult tr127;
-				tr127 = mu2senderTests.testMu2TwoEight(ti,prop.getProperty("processed.only"));
+				tr127 = mu2senderTests.testMu2TwoSeven(ti,prop.getProperty("processed.only"));
 				tr127.id = 127;
 				res.add(tr127);
 			} catch (Exception e3) {
@@ -840,7 +840,7 @@ public ITestResult[] runTestCase(int i, TestInput ti) {
 				file.close();
 				ti.useTLS = true;
 				TestResult tr527;
-				tr527 = mu2senderTests.testMu2TwoEightSmtp(ti,prop.getProperty("processed.only"));
+				tr527 = mu2senderTests.testMu2TwoSevenSmtp(ti,prop.getProperty("processed.only"));
 				tr527.id = 527;
 				res.add(tr527);
 			} catch (Exception e3) {
@@ -861,7 +861,7 @@ public ITestResult[] runTestCase(int i, TestInput ti) {
 				file.close();
 				ti.useTLS = true;
 				TestResult tr157;
-				tr157 = mu2senderTests.testMu2TwoEightPop(ti,prop.getProperty("processed.only"));
+				tr157 = mu2senderTests.testMu2TwoSevenPop(ti,prop.getProperty("processed.only"));
 				tr157.id = 157;
 				res.add(tr157);
 			} catch (Exception e3) {
@@ -880,8 +880,9 @@ public ITestResult[] runTestCase(int i, TestInput ti) {
 				prop.load(file);
 				file.close();
 				ti.useTLS = true;
+				String address = "delaydispatched"+ti.sutCommandTimeoutInSeconds+"@"+prop.getProperty("direct.listener.domainName");
 				TestResult tr128;
-				tr128 = mu2senderTests.testMu2TwoEight(ti,prop.getProperty("process.delaydispatched"));
+				tr128 = mu2senderTests.testMu2TwoEight(ti,address);
 				tr128.id = 128;
 				res.add(tr128);
 			} catch (Exception e3) {
@@ -902,7 +903,8 @@ public ITestResult[] runTestCase(int i, TestInput ti) {
 				file.close();
 				ti.useTLS = true;
 				TestResult tr528;
-				tr528 = mu2senderTests.testMu2TwoEightSmtp(ti,prop.getProperty("process.delaydispatched"));
+				String address = "delaydispatched"+ti.sutCommandTimeoutInSeconds+"@"+prop.getProperty("direct.listener.domainName");
+				tr528 = mu2senderTests.testMu2TwoEightSmtp(ti,address);
 				tr528.id = 528;
 				res.add(tr528);
 			} catch (Exception e3) {
@@ -923,7 +925,8 @@ public ITestResult[] runTestCase(int i, TestInput ti) {
 				file.close();
 				ti.useTLS = true;
 				TestResult tr158;
-				tr158 = mu2senderTests.testMu2TwoEightPop(ti,prop.getProperty("process.delaydispatched"));
+				String address = "delaydispatched"+ti.sutCommandTimeoutInSeconds+"@"+prop.getProperty("direct.listener.domainName");
+				tr158 = mu2senderTests.testMu2TwoEightPop(ti,address);
 				tr158.id = 158;
 				res.add(tr158);
 			} catch (Exception e3) {