Checking OldDataMonitor.

jenkinsci · Nov 14, 2018 · fe1540c · fe1540c
1 parent e50a5f5
commit fe1540c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/plaincredentials/SecretBytesTest.java b/src/test/java/org/jenkinsci/plugins/plaincredentials/SecretBytesTest.java
@@ -25,12 +25,12 @@
 package org.jenkinsci.plugins.plaincredentials;
 
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
-import com.cloudbees.plugins.credentials.CredentialsNameProvider;
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import com.cloudbees.plugins.credentials.SecretBytes;
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.cli.CreateCredentialsByXmlCommand;
 import com.cloudbees.plugins.credentials.domains.DomainRequirement;
+import hudson.ExtensionList;
 import hudson.cli.CLICommandInvoker;
 import hudson.security.ACL;
 import java.io.ByteArrayInputStream;
@@ -47,6 +47,7 @@
 import org.jvnet.hudson.test.recipes.LocalData;
 
 import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
+import hudson.diagnosis.OldDataMonitor;
 import java.util.stream.Collectors;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
@@ -110,7 +111,7 @@ public void migrateLegacyData() throws Exception {
         assertThat(FileUtils.readFileToString(new File(r.jenkins.getRootDir(), "credentials.xml")),
                 allOf(containsString("</data>"), not(containsString("</secretBytes>"))));
 
-        System.out.println("Loaded: " + SystemCredentialsProvider.getInstance().getCredentials().stream().map(CredentialsNameProvider::name).collect(Collectors.toList()));
+        assertThat(ExtensionList.lookup(OldDataMonitor.class).get(0).getData().entrySet().stream().map(e -> e.getKey() + ": " + e.getValue().extra).collect(Collectors.toList()), empty());
 
         // get the credential instance under test
         FileCredentials c = CredentialsMatchers.firstOrNull(