From 83cb18e26d74575ba9e19da5ceb8b555a643ec44 Mon Sep 17 00:00:00 2001
From: zhoubofeng <598808350@qq.com>
Date: Sun, 5 Mar 2017 17:21:11 +0800
Subject: [PATCH 1/2] 20170305work

ArrayUtil,leteStruts
---
 .../src/org/comm/util/StringUtil.java         |  30 ++
 .../src/org/learning/container/ArrayUtil.java | 320 ++++++++++++++++++
 .../src/org/lite/struts/LoginAction.java      |  39 +++
 .../src/org/lite/struts/ReadXML.java          | 100 ++++++
 .../src/org/lite/struts/Struts.java           |  99 ++++++
 .../2017project/src/org/lite/struts/View.java |  23 ++
 .../src/org/lite/struts/struts.xml            |  11 +
 .../org/learning/container/TestArrayUtil.java |  78 +++++
 .../test/org/lite/struts/TestStruts.java      |  38 +++
 9 files changed, 738 insertions(+)
 create mode 100644 group14/598808350/2017project/src/org/comm/util/StringUtil.java
 create mode 100644 group14/598808350/2017project/src/org/learning/container/ArrayUtil.java
 create mode 100644 group14/598808350/2017project/src/org/lite/struts/LoginAction.java
 create mode 100644 group14/598808350/2017project/src/org/lite/struts/ReadXML.java
 create mode 100644 group14/598808350/2017project/src/org/lite/struts/Struts.java
 create mode 100644 group14/598808350/2017project/src/org/lite/struts/View.java
 create mode 100644 group14/598808350/2017project/src/org/lite/struts/struts.xml
 create mode 100644 group14/598808350/2017project/test/org/learning/container/TestArrayUtil.java
 create mode 100644 group14/598808350/2017project/test/org/lite/struts/TestStruts.java

