[SECURITY-218] - Refactor the test package to address comments from @jglick

test/src/test/java/jenkins/security/Security218BlackBoxTest.java

@@ -30,7 +30,7 @@ import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import java.io.File;
 import java.io.PrintStream;
-import jenkins.security.ysoserial.payloads.Payload;
+import jenkins.security.security218.Payload;
 import org.jenkinsci.remoting.RoleChecker;
 import org.junit.Test;
 import static org.junit.Assert.*;

test/src/main/java/jenkins/security/ysoserial/payloads/Payload.java → test/src/test/java/jenkins/security/security218/Payload.java

@@ -21,7 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218;
+
+import jenkins.security.security218.ysoserial.payloads.CommonsCollections1;
+import jenkins.security.security218.ysoserial.payloads.CommonsCollections2;
+import jenkins.security.security218.ysoserial.payloads.Groovy1;
+import jenkins.security.security218.ysoserial.payloads.ObjectPayload;
+import jenkins.security.security218.ysoserial.payloads.Spring1;
 
 
 /**

test/src/main/java/jenkins/security/ysoserial/ExecBlockingSecurityManager.java → test/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial;
+package jenkins.security.security218.ysoserial;
 
 import java.security.Permission;
 import java.util.concurrent.Callable;

test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections1.java → test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java

@@ -21,14 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 import java.lang.reflect.InvocationHandler;
 import java.util.HashMap;
 import java.util.Map;
-import jenkins.security.ysoserial.util.Gadgets;
-import jenkins.security.ysoserial.util.PayloadRunner;
-import jenkins.security.ysoserial.util.Reflections;
+import jenkins.security.security218.ysoserial.util.Gadgets;
+import jenkins.security.security218.ysoserial.util.PayloadRunner;
+import jenkins.security.security218.ysoserial.util.Reflections;
 
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.collections.functors.ChainedTransformer;

test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections2.java → test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 import java.util.PriorityQueue;
 import java.util.Queue;
@@ -29,9 +29,9 @@ import java.util.Queue;
 import org.apache.commons.collections4.comparators.TransformingComparator;
 import org.apache.commons.collections4.functors.InvokerTransformer;
 
-import jenkins.security.ysoserial.util.Gadgets;
-import jenkins.security.ysoserial.util.PayloadRunner;
-import jenkins.security.ysoserial.util.Reflections;
+import jenkins.security.security218.ysoserial.util.Gadgets;
+import jenkins.security.security218.ysoserial.util.PayloadRunner;
+import jenkins.security.security218.ysoserial.util.Reflections;
 import org.apache.xalan.xsltc.trax.TemplatesImpl;
 
 /*

test/src/main/java/jenkins/security/ysoserial/payloads/Groovy1.java → test/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 import java.lang.reflect.InvocationHandler;
 import java.util.Map;
-import jenkins.security.ysoserial.util.Gadgets;
-import jenkins.security.ysoserial.util.PayloadRunner;
+import jenkins.security.security218.ysoserial.util.Gadgets;
+import jenkins.security.security218.ysoserial.util.PayloadRunner;
 
 import org.codehaus.groovy.runtime.ConvertedClosure;
 import org.codehaus.groovy.runtime.MethodClosure;

test/src/main/java/jenkins/security/ysoserial/payloads/ObjectPayload.java → test/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 public interface ObjectPayload<T> {
 	/*

test/src/main/java/jenkins/security/ysoserial/payloads/Spring1.java → test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 import static java.lang.Class.forName;
 
@@ -34,9 +34,9 @@ import javax.xml.transform.Templates;
 import org.springframework.beans.factory.ObjectFactory;
 
 
-import jenkins.security.ysoserial.util.Gadgets;
-import jenkins.security.ysoserial.util.PayloadRunner;
-import jenkins.security.ysoserial.util.Reflections;
+import jenkins.security.security218.ysoserial.util.Gadgets;
+import jenkins.security.security218.ysoserial.util.PayloadRunner;
+import jenkins.security.security218.ysoserial.util.Reflections;
 import org.apache.xalan.xsltc.trax.TemplatesImpl;
 
 /*

test/src/main/java/jenkins/security/ysoserial/util/ClassFiles.java → test/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

test/src/main/java/jenkins/security/ysoserial/util/Gadgets.java → test/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;

test/src/main/java/jenkins/security/ysoserial/util/PayloadRunner.java → test/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java

@@ -21,14 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 
 import java.util.concurrent.Callable;
-import jenkins.security.ysoserial.ExecBlockingSecurityManager;
-import jenkins.security.ysoserial.payloads.ObjectPayload;
-import static jenkins.security.ysoserial.util.Serializables.deserialize;
-import static jenkins.security.ysoserial.util.Serializables.serialize;
+import jenkins.security.security218.ysoserial.ExecBlockingSecurityManager;
+import jenkins.security.security218.ysoserial.payloads.ObjectPayload;
+import static jenkins.security.security218.ysoserial.util.Serializables.deserialize;
+import static jenkins.security.security218.ysoserial.util.Serializables.serialize;
 
 /*
  * utility class for running exploits locally from command line

test/src/main/java/jenkins/security/ysoserial/util/Reflections.java → test/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

test/src/main/java/jenkins/security/ysoserial/util/Serializables.java → test/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;