[tomee] 43/48: TOMEE-2365 - Moved AbstractTomEESecurityTest to the base package.

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit cbc6f4204bb64a2ba9e97fdb991feb01e3e1b029
Author: Roberto Cortez <ra...@yahoo.com>
AuthorDate: Tue Jan 8 15:35:31 2019 +0000

    TOMEE-2365 - Moved AbstractTomEESecurityTest to the base package.
---
 .../tomee/security/{servlet => }/AbstractTomEESecurityTest.java  | 9 ++++++++-
 .../org/apache/tomee/security/servlet/BasicAuthServletTest.java  | 1 +
 .../org/apache/tomee/security/servlet/FormAuthServletTest.java   | 1 +
 .../org/apache/tomee/security/servlet/SimpleServletTest.java     | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/AbstractTomEESecurityTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/AbstractTomEESecurityTest.java
similarity index 89%
rename from tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/AbstractTomEESecurityTest.java
rename to tomee/tomee-security/src/test/java/org/apache/tomee/security/AbstractTomEESecurityTest.java
index 8999b2b..1b8e90b 100644
--- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/AbstractTomEESecurityTest.java
+++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/AbstractTomEESecurityTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomee.security.servlet;
+package org.apache.tomee.security;
 
 import org.apache.openejb.loader.JarLocation;
 import org.apache.openejb.util.NetworkUtil;
 import org.apache.tomee.embedded.Configuration;
 import org.apache.tomee.embedded.Container;
+import org.apache.tomee.security.servlet.TomEESecurityServletContainerInitializer;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 
 public abstract class AbstractTomEESecurityTest {
@@ -44,6 +46,11 @@ public abstract class AbstractTomEESecurityTest {
         container.close();
     }
 
+    @Before
+    public void setUpBefore() throws Exception {
+        container.inject(this);
+    }
+
     protected String getAppUrl() {
         return "http://localhost:" + container.getConfiguration().getHttpPort();
     }
diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java
index e45e387..03f0a38 100644
--- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java
+++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.tomee.security.servlet;
 
+import org.apache.tomee.security.AbstractTomEESecurityTest;
 import org.apache.tomee.security.client.BasicAuthFilter;
 import org.junit.Test;
 
diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/FormAuthServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/FormAuthServletTest.java
index 1fd6f7e..df81b39 100644
--- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/FormAuthServletTest.java
+++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/FormAuthServletTest.java
@@ -20,6 +20,7 @@ import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.apache.tomee.security.AbstractTomEESecurityTest;
 import org.junit.Test;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java
index e45e2ed..60c45d2 100644
--- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java
+++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.tomee.security.servlet;
 
+import org.apache.tomee.security.AbstractTomEESecurityTest;
 import org.junit.Test;
 
 import javax.servlet.ServletException;