diff --git a/group14/598808350/2017project/src/org/comm/util/StringUtil.java b/group14/598808350/2017project/src/org/comm/util/StringUtil.java
new file mode 100644
index 0000000000..9c7b802252
--- /dev/null
+++ b/group14/598808350/2017project/src/org/comm/util/StringUtil.java
@@ -0,0 +1,30 @@
+package org.comm.util;
+
+import java.util.Arrays;
+
+public class StringUtil {
+
+	public static void printStr(Object obj){
+		System.out.print(obj);
+	}
+	
+	public static void printlnStr(Object obj){
+		System.out.println(obj.toString());
+	}
+	public static void printArr(int[] arr){
+		printlnStr(Arrays.toString(arr));
+	}
+	public static boolean isEmpty(Object str){
+		boolean flag = false;
+		if(str == null || "".equals(str)) flag = true;
+		return flag;
+	}
+	public static String objToStr(Object obj){
+		if(isEmpty(obj)){
+			return "";
+		}else{
+			return obj.toString();
+		}
+	}
+	
+}
diff --git a/group14/598808350/2017project/src/org/learning/container/ArrayUtil.java b/group14/598808350/2017project/src/org/learning/container/ArrayUtil.java
new file mode 100644
index 0000000000..63d9cd1a45
--- /dev/null
+++ b/group14/598808350/2017project/src/org/learning/container/ArrayUtil.java
@@ -0,0 +1,320 @@
+package org.learning.container;
+
+import java.util.Arrays;
+
+import org.comm.util.StringUtil;
+
+public class ArrayUtil {
+
+	/**
+	 * 给定一个数组a，对该数组的值进行反转
+	 * 例如： a= [7,9,30,3] ,置换后：[3,30,9,7]
+	 * 如果：a= [7,9,30,3,4], 置换后[4,3,30,9,7] 
+	 * @param origin
+	 * 
+	 */
+	public static int [] reverseArray(int [] sourceArray){
+		int length = sourceArray.length;
+		int [] newArray = new int[length];
+		for(int i=length;i>0;i--){
+			newArray[length -i ] = sourceArray[i-1];
+		}
+		return newArray;
+		
+	}
+	
+	/**
+	 * 现在有如下一个数组， int [] oldArray = {1,3,4,5,0,0,6,6,0,5,4,7,6,7,0,5}
+	 * 要求将以上数组值为0的项去掉，将不为0的值存入到一个新的数组，生产的数组为
+	 * [1, 3, 4, 5, 6, 6, 5, 4, 7, 6, 7, 5]
+	 * @param oldArray
+	 * @return
+	 */
+	public static int[] removeZero(int [] oldArray){
+		int oldLength = oldArray.length;
+		int [] newArray = new int[oldLength];
+		int index = 0;
+		for(int i=0;i<oldLength;i++){
+			if(oldArray[i] > 0){
+				newArray[index] = oldArray[i];
+				index ++ ;
+			}
+		}
+		int [] dest = new int[index];
+		System.arraycopy(newArray, 0, dest, 0, index);
+		return dest;
+	}
+	/**
+	 * 冒泡排序
+	 * @param array1
+	 * @return
+	 */
+	public static int[] sort(int [] arr){
+		//int[] a1 = new int[]{5, 3, 7,8,1,3,42,2,6};
+		
+		for(int i=0;i<arr.length;i++){
+			for(int j=(i+1);j<arr.length;j++){
+				int a = arr[i];
+				int b = arr[j];
+				if(a>b){
+					arr[i]=b;
+					arr[j]=a;
+				}else if(a == b){
+					arr[j]=0;
+				}
+			}
+		}
+		
+		return arr;
+	}
+	
+	public static int[] replace(int[] sourceArr,int[] resultArr,int index){
+		System.arraycopy(sourceArr, 0, resultArr, 0, index);
+		System.arraycopy(sourceArr, index+1, resultArr, index, sourceArr.length-(index+1));
+		return resultArr;
+	}
+	
+	/**
+	 * 给定两个已经排序好的整形数组， a1和a2 ,  创建一个新的数组a3, 使得a3 包含a1和a2 的所有元素， 并且仍然是有序的
+	 * 例如 a1 = [3, 5, 7,8]   a2 = [4, 5, 6,7]    则 a3 为[3,4,5,6,7,8]    , 注意： 已经消除了重复
+	 * @param array1
+	 * @param array2
+	 * @return
+	 */
+	
+	public static int[] merge(int[] array1, int[] array2){
+		int [] newArr = new int[array1.length+array2.length];
+		//1整合数据
+		int array1L = removeZero(array1).length;
+		int array2L = removeZero(array2).length;
+		int [] array3 = new int[array1L+array2L];
+		System.arraycopy(array1, 0, array3, 0, array1L);
+		System.arraycopy(array2, 0, array3, array1L, array2L);
+		//2排序
+		sort(array3);
+		//3 去重
+		for(int i=0;i<array3.length;i++){
+			if(array3[i] == 0){
+				array3 = replace(array3,newArr,i);
+			}
+		}
+		return  removeZero(array3);
+	}
+	/**
+	 * 把一个已经存满数据的数组 oldArray的容量进行扩展， 扩展后的新数据大小为oldArray.length + size
+	 * 注意，老数组的元素在新数组中需要保持
+	 * 例如 oldArray = [2,3,6] , size = 3,则返回的新数组为
+	 * [2,3,6,0,0,0]
+	 * @param oldArray
+	 * @param size
+	 * @return
+	 */
+	public static int[] grow(int [] oldArray,  int size){
+		if(size <0) throw new IndexOutOfBoundsException();
+		int length = oldArray.length;
+		int [] newArray = new int[length+size];
+		System.arraycopy(oldArray, 0, newArray, 0, length);
+		return newArray;
+	}
+	
+	/**
+	 * 斐波那契数列为：1，1，2，3，5，8，13，21......  ，给定一个最大值， 返回小于该值的数列
+	 * 例如， max = 15 , 则返回的数组应该为 [1，1，2，3，5，8，13]
+	 * max = 1, 则返回空数组 []
+	 * @param max
+	 * @return
+	 */
+	public static int[] fibonacci(int max){
+		int[] result = null;
+		if (max == 1) return result = new int[0];
+		if (max == 2) return result = new int[]{1};
+		
+		int a =1,b=1,c=0;
+		int aIndex = 0;
+		int bIndex = 0;
+		int cIndex = 3;
+		result = new int[max];
+		result[0] =1;
+		result[1] =1;
+		int rIndex = 2;
+		for(int i=0;i<max;i++){
+			
+			if(cIndex == 3){
+				cIndex = 0;
+				aIndex = 3;
+				c = a+b;
+				if(c>=max){break;}
+				//printStr(c+",");
+				result[rIndex] = c;
+				rIndex +=1;
+			}else if(aIndex == 3){
+				aIndex = 0;
+				bIndex = 3;
+				a = b+c;
+				if(a>=max){break;}
+				//printStr(c+",");
+				result[rIndex] = a;
+				rIndex +=1;
+			}else if(bIndex == 3){
+				cIndex = 3;
+				bIndex = 0;
+				b = c+a;
+				if(b>=max){break;}
+				//printStr(c+",");
+				result[rIndex] = b;
+				rIndex +=1;
+			}
+		}
+		
+		
+		return removeZero(result);
+	}
+	
+	/**
+	 * 返回小于给定最大值max的所有素数数组
+	 * 例如max = 23, 返回的数组为[2,3,5,7,11,13,17,19]
+	 * @param max
+	 * @return
+	 */
+	public static int[] getPrimes(int max){
+		int [] result = new int[max];
+		result[0] =2;
+		result[1] =3;
+		result[2] =5;
+		result[3] =7;
+		int index = 4;
+		for(int i = 8;i<max;i++){
+			if(isPrimes(i)){
+				result[index] = i;
+				index+=1;
+			}
+		}
+		return removeZero(result);
+	}
+	/**
+	 * 判断num 是否为素数
+	 * @param num
+	 * @return
+	 */
+	public static boolean isPrimes(int num){
+		boolean flag0 = num%2 == 0;
+		boolean flag1 = num%3 == 0;
+		boolean flag2 = num%5 == 0;
+		boolean flag3 = num%7 == 0;
+		if(!flag0 && !flag1 && !flag2 && !flag3) return true;
+		return false;
+	}
+	
+	/**
+	 * 获取一个数字的因数 
+	 * @param num
+	 * @return
+	 */
+	public static int[] getYinzi(int num){
+		int [] res = new int[num];
+		int index =0;
+		for(int i=1;i<num;i++){
+			if(num%i == 0){
+				res[index] = i;
+				index +=1;
+			} 
+		}
+		return removeZero(res);
+	}
+	/**
+	 * 获取一个整型数组 中值的和
+	 * @param sour
+	 * @return
+	 */
+	public static int sum(int[] sour){
+		int sum = 0;
+		for(int num : sour){
+			sum+= num;
+		}
+		return sum;
+	}
+	/**
+	 * 判断 num  是否 是完数
+	 * @param num
+	 * @return
+	 */
+	public static boolean isPerfectNumber(int num){
+		int [] res = getYinzi(num);
+		int sum = sum(res);
+		if(sum == num) return true;
+		return false;
+	}
+	
+	/**
+	 * 所谓“完数”， 是指这个数恰好等于它的因子之和，例如6=1+2+3
+	 * 给定一个最大值max， 返回一个数组， 数组中是小于max 的所有完数
+	 * @param max
+	 * @return
+	 */
+	public static int[] getPerfectNumbers(int max){
+		int[] res = new int[max];
+		int index=0;
+		for(int i=0;i<max;i++){
+			if(isPerfectNumber(i)) {
+				res[index] = i;
+				index+=1;
+			}
+		}
+		
+		return removeZero(res);
+	}
+	
+	/**
+	 * 用seperator 把数组 array给连接起来
+	 * 例如array= [3,8,9], seperator = "-"
+	 * 则返回值为"3-8-9"
+	 * @param array
+	 * @param s
+	 * @return
+	 */
+	public static String join(int[] array, String seperator){
+		//Arrays.toString()后， 逗号(,)后 有空格
+		String str = Arrays.toString(array);
+		str = str.replaceAll(", ", seperator);
+		return str.substring(1,str.length()-1);
+	}
+	
+	
+	
+	public static void main(String[] args) {
+		int [] oldArray = {1,3,4,5,0,0,6,6,0,5,4,7,6,7,0,5};
+		StringUtil.printArr(removeZero(oldArray));
+		//int [] a= new int[]{7,9,30,3} ;
+		/*int [] a =new int[]{7,9,30,3,4};
+		int[] arr = reverseArray(a);
+		printStr("原值");
+		printArr(a);
+		printStr("转换后的值");
+		printArr(arr);*/
+		/*int [] oldArray = new int []{2,3,6};
+		int size = 3;
+		printArr(grow(oldArray,size));*/
+		/*printArr(fibonacci(13));*/
+		/*printArr(getPrimes(23));*/
+		//printArr(getYinzi(6));
+		/*int num = 496;
+		int [] res = getYinzi(num);
+		printArr(res);
+		int sum = sum(res);
+		printlnStr(sum);*/
+		int num = 497;
+		StringUtil.printArr(getPerfectNumbers(num));
+		/*int [] a =new int[]{7,9,30,3,4};
+		String seperator= "-";
+		printlnStr(join(a,seperator));*/
+		
+		/*int[] a1 = new int[]{3, 5, 7,8}; 
+		int[] a2 = new int[]{4, 5, 6,7,9};
+		int [] a3 = merge(a1, a2);
+		StringUtil.printArr(a3);*/
+		//int[] a1 = new int[]{3, 5, 7,8,1,3,42,2,6};
+		//printArr(sort(a1));
+		
+	}
+
+}
diff --git a/group14/598808350/2017project/src/org/lite/struts/LoginAction.java b/group14/598808350/2017project/src/org/lite/struts/LoginAction.java
new file mode 100644
index 0000000000..cd9599af2c
--- /dev/null
+++ b/group14/598808350/2017project/src/org/lite/struts/LoginAction.java
@@ -0,0 +1,39 @@
+package org.lite.struts;
+
+/**
+ * 鏉╂瑦妲告稉锟介嚋閻€劍娼电仦鏇犮仛閻ц缍嶉惃鍕瑹閸旓紕琚敍锟介崗鏈佃厬閻ㄥ嫮鏁ら幋宄版倳閸滃苯鐦戦惍渚�鍏橀弰顖溾�栫紓鏍垳閻ㄥ嫨锟�
+ * @author liuxin
+ *
+ */
+public class LoginAction{
+    private String name ;
+    private String password;
+    private String message;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String execute(){
+            if("test".equals(name) && "1234".equals(password)){
+                this.message = "login successful";
+                return "success";
+            }
+            this.message = "login failed,please check your user/pwd";
+            return "fail";
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+    public void setPassword(String password){
+        this.password = password;
+    }
+    public String getMessage(){
+        return this.message;
+    }
+}
diff --git a/group14/598808350/2017project/src/org/lite/struts/ReadXML.java b/group14/598808350/2017project/src/org/lite/struts/ReadXML.java
new file mode 100644
index 0000000000..e78ae75732
--- /dev/null
+++ b/group14/598808350/2017project/src/org/lite/struts/ReadXML.java
@@ -0,0 +1,100 @@
+package org.lite.struts;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.comm.util.StringUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+/**
+ * 读取xml 配置文件
+ * @author z
+ *
+ */
+public class ReadXML {
+	
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		String actionName = "login";
+		HashMap map = readXml(actionName);
+		
+		Iterator it = map.keySet().iterator();
+		StringUtil.printlnStr("it.hasNext():"+it.hasNext());
+		while(it.hasNext()){
+			String key = (String)it.next();
+			String value = (String)map.get(key);
+			
+			StringUtil.printlnStr(key+":"+value);
+		}
+		
+	}
+	
+	public static HashMap readXml(String actionName){
+		HashMap map = new HashMap();
+		String path = "E:\\zhoubf_code\\coding2017\\group14\\598808350\\2017project\\src\\org\\lite\\struts\\struts.xml";
+		File f = new File(path);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		try {
+			DocumentBuilder dBuilder = dbf.newDocumentBuilder();
+			Document doc = dBuilder.parse(f);
+			NodeList resultNL = doc.getElementsByTagName("action");
+			for(int i=0;i<resultNL.getLength();i++){
+				Node node = resultNL.item(i);
+                Element  ele = (Element)node;  
+
+                
+				NamedNodeMap nodeMap = node.getAttributes();
+				String name = nodeMap.getNamedItem("name").getNodeValue();//交易码
+				if(actionName != null && actionName.equals(name)){
+					String cla = nodeMap.getNamedItem("class").getNodeValue();//描述
+					map.put("ActionName", name);
+					map.put("ClassName", cla);
+					
+					
+					NodeList childList = ele.getElementsByTagName("result");
+					for(int j=0;j<childList.getLength();j++){
+						Node childNode = childList.item(j);
+						NamedNodeMap childNodeMap = childNode.getAttributes();
+						String resultName = childNodeMap.getNamedItem("name").getNodeValue();
+						String pageUrl = childNode.getTextContent();
+						map.put(resultName, resultName);
+						map.put(resultName+"URL", pageUrl);
+					}
+						
+				}
+				
+			}
+			
+		} catch (ParserConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		return map;
+		
+		
+		
+		
+		
+		
+	}
+
+}
diff --git a/group14/598808350/2017project/src/org/lite/struts/Struts.java b/group14/598808350/2017project/src/org/lite/struts/Struts.java
new file mode 100644
index 0000000000..3a11d5f5d6
--- /dev/null
+++ b/group14/598808350/2017project/src/org/lite/struts/Struts.java
@@ -0,0 +1,99 @@
+package org.lite.struts;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.comm.util.StringUtil;
+
+
+
+public class Struts {
+	
+	public static void main(String [] args){
+		String actionName = "login";
+		HashMap<String,String> params = new HashMap<String,String>();
+		params.put("name", "test");
+		params.put("pwd", "1234");
+		runAction(actionName,params);
+	}
+
+    public static View runAction(String actionName, Map<String,String> parameters) {
+    	HashMap strutsMap = ReadXML.readXml(actionName);
+    	View view = null;
+    	
+    	if(!strutsMap.isEmpty()){
+    		String className = (String)strutsMap.get("ClassName");
+    		
+    		try {
+				Class cls = Class.forName(className);
+				 try {
+					Object obj = cls.newInstance();
+					Field nameF = cls.getDeclaredField("name");
+					nameF.setAccessible(true);
+					nameF.set(obj, StringUtil.objToStr(parameters.get("name")));
+					
+					 Field pwdF = cls.getDeclaredField("password");
+					 pwdF.setAccessible(true);
+					 pwdF.set(obj, StringUtil.objToStr(parameters.get("pwd")));
+					 
+					try {
+						Method method = cls.getMethod("execute");
+						String result = (String)method.invoke(obj);
+						Field messageF = cls.getDeclaredField("message");
+						messageF.setAccessible(true);
+						String msg = (String)messageF.get(obj);
+						String pageUrl = (String)strutsMap.get(result+"URL");
+						view = new View();
+						view.setJsp(pageUrl);
+						HashMap map = new HashMap();
+						map.put("msg", msg);
+						map.put("result", result);
+						view.setParameters(map);
+						
+						StringUtil.printlnStr("result:"+result);
+						StringUtil.printlnStr("msg:"+msg);
+						StringUtil.printlnStr("pageUrl:"+pageUrl);
+					} catch (NoSuchMethodException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}catch (IllegalArgumentException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (InvocationTargetException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					 
+					 
+					
+					
+				} catch (InstantiationException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				} catch (IllegalAccessException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+			}catch (ClassNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (SecurityException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (NoSuchFieldException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+    		
+    	}else{
+    		StringUtil.printlnStr("Action is not found");
+    	}
+    	
+    	
+    	return view;
+    }    
+
+}
diff --git a/group14/598808350/2017project/src/org/lite/struts/View.java b/group14/598808350/2017project/src/org/lite/struts/View.java
new file mode 100644
index 0000000000..bb6a56a8c1
--- /dev/null
+++ b/group14/598808350/2017project/src/org/lite/struts/View.java
@@ -0,0 +1,23 @@
+package org.lite.struts;
+
+import java.util.Map;
+
+public class View {
+	private String jsp;
+	private Map parameters;
+	
+	public String getJsp() {
+		return jsp;
+	}
+	public View setJsp(String jsp) {
+		this.jsp = jsp;
+		return this;
+	}
+	public Map getParameters() {
+		return parameters;
+	}
+	public View setParameters(Map parameters) {
+		this.parameters = parameters;
+		return this;
+	}
+}
diff --git a/group14/598808350/2017project/src/org/lite/struts/struts.xml b/group14/598808350/2017project/src/org/lite/struts/struts.xml
new file mode 100644
index 0000000000..b9bf410c73
--- /dev/null
+++ b/group14/598808350/2017project/src/org/lite/struts/struts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+    <action name="login" class="org.lite.struts.LoginAction">
+        <result name="success">/jsp/homepage.jsp</result>
+        <result name="fail">/jsp/showLogin.jsp</result>
+    </action>
+    <action name="logout" class="org.lite.struts.LogoutAction">
+    	<result name = "success">/jsp/welcome.jsp</result>
+    	<result name = "error">/jsp/error.jsp</result>
+    </action>
+</struts>
\ No newline at end of file
diff --git a/group14/598808350/2017project/test/org/learning/container/TestArrayUtil.java b/group14/598808350/2017project/test/org/learning/container/TestArrayUtil.java
new file mode 100644
index 0000000000..8ac30e9dd7
--- /dev/null
+++ b/group14/598808350/2017project/test/org/learning/container/TestArrayUtil.java
@@ -0,0 +1,78 @@
+package org.learning.container;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+public class TestArrayUtil extends TestCase{
+	
+	private ArrayUtil au = null;
+	
+	@Override
+	public void setUp(){
+		//首先执行
+		//生成实例
+		au = new ArrayUtil();
+		
+	}
+	public void testReverseArray(){
+		int [] array1 = {7,9,30,3};
+		int[] result1 = au.reverseArray(array1);
+		int[] exp1 = {3,30,9,7};
+		Assert.assertArrayEquals(exp1, result1);
+		
+	}
+	public void testRemoveZero(){
+		 int[] oldArray = {1,3,4,5,0,0,6,6,0,5,4,7,6,7,0,5};
+		 int[] newArray = au.removeZero(oldArray);
+		 int[] exp1 = {1, 3, 4, 5, 6, 6, 5, 4, 7, 6, 7, 5};
+		 Assert.assertArrayEquals(exp1, newArray);
+	}
+	public void testMerge(){
+		int[] array1 = {3, 5, 7,8};
+		int[] array2 = {4, 5, 6,7};
+		int[] newArray = au.merge(array1, array2);
+		int[] exp1 = {3,4,5,6,7,8};
+		Assert.assertArrayEquals(exp1, newArray);
+	}
+	
+	public void testGrow(){
+		int[] array1 = {3, 5, 7,8};
+		int[] newArray = au.grow(array1, 1);
+		int[] exp1= {3, 5, 7,8,0};
+		Assert.assertArrayEquals(exp1, newArray);
+	}
+	
+	public void testFibonacci(){
+		int  max = 22;
+		int[] newArray = au.fibonacci(max);
+		int[] exp1 = {1,1,2,3,5,8,13,21};
+		Assert.assertArrayEquals(exp1, newArray);
+	}
+	public void testGetPrimes(){
+		int max =23;
+		int[] newArray = au.getPrimes(max);
+		int[] exp1 = {2,3,5,7,11,13,17,19};
+		Assert.assertArrayEquals(exp1, newArray);
+	}
+	public void testGetPerfectNumbers(){
+		int max = 497;
+		int[] newArray = au.getPerfectNumbers(max);
+		int[] exp1 = {6, 28, 496};
+		Assert.assertArrayEquals(exp1, newArray);
+	}
+	public void testJoin(){
+		//join(int[] array, String seperator)
+		int[] array = {3,8,9};
+		String seperator = "-";
+		String result = au.join(array, seperator);
+		String exp1 = "3-8-9";
+		Assert.assertEquals("相等", exp1, result);
+	}
+	
+	
+	@Override
+	public void tearDown(){
+		//最后执行
+	}
+}
diff --git a/group14/598808350/2017project/test/org/lite/struts/TestStruts.java b/group14/598808350/2017project/test/org/lite/struts/TestStruts.java
new file mode 100644
index 0000000000..16ccc711e0
--- /dev/null
+++ b/group14/598808350/2017project/test/org/lite/struts/TestStruts.java
@@ -0,0 +1,38 @@
+package org.lite.struts;
+
+import java.util.HashMap;
+
+import org.junit.Assert;
+
+import junit.framework.TestCase;
+
+public class TestStruts extends TestCase{
+
+	private Struts struts = null;
+	
+	@Override
+	public void setUp(){
+		struts = new Struts();
+	}
+	public void testRunAction(){
+		String actionName = "login";
+		HashMap<String,String> params = new HashMap<String,String>();
+		params.put("name", "test");
+		params.put("pwd", "1234");
+		View view = struts.runAction(actionName, params);
+		String jsp = view.getJsp();
+		String exp1 = "/jsp/homepage.jsp";
+		Assert.assertEquals("登录成功", exp1, jsp);
+		
+		params = new HashMap<String,String>();
+		params = new HashMap<String,String>();
+		params.put("name", "test");
+		params.put("pwd", "12341");
+		view = struts.runAction(actionName, params);
+		jsp = view.getJsp();
+		exp1 = "/jsp/showLogin.jsp";
+		Assert.assertEquals("密码错误，登录失败", exp1, jsp);
+		
+		
+	}
+}

From b6a4abfc6a55c9fb5dad703924cad1f41d878a7c Mon Sep 17 00:00:00 2001
From: zhoubofeng <598808350@qq.com>
Date: Sun, 5 Mar 2017 19:57:24 +0800
Subject: [PATCH 2/2] junit testall

junit testall
---
 .../test/org/test/all/TestAll.java            | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 group14/598808350/2017project/test/org/test/all/TestAll.java

diff --git a/group14/598808350/2017project/test/org/test/all/TestAll.java b/group14/598808350/2017project/test/org/test/all/TestAll.java
new file mode 100644
index 0000000000..265bdb4c64
--- /dev/null
+++ b/group14/598808350/2017project/test/org/test/all/TestAll.java
@@ -0,0 +1,24 @@
+package org.test.all;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.learning.container.TestArrayUtil;
+import org.lite.struts.TestStruts;
+
+/**
+ * 将多个测试用例加到一个运行方法中运行。
+ * @author z
+ *
+ */
+public class TestAll extends TestCase{
+
+	public static Test suite(){
+		TestSuite suite = new TestSuite();
+		suite.addTestSuite(TestArrayUtil.class);
+		suite.addTestSuite(TestStruts.class);
+		return suite;
+	}
+	
+}