From fe1540c40cc39861e1f9201fa0021c82f36ebbfc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 14 Nov 2018 15:41:19 -0500 Subject: [PATCH] Checking OldDataMonitor. --- .../jenkinsci/plugins/plaincredentials/SecretBytesTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/plaincredentials/SecretBytesTest.java b/src/test/java/org/jenkinsci/plugins/plaincredentials/SecretBytesTest.java index 07a1f9c..1b7c22e 100644 --- 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(""), not(containsString("")))); - 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(