You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by am...@apache.org on 2016/11/11 21:16:50 UTC
struts git commit: Fix import for deprecated JUnit Assert
Repository: struts
Updated Branches:
refs/heads/master 366366cdd -> a5817fecb
Fix import for deprecated JUnit Assert
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a5817fec
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a5817fec
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a5817fec
Branch: refs/heads/master
Commit: a5817fecb3af8bbee6f254e1c249e08e4cc82388
Parents: 366366c
Author: Aleksandr Mashchenko <am...@apache.org>
Authored: Fri Nov 11 23:15:16 2016 +0200
Committer: Aleksandr Mashchenko <am...@apache.org>
Committed: Fri Nov 11 23:15:16 2016 +0200
----------------------------------------------------------------------
.../main/java/com/opensymphony/xwork2/mock/MockInterceptor.java | 2 +-
core/src/test/java/com/opensymphony/xwork2/NestedAction.java | 2 +-
core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java | 2 +-
.../config/providers/XmlConfigurationProviderMultilevelTest.java | 2 +-
.../opensymphony/xwork2/interceptor/ParametersInterceptorTest.java | 2 +-
.../opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java | 2 +-
core/src/test/java/org/apache/struts2/TestResult.java | 2 +-
.../struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a5817fec/core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java
index c244770..691fcf6 100644
--- a/core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.mock;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/a5817fec/core/src/test/java/com/opensymphony/xwork2/NestedAction.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/NestedAction.java b/core/src/test/java/com/opensymphony/xwork2/NestedAction.java
index 5d743f2..342d864 100644
--- a/core/src/test/java/com/opensymphony/xwork2/NestedAction.java
+++ b/core/src/test/java/com/opensymphony/xwork2/NestedAction.java
@@ -16,7 +16,7 @@
package com.opensymphony.xwork2;
import com.opensymphony.xwork2.util.ValueStack;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/a5817fec/core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java b/core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java
index fb71a06..86f678e 100644
--- a/core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java
+++ b/core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java
@@ -16,7 +16,7 @@
package com.opensymphony.xwork2;
import com.opensymphony.xwork2.interceptor.Interceptor;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/a5817fec/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java
index dcf6b69..43a05e6 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java
@@ -22,7 +22,7 @@ import com.opensymphony.xwork2.config.entities.InterceptorMapping;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/a5817fec/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index e95bdc4..e426aa8 100644
--- a/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -29,7 +29,7 @@ import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
import com.opensymphony.xwork2.util.CompoundRoot;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
import ognl.OgnlContext;
import ognl.PropertyAccessor;
import org.apache.struts2.dispatcher.HttpParameters;
http://git-wip-us.apache.org/repos/asf/struts/blob/a5817fec/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
index 169477d..eb5589f 100644
--- a/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
@@ -10,7 +10,7 @@ import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.InterceptorConfig;
import com.opensymphony.xwork2.validator.ValidationInterceptor;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
http://git-wip-us.apache.org/repos/asf/struts/blob/a5817fec/core/src/test/java/org/apache/struts2/TestResult.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/TestResult.java b/core/src/test/java/org/apache/struts2/TestResult.java
index 5927f79..09e2c3c 100644
--- a/core/src/test/java/org/apache/struts2/TestResult.java
+++ b/core/src/test/java/org/apache/struts2/TestResult.java
@@ -25,7 +25,7 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.util.ValueStack;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/struts/blob/a5817fec/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
index 21f94a0..dd95421 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
@@ -21,7 +21,7 @@
package org.apache.struts2.dispatcher;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.struts2.TestAction;