WW-5283 Adjusts tests to use proper new based test case class

apache · Feb 18, 2023 · f81a070 · f81a070
1 parent d36c708
commit f81a070
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 42 deletions.
diff --git a/...ype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java b/...ype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
@@ -19,7 +19,7 @@
 package ${package}.actions;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.StrutsRestTestCase;
+import org.apache.struts2.junit.StrutsRestTestCase;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

diff --git a/...hetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java b/...hetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
@@ -16,21 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package ${package}.example;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.config.RuntimeConfiguration;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.config.StrutsXmlConfigurationProvider;
+import org.apache.struts2.junit.StrutsTestCase;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.struts2.StrutsTestCase;
-
 public class ConfigTest extends StrutsTestCase {
 
  protected void assertSuccess(String result) {
@@ -56,7 +53,7 @@ protected void assertFieldError(Map<String, List<String>> fieldErrors, String fi
 
  protected void setUp() throws Exception {
  super.setUp();
- XmlConfigurationProvider c = new XmlConfigurationProvider("struts.xml");
+ XmlConfigurationProvider c = new StrutsXmlConfigurationProvider("struts.xml");
  configurationManager.addContainerProvider(c);
  configurationManager.reload();
  }

diff --git a/...pe-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java b/...pe-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package ${package}.example;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.junit.StrutsTestCase;
 
 public class HelloWorldTest extends StrutsTestCase {
 

diff --git a/...chetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java b/...chetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package ${package}.example;
 
 import com.opensymphony.xwork2.ActionProxy;

diff --git a/...vention/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java b/...vention/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java
@@ -1,6 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package ${package}.actions;
 
-import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.junit.StrutsTestCase;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionSupport;

diff --git a/...pe-convention/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java b/...pe-convention/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
@@ -1,7 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package ${package}.actions;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.junit.StrutsTestCase;
 
 public class IndexTest extends StrutsTestCase {
 

diff --git a/...pe-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java b/...pe-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
@@ -1,29 +1,29 @@
 /*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http:https://www.apache.org/licenses/LICENSE-2.0
  *
- * http:https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package ${package};
 
 import junit.framework.TestCase;
 
 import com.opensymphony.xwork2.Action;
 
-/**
- * 
- */
 public class HelloWorldActionTest extends TestCase {
- 
+
  public void testHelloWorldAction() throws Exception {
  HelloWorldAction action = new HelloWorldAction();
  String result = action.execute();

diff --git a/...chetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java b/...chetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
@@ -1,29 +1,29 @@
 /*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http:https://www.apache.org/licenses/LICENSE-2.0
  *
- * http:https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package ${package};
 
 import junit.framework.TestCase;
 
 import com.opensymphony.xwork2.Action;
 
-/**
- * 
- */
 public class IndexActionTest extends TestCase {
- 
+
  public void testIndexAction() throws Exception {
  IndexAction action = new IndexAction();
  String result = action.execute();