From f18f89d6a039d70d5d1c9475bb6b69f36bf6d7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= <ogondza@redhat.com>
Date: Thu, 1 Aug 2013 15:50:42 +0200
Subject: [PATCH] Avoid deprecated junit.framework.Assert, use org.junit.Assert
 instead

---
 core/src/test/java/hudson/model/DisplayNameListenerTest.java   | 3 +--
 maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java   | 3 +--
 test/src/test/java/hudson/security/CliAuthenticationTest.java  | 2 +-
 .../hudson/slaves/EnvironmentVariableNodePropertyTest.java     | 3 +--
 test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java      | 3 +--
 test/src/test/java/hudson/tasks/MavenTest.java                 | 3 +--
 .../test/java/hudson/tools/ToolLocationNodePropertyTest.java   | 2 +-
 test/src/test/java/jenkins/model/JenkinsTest.java              | 2 +-
 8 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/core/src/test/java/hudson/model/DisplayNameListenerTest.java b/core/src/test/java/hudson/model/DisplayNameListenerTest.java
index 70973e7c21..91b16e3ae5 100644
--- a/core/src/test/java/hudson/model/DisplayNameListenerTest.java
+++ b/core/src/test/java/hudson/model/DisplayNameListenerTest.java
@@ -23,8 +23,7 @@
  */
 package hudson.model;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class DisplayNameListenerTest {
diff --git a/maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java b/maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java
index a62ac8ef34..8feffd6486 100644
--- a/maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java
+++ b/maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java
@@ -14,12 +14,11 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.project.MavenProject;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/test/src/test/java/hudson/security/CliAuthenticationTest.java b/test/src/test/java/hudson/security/CliAuthenticationTest.java
index aea0ed4dc2..81b829fc02 100644
--- a/test/src/test/java/hudson/security/CliAuthenticationTest.java
+++ b/test/src/test/java/hudson/security/CliAuthenticationTest.java
@@ -7,10 +7,10 @@ import hudson.cli.LoginCommand;
 import hudson.cli.LogoutCommand;
 import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
+import org.junit.Assert;
 import org.jvnet.hudson.test.For;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.TestExtension;
-import junit.framework.Assert;
 
 /**
  * @author Kohsuke Kawaguchi
diff --git a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
index ee9135bf88..f35b5476bf 100644
--- a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
+++ b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
@@ -12,8 +12,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.jvnet.hudson.test.CaptureEnvironmentBuilder;
 import org.jvnet.hudson.test.HudsonTestCase;
 
diff --git a/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java b/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java
index baec3134b7..80f0f2887a 100644
--- a/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java
+++ b/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java
@@ -39,8 +39,7 @@ import hudson.model.Queue.Task;
 import hudson.model.Slave;
 import hudson.model.queue.CauseOfBlockage;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.jvnet.hudson.test.HudsonTestCase;
 
 public class NodeCanTakeTaskTest extends HudsonTestCase {
diff --git a/test/src/test/java/hudson/tasks/MavenTest.java b/test/src/test/java/hudson/tasks/MavenTest.java
index 4b7b6d0734..72949139ee 100644
--- a/test/src/test/java/hudson/tasks/MavenTest.java
+++ b/test/src/test/java/hudson/tasks/MavenTest.java
@@ -56,8 +56,6 @@ import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.apache.maven.settings.building.FileSettingsSource;
 import org.jvnet.hudson.test.HudsonTestCase;
 
@@ -67,6 +65,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import hudson.EnvVars;
 import hudson.model.FreeStyleBuild;
 import hudson.model.PasswordParameterDefinition;
+import org.junit.Assert;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.ExtractResourceSCM;
 import org.jvnet.hudson.test.SingleFileSCM;
diff --git a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java
index dca24c1a97..3d0cb18fd3 100644
--- a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java
+++ b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java
@@ -40,8 +40,8 @@ import hudson.maven.MavenModuleSet;
 import java.io.IOException;
 
 import jenkins.model.Jenkins;
-import junit.framework.Assert;
 
+import org.junit.Assert;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.SingleFileSCM;
 import org.jvnet.hudson.test.ExtractResourceSCM;
diff --git a/test/src/test/java/jenkins/model/JenkinsTest.java b/test/src/test/java/jenkins/model/JenkinsTest.java
index 250d9591f5..9b93b9ce14 100644
--- a/test/src/test/java/jenkins/model/JenkinsTest.java
+++ b/test/src/test/java/jenkins/model/JenkinsTest.java
@@ -33,13 +33,13 @@ import hudson.model.RootAction;
 import hudson.model.UnprotectedRootAction;
 import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
 import hudson.util.HttpResponses;
-import junit.framework.Assert;
 import hudson.model.FreeStyleProject;
 import hudson.security.GlobalMatrixAuthorizationStrategy;
 import hudson.security.LegacySecurityRealm;
 import hudson.security.Permission;
 import hudson.util.FormValidation;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.ExtractResourceSCM;
-- 
GitLab