GetSubmissionSetandContentsTab did not trim() input id

usnistgov · Feb 23, 2017 · cfce78f · cfce78f
1 parent 4e5acdf
commit cfce78f
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 3 deletions.
diff --git a/notes/GatewayBuilder.txt b/notes/GatewayBuilder.txt
@@ -0,0 +1,24 @@
+GatewayBuilder depends on
+
+Result                   (gov.nist.toolkit.results.client)
+  AssertionResults       (gov.nist.toolkit.results.client)
+    AssertionResult      (gov.nist.toolkit.results.client)
+  TestInstance           (gov.nist.toolkit.results.client)
+  StepResult             (gov.nist.toolkit.registrymetadata.client)
+    MetadataCollection   (gov.nist.toolkit.registrymetadata.client)
+      DocumentEntry      (gov.nist.toolkit.registrymetadata.client)
+        RegistryObject   (gov.nist.toolkit.registrymetadata.client)
+        MetadataObject   (gov.nist.toolkit.registrymetadata.client)
+      SubmissionSet      (gov.nist.toolkit.registrymetadata.client)
+      Folder             (gov.nist.toolkit.registrymetadata.client)
+      Association        (gov.nist.toolkit.registrymetadata.client)
+      ObjectRef          (gov.nist.toolkit.registrymetadata.client)
+    Document             (gov.nist.toolkit.registrymetadata.client)
+    ObjectRefs           (gov.nist.toolkit.registrymetadata.client)
+
+
+MetadataObject has dependencies in
+registry-metdata 
+results
+xdstools2
+
diff --git a/.../src/main/java/gov/nist/toolkit/xdstools2/client/tabs/GetSubmissionSetAndContentsTab.java b/.../src/main/java/gov/nist/toolkit/xdstools2/client/tabs/GetSubmissionSetAndContentsTab.java
@@ -9,10 +9,9 @@
 import gov.nist.toolkit.sitemanagement.client.SiteSpec;
 import gov.nist.toolkit.xdstools2.client.CoupledTransactions;
 import gov.nist.toolkit.xdstools2.client.command.command.GetSubmissionSetAndContentsCommand;
-import gov.nist.toolkit.xdstools2.client.util.ClientUtils;
-import gov.nist.toolkit.xdstools2.client.widgets.PopupMessage;
 import gov.nist.toolkit.xdstools2.client.siteActorManagers.GetDocumentsSiteActorManager;
 import gov.nist.toolkit.xdstools2.client.tabs.genericQueryTab.GenericQueryTab;
+import gov.nist.toolkit.xdstools2.client.widgets.PopupMessage;
 import gov.nist.toolkit.xdstools2.client.widgets.queryFilter.OnDemandFilter;
 import gov.nist.toolkit.xdstools2.shared.command.request.GetSubmissionSetAndContentsRequest;
 
@@ -117,7 +116,7 @@ public void onClick(ClickEvent event) {
 				public void onComplete(List<Result> result) {
 					displayResults(result);
 				}
-			}.run(new GetSubmissionSetAndContentsRequest(getCommandContext(),siteSpec,ssid.getValue(),codeSpec));
+			}.run(new GetSubmissionSetAndContentsRequest(getCommandContext(),siteSpec,ssid.getValue().trim(),codeSpec));
 		}
 
 	}

diff --git a/xdstools2/src/main/webapp/scripts/InitializeForCat.groovy b/xdstools2/src/main/webapp/scripts/InitializeForCat.groovy
@@ -0,0 +1,86 @@
+package gov.nist.toolkit.itTests.cat.homeCommunityId
+
+import gov.nist.toolkit.adt.ListenerFactory
+import gov.nist.toolkit.configDatatypes.SimulatorProperties
+import gov.nist.toolkit.installation.Installation
+import gov.nist.toolkit.itTests.support.ToolkitSpecification
+import gov.nist.toolkit.itTests.xc.GatewayBuilder
+import gov.nist.toolkit.results.client.TestLogs
+import gov.nist.toolkit.toolkitApi.DocumentConsumer
+import gov.nist.toolkit.toolkitApi.SimulatorBuilder
+import gov.nist.toolkit.toolkitServicesCommon.SimConfig
+import spock.lang.Shared
+/**
+ * Initialize toolkit to support XDS-XCA-I_homeCommunityID test
+ */
+class InitializeForCat extends ToolkitSpecification {
+    @Shared SimulatorBuilder simBuilder
+    @Shared String pid = 'P20170106143728.2^^^&1.3.6.1.4.1.21367.2005.13.20.1000&ISO'
+    @Shared SimConfig rrConfig
+    @Shared String testSession = 'cat';
+    @Shared String envName = 'default'
+    @Shared DocumentConsumer docCons
+    @Shared TestLogs repTestLogs
+
+
+    def setupSpec() {   // one time setup done when class launched
+        startGrizzly('8889')
+
+        Installation.instance().externalCache(new File('/home/bill/tmp/toolkit2a'))
+
+        println "EC is ${Installation.instance().externalCache().toString()}"
+        println "${api.getSiteNames(true)}"
+        api.createTestSession(testSession)
+
+        // Connect to remote API
+        simBuilder = getSimulatorApi(remoteToolkitPort)
+    }
+
+    def cleanupSpec() {  // one time shutdown when everything is done
+//        System.gc()
+        server.stop()
+        ListenerFactory.terminateAll()
+    }
+
+    def setup() {}
+
+    def 'build ig and rg sim'() {
+
+        when: 'delete old simulators'
+        simBuilder.delete('rg', testSession)
+        simBuilder.delete('ig', testSession)
+
+        then:
+        true
+
+        when: 'build and link simulators'
+        def iConfig, rConfigs
+
+        // builds IG and RG and loads regrep behing RG with two documents
+        (iConfig, rConfigs) = GatewayBuilder.build(api, simBuilder, 1, 'cat', 'default', pid)
+        SimConfig igConfig = iConfig
+        SimConfig[] rgConfigs = rConfigs
+        SimConfig rgConfig = rgConfigs[0]
+        def igId = igConfig.id
+        def rgId = rgConfig.id
+        igConfig.setProperty(SimulatorProperties.locked, true)
+        simBuilder.update(igConfig)
+
+        then:
+        true
+
+        when: 'lock rg'
+        rgConfig.setProperty(SimulatorProperties.locked, true)
+        simBuilder.update(rgConfig)
+
+        then:
+        true
+
+//        when:
+//        InitiatingGateway ig = simBuilder.asInitiatingGateway(igConfig)
+//        RefList rlr = ig.FindDocuments(pid)
+//
+//        then:
+//        rlr.refs.size() == 1
+    }
+}