> classes) {
- // 获取此包的目录 建立一个File
- File dir = new File(packagePath);
- // 如果不存在或者 也不是目录就直接返回
- if (!dir.exists() || !dir.isDirectory()) {
- log.warn("用户定义包名 " + packageName + " 下没有任何文件");
- return;
- }
- // 如果存在 就获取包下的所有文件 包括目录
- File[] dirfiles = dir.listFiles(new FileFilter() {
- // 自定义过滤规则 如果可以循环(包含子目录) 或则是以.class结尾的文件(编译好的java类文件)
- public boolean accept(File file) {
- return (recursive && file.isDirectory()) || (file.getName().endsWith(".class"));
- }
- });
- // 循环所有文件
- for (File file : dirfiles) {
- // 如果是目录 则继续扫描
- if (file.isDirectory()) {
- findAndAddClassesInPackageByFile(packageName + "." + file.getName(), file.getAbsolutePath(), recursive, classes);
- } else {
- // 如果是java类文件 去掉后面的.class 只留下类名
- String className = file.getName().substring(0, file.getName().length() - 6);
- try {
- // 添加到集合中去
- classes.add(Class.forName(packageName + '.' + className));
- } catch (ClassNotFoundException e) {
- log.error("添加用户自定义视图类错误 找不到此类的.class文件");
- e.printStackTrace();
- }
- }
- }
- }
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/CommandUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/CommandUtil.java
deleted file mode 100644
index 3ab9afad9c..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/CommandUtil.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.io.IOException;
-
-public class CommandUtil {
- public static void excuteCommand(String command){
- try {
- Runtime.getRuntime().exec(command);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- public static void excuteSwipCommand(){
- try {
- Runtime.getRuntime().exec("adb -s 48621121 shell input swipe 300 200 10 200");
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/CommonUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/CommonUtil.java
deleted file mode 100644
index 1d1450a348..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/CommonUtil.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.util.Calendar;
-import java.util.Random;
-
-/**
- * @Title: CommonUtil.java
- * @Package network.platon.autotest.utils
- * @Description: TODO(用一句话描述该文件做什么)
- * @author qcxiao
- * @date 2013-9-24 下午11:10:31
- */
-public class CommonUtil {
-
- /**
- * 指定时间内等待条件为真
- *
- * @param condition
- * 条件
- * @param s
- * 等待时间，秒为单位
- * @return 等待是否成功
- */
- private static Boolean waitUntil(Boolean condition, int s) {
- Calendar now = Calendar.getInstance();
- Calendar end = (Calendar) now.clone();
- end.add(Calendar.SECOND, s);
- while (!condition && now.before(end)) {
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- now = Calendar.getInstance();
- }
- return condition;
- }
-
- /**
- * 指定时间内等待条件为真，默认60s
- *
- * @param condition
- * 条件
- * @return 等待是否成功
- */
- @SuppressWarnings("unused")
- private static Boolean waitUntil(Boolean condition) {
- return waitUntil(condition, 60);
- }
-
- public static void main(String args[]) {
- System.out.println(Calendar.getInstance().toString());
- if (waitUntil(1 == 0, 5)) {
- System.out.println("true");
- } else {
- System.out.println("false");
- }
- System.out.println(Calendar.getInstance().toString());
- }
-
- /**
- * 生成指定长度的随机数，包含字母与数字
- * @param length
- * @return 随机数与字符
- * @Example CommonUtil.getRandomCharacterAndNumber(8);
- */
- public static String getRandomCharacterAndNumber(int length) {
- String val = "";
-
- Random random = new Random();
- for (int i = 0; i < length; i++) {
- String charOrNum = random.nextInt(2) % 2 == 0 ? "char" : "num"; // 输出字母还是数字
-
- if ("char".equalsIgnoreCase(charOrNum)) // 字符串
- {
- int choice = random.nextInt(2) % 2 == 0 ? 65 : 97; // 取得大写字母还是小写字母
- val += (char) (choice + random.nextInt(26));
- } else if ("num".equalsIgnoreCase(charOrNum)) // 数字
- {
- val += String.valueOf(random.nextInt(10));
- }
- }
-
- return val;
- }
-
- /**
- * 生成指定长度的字母随机数
- * @param length
- * @return 随机字符
- * @Example
- * CommonUtil.getRandomCharacter(8);
- */
- public static String getRandomCharacter(int length) {
- String val = "";
-
- Random random = new Random();
- for (int i = 0; i < length; i++) {
- int choice = random.nextInt(2) % 2 == 0 ? 65 : 97; // 取得大写字母还是小写字母
- val += (char) (choice + random.nextInt(26));
- }
-
- return val;
- }
-
- /**
- * 生成指定长度的数字随机数
- * @param length
- * @return 随机数
- * @Example
- * CommonUtil.getRandomNumber(8);
- */
- public static String getRandomNumber(int length) {
- String val = "";
- Random random = new Random();
- for (int i = 0; i < length; i++) {
- val += String.valueOf(random.nextInt(10));
- }
-
- return val;
- }
- public static Integer getRandomForMax(int value){
- Random random = new Random();
- int val = random.nextInt(value);
- return val == 0 ? 1 : val;
- }
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/DataUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/DataUtil.java
deleted file mode 100644
index f42206d75e..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/DataUtil.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.text.NumberFormat;
-
-/**
- * 数据处理工具类
- *
- * @author qcxiao
- *
- */
-public class DataUtil {
- /**
- * 四舍五入，并保留多少位小数
- * @param v 参数为double类型
- * @param scale
- * @return 返回值为String类型
- */
- public static String round(double value, Integer max) {
- return roundObject(value,max);
- }
- public static String roundObject(double value, Integer max) {
- NumberFormat nf = NumberFormat.getInstance();
- nf.setMaximumFractionDigits(max);
- nf.setMinimumFractionDigits(max);
- nf.setGroupingUsed(false);
- return nf.format(value);
- }
- /**
- * 四舍五入，并保留多少位小数
- * @param v 参数为String类型
- * @param scale
- * @return 返回值为String类型
- */
- public static String round(String value, Integer max) {
- return roundObject(Double.parseDouble(value),max);
- }
- /**
- * 四舍五入，并保留多少位小数
- * @param v 参数为double类型
- * @param scale
- * @return 返回值为Double类型
- */
- public static Double round(double value, int max) {
- return Double.parseDouble(roundObject(value,max));
- }
- /**
- * 四舍五入，并保留多少位小数
- * @param v 参数为String类型
- * @param scale
- * @return 返回值为Double类型
- */
- public static Double round(String value, int max) {
- return Double.parseDouble(roundObject(Double.parseDouble(value),max));
- }
- public static void main(String[] args) {
- System.out.println(round(12.0036,Integer.valueOf(3)));
- }
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/DateUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/DateUtil.java
deleted file mode 100644
index 1175817cd2..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/DateUtil.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-
-/**
- * @author qcxiao
- * @Description: 日期操作工具
- */
-public class DateUtil {
- /**
- * 日期转换成指定格式的字符串(默认格式为yyyy-MM-dd HH:mm:ss.SSS)
- * @param date 日期
- * @param pattern 格式
- * @return 字符串格式的日期
- * @Example
- * DateUtil.dateToStr(new GregorianCalendar().getTime(),"yyyy-MM-dd");//2013-11-15
- */
- public static String dateToStr(Date date, String pattern) {
- return dateToStr(date, pattern, Locale.CHINA);
- }
-
- /**
- * 日期转换成指定格式的字符串（默认格式为yyyy-MM-dd HH:mm:ss.SSS）
- * @param date Date date， 日期；
- * @param pattern String pattern，格式；
- * @param locale Locale locale，区域语言；
- * @return 字符串格式的日期
- * dateToStr(new Date(), "ddMMM", Locale.ENGLISH);//29Nov
- */
- public static String dateToStr(Date date, String pattern, Locale locale) {
- if (pattern == null) {
- pattern = "yyyy-MM-dd HH:mm:ss.SSS";
- }
- DateFormat ymdhmsFormat = new SimpleDateFormat(pattern, locale);
-
- return ymdhmsFormat.format(date);
- }
-
- /**
- * 字符串转为Date对象（默认格式为yyyy-MM-dd HH:mm:ss.SSS）
- * @param str 字符串
- * @param pattern 格式
- * @return
- * @throws ParseException
- * @Example
- * DateUtil.strToDate("2013-11-15","yyyy-MM-dd");//Fri Nov 15 00:00:00 CST 2013
- */
- public static Date strToDate(String str, String pattern) throws ParseException {
- return strToDate(str, pattern, Locale.CHINA);
- }
-
- /**
- * 指定格式的字符串转换成日期(默认格式为yyyy-MM-dd HH:mm:ss.SSS)
- * @param str 字符串
- * @param pattern 格式
- * @param locale 区域语言
- * @return
- * @throws ParseException
- * @Example DateUtil.strToDate("15OCT2013", "ddMMMyyyy", Locale.ENGLISH);//Tue Oct 15 00:00:00 CST 2013
- */
- public static Date strToDate(String str, String pattern, Locale locale) throws ParseException {
- if (pattern == null) {
- pattern = "yyyy-MM-dd HH:mm:ss.SSS";
- }
- DateFormat ymdhmsFormat = new SimpleDateFormat(pattern, locale);
- return ymdhmsFormat.parse(str);
- }
-
- /**
- * 得到当天的日期
- * @return Date
- * @Example
- * DateUtil.getToday();//Fri Nov 15 16:41:05 CST 2013
- */
- public static Date getToday() {
- Calendar ca = Calendar.getInstance();
- return ca.getTime();
- }
-
- /**
- * 生成日期
- * @param year
- * @param month
- * @param date
- * @return Date
- */
- public static Date mkDate(int year, int month, int date) {
- Calendar ca = Calendar.getInstance();
- ca.set(year, month - 1, date);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
- sdf.format(ca.getTime());
- return ca.getTime();
- }
-
- /**
- * get GMT Time
- *
- * @param calendar
- * @return
- */
- public Date getGmtDate(Long time) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(time);
- int offset = calendar.get(Calendar.ZONE_OFFSET) / 3600000 + calendar.get(Calendar.DST_OFFSET) / 3600000;
- calendar.add(Calendar.HOUR, -offset);
- Date date = calendar.getTime();
- return date;
- }
-
- /**
- * 得到指定间隔天数的日期
- * @param interval 间隔数
- * @param format 格式
- * @return String 字符串格式的日期
- * @Example
- * DateUtil.getSpecifyDate(2,"yyyy-MM-dd");//两天后的日期
- * DateUtil.getSpecifyDate(-2,"yyyy-MM-dd");//两天前的日期
- */
- public static String getSpecifyDate(int interval, String format) {
- return getSpecifyDate(interval, format, Locale.CHINA);
- }
-
- /**
- * 得到指定间隔天数的日期
- * @param interval 间隔数
- * @param format 格式
- * @param locale 区域语言
- * @return String 字符串格式的日期
- * @Example
- * getSpecifyDate(2, "ddMMM", Locale.ENGLISH);//两天后的日期：01Dec
- * getSpecifyDate(-2, "ddMMM", Locale.ENGLISH);//两天前的日期：27Nov
- */
- public static String getSpecifyDate(int interval, String format, Locale locale) {
-
- Calendar cal = new GregorianCalendar();
- cal.add(Calendar.DATE, interval);
- return dateToStr(cal.getTime(), format, locale);
- }
-
- /**
- * 得到指定间隔月数的日期
- * @param interval 间隔数
- * @param format 间隔数
- * @return String 字符串格式的日期
- * @Example
- * DateUtil.getSpecifyMonth(2,"yyyy-MM-dd");//两个月后的日期
- * DateUtil.getSpecifyMonth(-2,"yyyy-MM-dd");//两个月前的日期
- */
- public static String getSpecifyMonth(int interval, String format) {
- return getSpecifyMonth(interval, format, Locale.CHINA);
- }
-
- /**
- * 得到指定间隔月数的日期
- * @param interval 间隔数
- * @param format 间隔数
- * @return String 字符串格式的日期
- * @param locale 区域语言
- * @Example
- * getSpecifyMonth(2, "ddMMM", Locale.ENGLISH);//两个月后的日期：29Jan
- * getSpecifyMonth(-2, "ddMMM", Locale.ENGLISH);//两个月前的日期：29Sep
- */
- public static String getSpecifyMonth(int interval, String format, Locale locale) {
- Calendar cal = new GregorianCalendar();
- cal.add(Calendar.MONTH, interval);
- return dateToStr(cal.getTime(), format, locale);
- }
-
- /**
- * 得到指定间隔年数的日期
- * @param interval 间隔数
- * @param format 格式
- * @return 字符串格式的日期
- * @Example
- * getSpecifyYear(2, "ddMMMyyyy");//两年后的日期
- * getSpecifyYear(-2, "ddMMMyyyy");//两年前的日期
- */
- public static String getSpecifyYear(int interval, String format) {
- return getSpecifyYear(interval, format, Locale.CHINA);
- }
-
- /**
- * 得到指定间隔年数的日期
- * @param interval 间隔数
- * @param format 格式
- * @param locale 区域语言
- * @return 字符串格式的日期
- * @Example
- * getSpecifyYear(2, "ddMMMyyyy", Locale.ENGLISH);//两年后的日期：29Nov2015
- * getSpecifyYear(-2, "ddMMMyyyy", Locale.ENGLISH);//两年前的日期：29Nov2011
- */
- public static String getSpecifyYear(int interval, String format, Locale locale) {
- Calendar cal = new GregorianCalendar();
- cal.add(Calendar.YEAR, interval);
- return dateToStr(cal.getTime(), format, locale);
- }
- /**
- * 得到指定日期间隔天数的日期
- * @param date 指定字符串格式的日期
- * @param interval 间隔数
- * @param format 格式
- * @return 字符串格式的日期
- * @Example
- * getSpecifyDate("2014-09-09",3,"yyyy-MM-dd");
- */
- public static String getSpecifyDate(String date, int interval, String format) {
- return getSpecifyDate(date, interval, format, Locale.CHINA);
- }
- public static String getSpecifyDate(String date, int interval, String format, Locale locale) {
-
- Date d = null;
- try {
- d = strToDate(date,"yyyy-MM-dd");
- } catch (ParseException e) {
- e.printStackTrace();
- }
- Calendar cal = new GregorianCalendar();
- cal.setTime(d);
- cal.add(Calendar.DATE, interval);
- return dateToStr(cal.getTime(), format, locale);
- }
-
- public static void main(String[] args) {
- try {
- System.out.println(DateUtil.strToDate("15OCT2013", "ddMMMyyy", Locale.ENGLISH));
- System.out.println(DateUtil.getToday());
- System.out.println(dateToStr(new Date(), "ddMMM", Locale.ENGLISH));
- System.out.println(dateToStr(new Date(), "yyyy/dd/MM"));
- System.out.println(getSpecifyDate(2, "ddMMM", Locale.ENGLISH));
- System.out.println(getSpecifyDate(-2, "ddMMM", Locale.ENGLISH));
- System.out.println(getSpecifyMonth(2, "ddMMM", Locale.ENGLISH));
- System.out.println(getSpecifyMonth(-2, "ddMMM", Locale.ENGLISH));
- System.out.println(getSpecifyYear(2, "ddMMMyyyy", Locale.ENGLISH));
- System.out.println(getSpecifyYear(-2, "ddMMMyyyy", Locale.ENGLISH));
-
- } catch (ParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/ExcelUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/ExcelUtil.java
deleted file mode 100644
index cc0904f2c4..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/ExcelUtil.java
+++ /dev/null
@@ -1,517 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-
-import com.csvreader.CsvReader;
-
-/**
- * Excel的操作工具类
- * 包括对2003、2007的Excel表进行操作，还能够对CSV的表格进行操作
- * @author qcxiao
- *
- */
-public class ExcelUtil {
-
- /** 总行数 */
-
- private int totalRows = 0;
-
- /** 总列数 */
-
- private int totalCells = 0;
-
- /** 错误信息 */
-
- private String errorInfo;
- /** 表单序号 */
-
- @SuppressWarnings("unused")
- private int sheetIndex = 0;
-
- /** 构造方法 */
-
- public ExcelUtil() {
-
- }
-
- /**
- * 是否为excel2003格式
- *
- * @param filePath
- * @return
- */
- private static boolean isExcel2003(String filePath) {
-
- return filePath.matches("^.+\\.(?i)(xls)$");
-
- }
-
- /**
- * 是否为excel2007格式
- *
- * @param filePath
- * @return
- */
- private static boolean isExcel2007(String filePath) {
-
- return filePath.matches("^.+\\.(?i)(xlsx)$");
-
- }
-
- /**
- * 总行数
- *
- * @return
- */
- @SuppressWarnings("unused")
- private int getTotalRows() {
-
- return totalRows;
-
- }
-
- /**
- * 总列数
- *
- * @return
- */
- private int getTotalCells() {
-
- return totalCells;
-
- }
-
- /**
- * 错误信息
- *
- * @return
- */
- @SuppressWarnings("unused")
- private String getErrorInfo() {
- return errorInfo;
-
- }
-
- /**
- *
- * @描述：验证excel文件
- *
- * @参数：@param filePath 文件完整路径
- *
- * @参数：@return
- *
- * @返回值：boolean
- */
-
- public boolean validateExcel(String filePath) {
- /** 检查文件名是否为空或者是否是Excel格式的文件 */
-
- if (filePath == null || !(isExcel2003(filePath) || isExcel2007(filePath))) {
-
- errorInfo = "文件名不是excel格式";
-
- return false;
-
- }
-
- /** 检查文件是否存在 */
-
- File file = new File(filePath);
- if (file == null || !file.exists()) {
-
- errorInfo = "文件不存在";
- return false;
- }
- return true;
-
- }
-
- @Test
- public void testss(){
- read("C:\\Users\\qcxiao\\Desktop\\applyeterm\\src\\test\\resources\\AutoeTermTest\\bookPnr.xls","自动预订PNR");
- }
- /**
- *
- * @描述：根据文件名读取excel文件
- *
- * @参数：@param filePath 文件完整路径
- *
- * @参数：@return
- *
- * @返回值：List
- */
-
- public List> read(String filePath, String sheetName) {
-
- List> dataLst = new ArrayList>();
-
- InputStream is = null;
-
- /** 验证文件是否合法 */
-
- if (!validateExcel(filePath)) {
- System.out.println(errorInfo);
- return null;
-
- }
-
- /** 判断文件的类型，是2003还是2007 */
-
- boolean isExcel2003 = true;
-
- if (isExcel2007(filePath)) {
-
- isExcel2003 = false;
-
- }
-
- /** 调用本类提供的根据流读取的方法 */
- try {
- File file = new File(filePath);
-
- is = new FileInputStream(file);
-
- /** 根据版本选择创建Workbook的方式 */
-
- Workbook wb = null;
-
- if (isExcel2003) {
- wb = new HSSFWorkbook(is);
- } else {
- wb = new XSSFWorkbook(is);
- }
- dataLst = read(wb, sheetName);
-
- is.close();
-
- } catch (IOException e) {
-
- e.printStackTrace();
-
- } finally {
-
- if (is != null) {
-
- try {
-
- is.close();
-
- } catch (IOException e) {
-
- is = null;
-
- e.printStackTrace();
-
- }
-
- }
-
- }
-
- /** 返回最后读取的结果 */
-
- return dataLst;
-
- }
-
- /**
- *
- * @描述：根据流读取Excel文件
- *
- * @参数：@param inputStream
- *
- * @参数：@param isExcel2003
- *
- * @参数：@return
- *
- * @返回值：List
- */
-
- public List> read(InputStream inputStream, boolean isExcel2003) {
-
- List> dataLst = null;
-
- try {
-
- /** 根据版本选择创建Workbook的方式 */
-
- Workbook wb = null;
-
- if (isExcel2003) {
- wb = new HSSFWorkbook(inputStream);
- } else {
- wb = new XSSFWorkbook(inputStream);
- }
- dataLst = read(wb);
-
- } catch (IOException e) {
-
- e.printStackTrace();
-
- }
-
- return dataLst;
-
- }
-
- /**
- *
- * @描述：读取数据
- *
- * @参数：@param Workbook
- *
- * @参数：@return
- *
- * @返回值：List>
- */
-
- private List> read(Workbook wb, int sheetIndex) {
- List> dataLst = new ArrayList>();
-
- /** 得到指定的sheet */
-
- // int index =0;
- // wb.getSheetIndex(sheetName);
-
- Sheet sheet = wb.getSheetAt(sheetIndex);
-
- /** 得到Excel的行数 */
-
- this.totalRows = sheet.getPhysicalNumberOfRows();
-
- /** 得到Excel的列数 */
-
- if (this.totalRows >= 1 && sheet.getRow(0) != null) {
-
- this.totalCells = sheet.getRow(0).getPhysicalNumberOfCells();
-
- }
-
- /** 循环Excel的行 */
-
- for (int r = 0; r < this.totalRows; r++) {
-
- Row row = sheet.getRow(r);
-
- if (row == null) {
-
- continue;
-
- }
-
- List rowLst = new ArrayList();
-
- /** 循环Excel的列 */
-
- for (int c = 0; c < this.getTotalCells(); c++) {
-
- Cell cell = row.getCell(c);
- // String key=row.getCell(0).getStringCellValue();
- String cellValue = "";
-
- if (null != cell) {
-
- // cellValue=cell.getStringCellValue();
- // 以下是判断数据的类型
- switch (cell.getCellType()) {
- case HSSFCell.CELL_TYPE_NUMERIC: // 数字
- // cellValue = cell.getNumericCellValue() + "";
- if (HSSFDateUtil.isCellDateFormatted(cell)) {
- // 如果是Date类型则，取得该Cell的Date值
- Date date = cell.getDateCellValue();
- // 把Date转换成本地格式的字符串
- cellValue = DateUtil.dateToStr(date, "yyyy-MM-dd HH:mm:ss").toString();
- System.out.println(cellValue);
- }
- // 如果是纯数字
- else {
- // 取得当前Cell的数值
- Integer num = new Integer((int) cell.getNumericCellValue());
- cellValue = String.valueOf(num);
- }
-
- break;
-
- case HSSFCell.CELL_TYPE_STRING: // 字符串
- cellValue = cell.getStringCellValue().trim();
- break;
-
- case HSSFCell.CELL_TYPE_BOOLEAN: // Boolean
- cellValue = cell.getBooleanCellValue() + "";
- break;
-
- case HSSFCell.CELL_TYPE_FORMULA: // 公式
- cellValue = cell.getCellFormula() + "";
- break;
-
- case HSSFCell.CELL_TYPE_BLANK: // 空值
- cellValue = "";
- break;
-
- case HSSFCell.CELL_TYPE_ERROR: // 故障
- cellValue = "非法字符";
- break;
-
- default:
- cellValue = "未知类型";
- break;
- }
- }
-
- // System.out.print(cellValue+" ");
- rowLst.add(cellValue);
-
- }
- // System.out.println();
- /** 保存第r行的第c列 */
-
- dataLst.add(rowLst);
-
- }
-
- return dataLst;
- }
-
- private List> read(Workbook wb, String sheetName) {
-
- int sheetIndex = 0;
- try {
- sheetIndex = wb.getSheetIndex(sheetName);
- } catch (Exception e) {
- // 抛异常取第一个sheet
- }
- // 默认取第一个
- if (sheetIndex < 0) {
- sheetIndex = 0;
- }
- return read(wb, sheetIndex);
- }
-
- private List> read(Workbook wb) {
- return read(wb, 0);
- }
-
- /**
- * 将excel解析后的集合封装成Map形式
- *
- * @param list
- * @return
- */
- @SuppressWarnings("unused")
- public static List> reflectMapList(List> list) {
- ExcelUtil poi = new ExcelUtil();
- List> mlist = new ArrayList>();
-
- Map map = new HashMap();
- if (list != null) {
-
- for (int i = 1; i < list.size(); i++) {
- map = new HashMap();
- List cellList = list.get(i);
-
- for (int j = 0; j < cellList.size(); j++) {
- map.put(list.get(0).get(j), cellList.get(j));
- }
- mlist.add(map);
- }
-
- }
-
- return mlist;
- }
-
- public List> excelDatas(String filePath, String sheetName) {
- List> lists = read(filePath, sheetName);
- // 对集合进行重新组装 Map<字段,值>
- List> datas = ExcelUtil.reflectMapList(lists);
- return datas;
- }
-
- /**
- * 读取CSV的方法
- * @param file
- * @return
- */
- public static List importCsv(String file) {
- List list = new ArrayList();
- CsvReader reader = null;
- try {
- // 初始化CsvReader并指定列分隔符和字符编码
- reader = new CsvReader(file, ',', Charset.forName("GBK"));
- while (reader.readRecord()) {
- // 读取每行数据以数组形式返回
- String[] str = reader.getValues();
- if (str != null && str.length > 0) {
- // if (str[0] != null && !"".equals(str[0].trim())) {
- // list.add(str);
- // }
- if (str[0] != null) {
- list.add(str);
- }
- }
- }
- } catch (FileNotFoundException e) {
- // log.error("Error reading csv file.", e);
- } catch (IOException e) {
- // log.error("", e);
- } finally {
- if (reader != null)
- // 关闭CsvReader
- reader.close();
- }
- return list;
- }
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public static void main(String[] args) throws Exception {
- List listt = importCsv("C:\\Users\\qcxiao\\Documents\\Tencent Files\\280887262\\FileRecv\\GP_20141210_CSI_CAACSC.CSV");
- for(int i =0; i < listt.size(); i++){
- String [] strRows = listt.get(i);
- for(int j = 0; j < strRows.length;j++){
- System.out.println(strRows[j]);
- }
- }
- ExcelUtil poi = new ExcelUtil();
- // 获取解析后的集合
- List> lists = poi.read("C:\\Users\\qcxiao\\Desktop\\applyeterm\\src\\test\\resources\\AutoeTermTest\\bookPnr.xls", "自动预订PNR");
- System.out.println(lists.size());
- // 对集合进行重新组装 Map<字段,值>
- List> list = ExcelUtil.reflectMapList(lists);
- // 调用工具类，组成对象集合
- // List ts=Tool.reflectObj(TravelerInfo.class, list);
- // //遍历
- // for (TravelerInfo t : ts) {
- // System.out.println(t.getAirline_code()+" | "+
- // t.getFlight_num()+" | "+t.getSto()+" | "+t.getNationality()+"| ………………");
- // }
- int i = 1;
- for (Map map : list) {
- System.out.println("行数" + i);
- Iterator iter = map.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- System.out.println(entry.getValue());
- }
- i++;
- }
- }
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/FileUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/FileUtil.java
deleted file mode 100644
index 43b0651822..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/FileUtil.java
+++ /dev/null
@@ -1,676 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.RandomAccessFile;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.imageio.stream.FileImageInputStream;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class FileUtil {
- protected static final Log logger = LogFactory.getLog(FileUtil.class);
- private static final String TEST_PROPERTIES = "/test.properties";
-
- //获取项目的根路径
- public final static String classPath;
-
- static {
- //获取的是classpath路径，适用于读取resources下资源
- classPath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
- }
-
- /**
- * 自定义追加路径
- */
- public static String getCompilePath(String u_path) {
- return pathOptimization(classPath + u_path);
- }
-
- public static String pathOptimization(String path) {
- //windows下
- if ("\\".equals(File.separator)) {
- path = path.replaceAll("/", "\\\\");
- if (path.substring(0, 1).equals("\\") || path.substring(0, 1).equals("/")) {
- path = path.substring(1);
- }
- }
- //linux下
- if ("/".equals(File.separator)) {
- path = path.replaceAll("\\\\", "/");
- }
- return path;
- }
-
-
- public static void main(String[] args) {
-
- System.out.println(getCompilePath("templates/caseResult.vm"));
- String fileName = "C:/temp/newTemp.txt";
- String content = "new append!";
-
- readFileByBytes(fileName);
- readFileByChars(fileName);
- readFileByLines(fileName);
- readFileByRandomAccess(fileName);
-
- // 按方法A追加文件
- appendMethodA(fileName, content);
- appendMethodA(fileName, "append end. \n");
- // 显示文件内容
- readFileByLines(fileName);
- // 按方法B追加文件
- appendMethodB(fileName, content);
- appendMethodB(fileName, "append end. \n");
- // 显示文件内容
- readFileByLines(fileName);
- }
-
-
- /**
- *
- * @param imagepath
- * @return
- */
- public static byte[] getImageByteArray(String imagepath) {
- byte[] image = null;
- // 直接通过文件获取
- try {
- FileImageInputStream fiis = new FileImageInputStream(new File(
- imagepath));
- image = new byte[(int) fiis.length()];
- fiis.read(image);
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- // 通过数据库中获取的byte[]字节数组来获得Image对象，这里用fiis模拟数据库中的byte[].如果只是从文件中获取，那么可以跳过这几行代码，最终的目的都是为了获得BufferedImage对象
- return image;
- }
-
- /**
- *
- * 取得调用者所在类路径中的文件的绝对路径 如getFilePath("/xxx.txt")表示取得classes根目录下xxx.txt的绝对路径
- * 所有放在src/main/resources目录下的资源文件都会自动复制到classes目录下
- *
- * @param filePath
- * @return
- */
- @SuppressWarnings("deprecation")
- public static String getFilePath(String filePath) {
- /*
- try {
- return new File(sun.reflect.Reflection.getCallerClass(2).getResource(filePath).toURI()).getAbsolutePath();
- } catch (URISyntaxException ex) {
- throw new RuntimeException(ex);
- } catch (NullPointerException ex) {
- logger.warn("The file main/resources" + filePath + " is not exist!");
- }
- */
- return null;
- }
-
- /**
- * 读取配置文件(test.properties)的内容
- *
- * @return
- */
- public static Properties getProperties() {
- return getProperties(null);
- }
-
- /**
- * 读取指定配置文件的内容
- *
- * @return
- */
- public static Properties getProperties(String filePath) {
- InputStream inputStream = null;
- if (filePath == null || "".equals(filePath))
- inputStream = FileUtil.class.getResourceAsStream(TEST_PROPERTIES);
- else
- inputStream = FileUtil.class.getResourceAsStream(filePath);
- Properties properties = new Properties();
- try {
- properties.load(inputStream);
- } catch (IOException e) {
- logger.error(e.getMessage());
- }
- return properties;
- }
-
- public static List chooseFile(String downloadFileDir,
- String chooseFiles) {
- List fileList = new ArrayList();
- String[] downFileArry = chooseFiles.split(",");
- if (!downloadFileDir.endsWith(File.separator)) {
- downloadFileDir = downloadFileDir + File.separator;
- }
- File dirFile = new File(downloadFileDir);
- // 如果fileDir对应的文件不存在，或者不是一个目录，则退出
- if (!dirFile.exists() || !dirFile.isDirectory()) {
- logger.debug("要删除的文件夹【" + downloadFileDir + "】不存在，不需要删除操作！");
- return fileList;
- }
- // 删除文件夹下的所有文件(包括子目录)
- File[] files = dirFile.listFiles();
- for (int i = 0; i < files.length; i++) {
- boolean flag = false;
- String fileName = files[i].getName();
- for (int j = 0; j < downFileArry.length; j++) {
- String downloadFileName = downFileArry[j];
- if (fileName.equals(downloadFileName)) {
- flag = true;
- break;
- }
- }
- if (!flag) {
- fileList.add(fileName);
- }
- }
- return fileList;
- }
-
- /**
- * 删除目录下的所有文件
- *
- * @param fileDir
- * @return
- */
- public static boolean deleteDirectory(String fileDir) {
- // 如果fileDir不以文件分隔符结尾，自动添加文件分隔符
- if (!fileDir.endsWith(File.separator)) {
- fileDir = fileDir + File.separator;
- }
- File dirFile = new File(fileDir);
- // 如果fileDir对应的文件不存在，或者不是一个目录，则退出
- if (!dirFile.exists() || !dirFile.isDirectory()) {
- logger.debug("删除目录失败" + fileDir + "目录不存在！");
- return false;
- }
- boolean flag = true;
- // 删除文件夹下的所有文件(包括子目录)
- File[] files = dirFile.listFiles();
- for (int i = 0; i < files.length; i++) {
- // 删除子文件
- if (files[i].isFile()) {
- flag = deleteFile(files[i].getAbsolutePath());
- if (!flag) {
- break;
- }
- }
- // 删除子目录
- else {
- flag = deleteDirectory(files[i].getAbsolutePath());
- if (!flag) {
- break;
- }
- }
- }
- if (!flag) {
- logger.debug("删除目录失败");
- return false;
- }
- // 删除当前目录
- if (dirFile.delete()) {
- logger.debug("删除目录" + fileDir + "成功！");
- return true;
- } else {
- logger.debug("删除目录" + fileDir + "失败！");
- return false;
- }
- }
-
- /**
- * 判断目录存在不存在？如果不存在，则创建之
- *
- * @param directory
- */
- public static void exist(String directory) {
- try {
- if (!new File(directory).isDirectory()) {
- new File(directory).mkdir();
- }
- } catch (SecurityException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 删除文件
- *
- * @param fileName
- * @return
- */
- private static boolean deleteFile(String fileName) {
- File file = new File(fileName);
- if (file.isFile() && file.exists()) {
- file.delete();
- return true;
- } else {
- logger.debug("删除单个文件" + fileName + "失败！");
- return false;
- }
- }
-
- /**
- * 写入文件
- *
- * @param in
- * @param filePath
- */
- public static void writeFile(InputStream in, String filePath) {
- try {
- String path = filePath.substring(0, filePath.lastIndexOf("/"));
- File file = new File(path);
- if (!file.exists()) {
- file.mkdirs();
- }
- FileOutputStream fos = null;
- BufferedInputStream bis = null;
- int BUFFER_SIZE = 1024;
- byte[] buf = new byte[BUFFER_SIZE];
- int size = 0;
- bis = new BufferedInputStream(in);
- fos = new FileOutputStream(filePath, false);
- while ((size = bis.read(buf)) != -1)
- fos.write(buf, 0, size);
- fos.close();
- bis.close();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- /**
- * 以字节为单位读取文件，常用于读二进制文件，如图片、声音、影像等文件。
- */
- public static void readFileByBytes(String fileName) {
- File file = new File(fileName);
- InputStream in = null;
- try {
- System.out.println("以字节为单位读取文件内容，一次读一个字节：");
- // 一次读一个字节
- in = new FileInputStream(file);
- int tempbyte;
- while ((tempbyte = in.read()) != -1) {
- System.out.write(tempbyte);
- }
- in.close();
- } catch (IOException e) {
- e.printStackTrace();
- return;
- }
- try {
- System.out.println("以字节为单位读取文件内容，一次读多个字节：");
- // 一次读多个字节
- byte[] tempbytes = new byte[100];
- int byteread = 0;
- in = new FileInputStream(fileName);
- showAvailableBytes(in);
- // 读入多个字节到字节数组中，byteread为一次读入的字节数
- while ((byteread = in.read(tempbytes)) != -1) {
- System.out.write(tempbytes, 0, byteread);
- }
- } catch (Exception e1) {
- e1.printStackTrace();
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e1) {
- }
- }
- }
- }
-
- /**
- * 以字符为单位读取文件，常用于读文本，数字等类型的文件
- */
- public static void readFileByChars(String fileName) {
- File file = new File(fileName);
- Reader reader = null;
- try {
- System.out.println("以字符为单位读取文件内容，一次读一个字节：");
- // 一次读一个字符
- reader = new InputStreamReader(new FileInputStream(file));
- int tempchar;
- while ((tempchar = reader.read()) != -1) {
- // 对于windows下，\r\n这两个字符在一起时，表示一个换行。
- // 但如果这两个字符分开显示时，会换两次行。
- // 因此，屏蔽掉\r，或者屏蔽\n。否则，将会多出很多空行。
- if (((char) tempchar) != '\r') {
- System.out.print((char) tempchar);
- }
- }
- reader.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- try {
- System.out.println("以字符为单位读取文件内容，一次读多个字节：");
- // 一次读多个字符
- char[] tempchars = new char[30];
- int charread = 0;
- reader = new InputStreamReader(new FileInputStream(fileName));
- // 读入多个字符到字符数组中，charread为一次读取字符数
- while ((charread = reader.read(tempchars)) != -1) {
- // 同样屏蔽掉\r不显示
- if ((charread == tempchars.length)
- && (tempchars[tempchars.length - 1] != '\r')) {
- System.out.print(tempchars);
- } else {
- for (int i = 0; i < charread; i++) {
- if (tempchars[i] == '\r') {
- continue;
- } else {
- System.out.print(tempchars[i]);
- }
- }
- }
- }
-
- } catch (Exception e1) {
- e1.printStackTrace();
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e1) {
- }
- }
- }
- }
-
- /**
- * 以行为单位读取文件，常用于读面向行的格式化文件
- */
- public static List readFileByLines(String fileName) {
- List fileLineList = new ArrayList();
- File file = new File(fileName);
- BufferedReader reader = null;
- try {
- // System.out.println("以行为单位读取文件内容，一次读一整行：");
- reader = new BufferedReader(new FileReader(file));
- String tempString = null;
- // 一次读入一行，直到读入null为文件结束
- while ((tempString = reader.readLine()) != null) {
- // 显示行号
- fileLineList.add(tempString);
- }
- reader.close();
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e1) {
- }
- }
-
- }
- return fileLineList;
- }
-
- /**
- * 随机读取文件内容
- */
- public static void readFileByRandomAccess(String fileName) {
- RandomAccessFile randomFile = null;
- try {
- System.out.println("随机读取一段文件内容：");
- // 打开一个随机访问文件流，按只读方式
- randomFile = new RandomAccessFile(fileName, "r");
- // 文件长度，字节数
- long fileLength = randomFile.length();
- // 读文件的起始位置
- int beginIndex = (fileLength > 4) ? 4 : 0;
- // 将读文件的开始位置移到beginIndex位置。
- randomFile.seek(beginIndex);
- byte[] bytes = new byte[10];
- int byteread = 0;
- // 一次读10个字节，如果文件内容不足10个字节，则读剩下的字节。
- // 将一次读取的字节数赋给byteread
- while ((byteread = randomFile.read(bytes)) != -1) {
- System.out.write(bytes, 0, byteread);
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- if (randomFile != null) {
- try {
- randomFile.close();
- } catch (IOException e1) {
- }
- }
- }
- }
-
- /**
- * 显示输入流中还剩的字节数
- */
- private static void showAvailableBytes(InputStream in) {
- try {
- System.out.println("当前字节输入流中的字节数为:" + in.available());
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * A方法追加文件：使用RandomAccessFile
- */
- public static void appendMethodA(String fileName, String content) {
- try {
- // 打开一个随机访问文件流，按读写方式
- RandomAccessFile randomFile = new RandomAccessFile(fileName, "rw");
- // 文件长度，字节数
- long fileLength = randomFile.length();
- // 将写文件指针移到文件尾。
- randomFile.seek(fileLength);
- randomFile.writeBytes(content);
- randomFile.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 复制整个文件夹内容
- *
- * @param oldPath String 原文件路径 如：c:/fqf
- * @param newPath String 复制后路径 如：f:/fqf/ff
- * @return boolean
- */
- public static void copyFolder(String oldPath, String newPath) {
- try {
- (new File(newPath)).mkdirs(); // 如果文件夹不存在 则建立新文件夹
- File a = new File(oldPath);
- String[] file = a.list();
- File temp = null;
- for (int i = 0; i < file.length; i++) {
- if (oldPath.endsWith(File.separator)) {
- temp = new File(oldPath + file[i]);
- } else {
- temp = new File(oldPath + File.separator + file[i]);
- }
-
- if (temp.isFile()) {
- FileInputStream input = new FileInputStream(temp);
- FileOutputStream output = new FileOutputStream(newPath
- + "/" + (temp.getName()).toString());
- byte[] b = new byte[1024 * 5];
- int len;
- while ((len = input.read(b)) != -1) {
- output.write(b, 0, len);
- }
- output.flush();
- output.close();
- input.close();
- }
- if (temp.isDirectory()) {// 如果是子文件夹
- copyFolder(oldPath + "/" + file[i], newPath + "/" + file[i]);
- }
- }
- } catch (Exception e) {
- System.out.println("复制整个文件夹内容操作出错");
- e.printStackTrace();
-
- }
-
- }
-
- /**
- * B方法追加文件：使用FileWriter
- */
- public static void appendMethodB(String fileName, String content) {
- try {
- // 打开一个写文件器，构造函数中的第二个参数true表示以追加形式写文件
- FileWriter writer = new FileWriter(fileName, true);
- writer.write(content);
- writer.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
-
-
- // 读取文件
- public static String readFile(String fileName) {
- String returnStr = "";
- File file = new File(fileName);
- Reader reader = null;
- try {
- // System.out.println("以字符为单位读取文件内容，一次读一个字节：");
- // 一次读一个字符
- reader = new InputStreamReader(new FileInputStream(file));
- int tempchar;
- while ((tempchar = reader.read()) != -1) {
- // 对于windows下，\r\n这两个字符在一起时，表示一个换行。
- // 但如果这两个字符分开显示时，会换两次行。
- // 因此，屏蔽掉\r，或者屏蔽\n。否则，将会多出很多空行。
- if (((char) tempchar) != '\r') {
- returnStr += (char) tempchar;
- // System.out.print((char) tempchar);
- }
- }
- reader.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- char[] tempchars = new char[30];
- try {
- // System.out.println("以字符为单位读取文件内容，一次读多个字节：");
- // 一次读多个字符
- int charread = 0;
- reader = new InputStreamReader(new FileInputStream(fileName));
- // 读入多个字符到字符数组中，charread为一次读取字符数
- while ((charread = reader.read(tempchars)) != -1) {
- // 同样屏蔽掉\r不显示
- if ((charread == tempchars.length)
- && (tempchars[tempchars.length - 1] != '\r')) {
- // System.out.print(tempchars);
- } else {
- for (int i = 0; i < charread; i++) {
- if (tempchars[i] == '\r') {
- continue;
- } else {
- // System.out.print(tempchars[i]);
- }
- }
- }
- }
-
- } catch (Exception e1) {
- e1.printStackTrace();
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e1) {
- }
- }
- }
- return returnStr;
- }
-
- public static String initHttpRequest(String fileName,
- Map params) {
- String req = FileUtil.readFile(fileName);
- // 替换请求相关字段
- Pattern p1 = Pattern.compile("\\$\\{\\#\\#.*?\\}");
- Matcher mat1 = p1.matcher(req);
- List elements1 = new ArrayList();
-
- while (mat1.find()) {
- String element = mat1.group();
- elements1.add(element);
- }
-
- for (String element : elements1) {
- int i = element.indexOf("${##");
- int j = element.indexOf("}");
- String sub = element.substring(i + 4, j);
- String param = "";
- if (!params.get(sub).equals("null")) {
- param = params.get(sub);
- }
- req = req.substring(0, req.indexOf(element))
- + param
- + req.substring(req.indexOf(element) + element.length(),
- req.length());
- }
-
- // 以下处理注释，去掉/**/
- Pattern p2 = Pattern.compile("/\\*.*?\\*/");
- Matcher mat2 = p2.matcher(req);
- List elements2 = new ArrayList();
-
- while (mat2.find()) {
- String element = mat2.group();
- elements2.add(element);
- }
-
- for (String element : elements2) {
- req = req.substring(0, req.indexOf(element))
- + req.substring(req.indexOf(element) + element.length(),
- req.length());
- }
-
- return req;
-
- }
-
- // 替换指定字段的请求值
- public static String changeHttpRequestByColumn(String req, String column,
- String value) {
- String element = "${#" + column + "}";
- return req.substring(0, req.indexOf(element))
- + value
- + req.substring(req.indexOf(element) + element.length(),
- req.length());
- }
-
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/HttpUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/HttpUtil.java
deleted file mode 100644
index 1895c7876b..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/HttpUtil.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.commons.httpclient.methods.multipart.FilePart;
-import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
-import org.apache.commons.httpclient.methods.multipart.Part;
-import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.apache.http.util.EntityUtils;
-import org.json.JSONObject;
-
-@SuppressWarnings("deprecation")
-public class HttpUtil {
- private static int HTTPCLIENT_CONNECT_TIMEOUT = 10000;
- private static int HTTPCLIENT_RESPONSE_TIMEOUT = 30000;
- static DefaultHttpClient httpClient = new DefaultHttpClient(new ThreadSafeClientConnManager());
-
- public static JSONObject httpPost(String url, String path) throws Exception, FileNotFoundException {
- HttpPost method = new HttpPost(url);
- // String jsonParam =
- // "{\"requestObject\": {\"departureCode\": \"PEK\", \"arrivalCode\": \"SHA\", \"departureDate\": \"2015-10-10\", \"timeRange\": 5, \"returnDate\": \"2015-10-20\",\"numOfPerson\": 1, \"travelPolicyVO\": {\"corpCode\": \"String类型\", \"agentId\": 0, \"corpId\": 0,\"updateTime\": \"\", \"discount\": 0, \"flightTime\": 0,\"serviceCodeId\": 0,\"serviceCodeName\": \"String类型\",\"lowestPrice\": 0,\"travelPolicyId\": 0,\"timePartHour\": 0,\"forwardOrderTime\": 0,\"exceAirport\": \"String类型\",\"hotelBigCity\": 0,\"hotelSmallCity\": 0,\"travelPolicyDesc\": \"String类型\",\"highestCabin\": \"String类型\",\"international\": \"String类型\",\"airBookRemarkEn\": \"String类型\",\"hotelBookRemarkCn\": \"String类型\",\"hotelBookRemarkEn\": \"String类型\",\"secondTierCity\": 0,\"thirdTierCity\": 0,\"corpfareHotelFirst\": \"String类型\",\"lowestPriceType\": \"0\",\"areaLowestType\": \"String类型\",\"corpfareAirline\": \"String类型\",\"corpfareAirlineFirst\": \"String类型\",\"cabinChoose\": \"String类型\",\"floatAmount\": 0,\"floatRate\": 0,\"latestReservedTime\": 0,\"canUpgrade\": \"String类型\",\"upgradeHours\": \"String类型\",\"upgradeMiles\": \"String类型\",\"upgradeCabin\": \"String类型\",\"tripConstraint\": \"String类型\",\"firstSelectionAirline\": \"String类型\",\"subSelectionAirline\": \"String类型\", \"firstSelectionAirlinePriceDiff\": 0,\"subSelectionAirlinePriceDiff\": 0,\"starRate\": \"String类型\",\"carrentPriceMax\": \"String类型\",\"carrentPriceMin\": \"String类型\",\"carrentRemarkChn\": \"String类型\",\"carrentRemarkEng\": \"String类型\",\"pricePercentage\": \"String类型\",\"isDiscountPreferred\": \"String类型\",\"fourthTierCity\": 0,\"fifthTierCity\": 0,\"smallCityCodes\": \"String类型\", \"discountDetail\": 0, \"name\": \"String类型\"}, \"expectTime\": \"09:00\"}}";
- StringEntity entity = new StringEntity(path, "utf-8");
- entity.setContentEncoding("UTF-8");
- entity.setContentType("application/json");
- method.setEntity(entity);
- JSONObject response = null;
- try {
- HttpResponse res = httpClient.execute(method);
- if (res.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
- HttpEntity entitys = res.getEntity();
- response = new JSONObject(new org.json.JSONTokener(new InputStreamReader(entitys.getContent(),"UTF-8")));
- String result = EntityUtils.toString(res.getEntity());// 返回json格式：
- System.out.println(result);
- // response = JSONObject.fromObject(result);
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- return response;
- }
-
- public static String getResult(String url, String userName, String password) throws Exception {
- HttpClient client = new HttpClient(new MultiThreadedHttpConnectionManager());
- HttpConnectionManagerParams managerParams = client.getHttpConnectionManager().getParams();
-
- // 设置连接超时时间(单位毫秒)
- managerParams.setConnectionTimeout(HTTPCLIENT_CONNECT_TIMEOUT);
-
- // 设置读数据超时时间(单位毫秒)
- managerParams.setSoTimeout(HTTPCLIENT_RESPONSE_TIMEOUT);
-
- client.getParams().setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET, "utf-8");
-
- setAuth(userName, password, url, client);
- HttpMethod method = new GetMethod(url);
- byte[] resultBytes;
-
- try {
- int statusCode = client.executeMethod(method);
- if (!(statusCode == 200 || statusCode == 302))
- throw (new Exception(statusCode + " Error"));
- resultBytes = method.getResponseBody();
- return new String(resultBytes);
- } catch (Exception e) {
- // logger.error("404 Error", e);
- throw new Exception(e);
- } finally {
- method.releaseConnection();
- }
- }
-
- public static String postRequest(String url, String userName, String password) throws Exception {
- HttpClient client = new HttpClient(new MultiThreadedHttpConnectionManager());
- HttpConnectionManagerParams managerParams = client.getHttpConnectionManager().getParams();
-
- // 设置连接超时时间(单位毫秒)
- managerParams.setConnectionTimeout(HTTPCLIENT_CONNECT_TIMEOUT);
-
- // 设置读数据超时时间(单位毫秒)
- managerParams.setSoTimeout(HTTPCLIENT_RESPONSE_TIMEOUT);
-
- client.getParams().setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET, "utf-8");
- setAuth(userName, password, url, client);
-
- HttpMethod method = new PostMethod(url);
- byte[] resultBytes;
-
- try {
- int statusCode = client.executeMethod(method);
- if (!(statusCode == 200 || statusCode == 302))
- throw (new Exception(statusCode + " Error"));
- resultBytes = method.getResponseBody();
- return new String(resultBytes);
- } catch (Exception e) {
- // logger.error("404 Error", e);
- throw new Exception(e);
- } finally {
- method.releaseConnection();
- }
- }
-
- public static String postRequest(String url, Map params, String userName, String password) throws Exception {
- HttpClient client = new HttpClient(new MultiThreadedHttpConnectionManager());
- HttpConnectionManagerParams managerParams = client.getHttpConnectionManager().getParams();
-
- // 设置连接超时时间(单位毫秒)
- managerParams.setConnectionTimeout(HTTPCLIENT_CONNECT_TIMEOUT);
-
- // 设置读数据超时时间(单位毫秒)
- managerParams.setSoTimeout(HTTPCLIENT_RESPONSE_TIMEOUT);
-
- client.getParams().setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET, "utf-8");
-
- setAuth(userName, password, url, client);
-
- PostMethod method = new PostMethod(url);
-
- Set> esParams = params.entrySet();
- NameValuePair[] httpParams = new NameValuePair[esParams.size()];
-
- int i = 0;
- for (Entry esParam : esParams) {
- httpParams[i] = new NameValuePair(esParam.getKey(), esParam.getValue());
- i++;
- }
- method.setRequestBody(httpParams);
- byte[] resultBytes;
-
- try {
- int statusCode = client.executeMethod(method);
- if (!(statusCode == 200 || statusCode == 302))
- throw (new Exception(statusCode + " Error"));
- resultBytes = method.getResponseBody();
- return new String(resultBytes);
- } catch (Exception e) {
- // logger.error("404 Error", e);
- throw new Exception(e);
- } finally {
- method.releaseConnection();
- }
- }
-
- public static String postXml(String url, String value, String userName, String password) throws Exception {
- HttpClient client = new HttpClient(new MultiThreadedHttpConnectionManager());
- HttpConnectionManagerParams managerParams = client.getHttpConnectionManager().getParams();
-
- // 设置连接超时时间(单位毫秒)
- managerParams.setConnectionTimeout(HTTPCLIENT_CONNECT_TIMEOUT);
-
- // 设置读数据超时时间(单位毫秒)
- managerParams.setSoTimeout(HTTPCLIENT_RESPONSE_TIMEOUT);
-
- client.getParams().setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET, "utf-8");
-
- setAuth(userName, password, url, client);
-
- PostMethod method = new PostMethod(url);
- method.setRequestEntity(new StringRequestEntity(value, "text/xml", "UTF-8"));
- byte[] resultBytes;
-
- try {
- int statusCode = client.executeMethod(method);
- if (!(statusCode == 200 || statusCode == 302))
- throw (new Exception(statusCode + " Error"));
- resultBytes = method.getResponseBody();
- return new String(resultBytes);
- } catch (Exception e) {
- // logger.error("404 Error", e);
- throw new Exception(e);
- } finally {
- method.releaseConnection();
- }
- }
-
- private static void setAuth(String username, String password, String url, HttpClient httpClient) throws Exception {
- if (username != null) {
- httpClient.getParams().setAuthenticationPreemptive(true);
- Credentials defaultcreds = new UsernamePasswordCredentials(username, password);
- //Credentials defaultcreds = new UsernamePasswordCredentials("demo/userAction!doNotNeedSession_login.action?cname=admin&", "cpwd=admin");
- URL tUrl = new URL(url);
- httpClient.getState().setCredentials(new AuthScope(tUrl.getHost(), tUrl.getPort()), defaultcreds);
- }
- }
-
- public static String uploadFile(File file, String url) throws Exception {
- if (!file.exists()) {
- return null;
- }
- PostMethod method = new PostMethod(url);
- // try {
- // FilePart：用来上传文件的类
- FilePart fp = new FilePart("fileData", file);
- Part[] parts = { fp };
-
- // 对于MIME类型的请求，httpclient建议全用MulitPartRequestEntity进行包装
- MultipartRequestEntity mre = new MultipartRequestEntity(parts, method.getParams());
- method.setRequestEntity(mre);
- HttpClient client = new HttpClient();
- client.getHttpConnectionManager().getParams().setConnectionTimeout(50000);// 设置连接时间
-
- byte[] resultBytes;
-
- try {
- int statusCode = client.executeMethod(method);
- if (!(statusCode == 200 || statusCode == 302))
- throw (new Exception(statusCode + " Error"));
- resultBytes = method.getResponseBody();
- return new String(resultBytes);
- } catch (Exception e) {
- // logger.error("404 Error", e);
- throw new Exception(e);
- } finally {
- method.releaseConnection();
- }
- // int status = client.executeMethod(postMethod);
- // if (status == HttpStatus.SC_OK) {
- // System.out.println(postMethod.getResponseBodyAsString());
- // } else {
- // System.out.println("fail");
- // }
- // } catch (Exception e) {
- // e.printStackTrace();
- // } finally {
- // // 释放连接
- // postMethod.releaseConnection();
- // }
- }
-
- /**
- * @param args
- * @throws Exception
- */
- public static void main(String[] args) throws Exception {
- //http://localhost:8080/AutoTestPlat/logtest/logTestPictureAction
- uploadFile(new File("C:\\autosky_log\\TestJunit\\2014-04-22_16-16-33\\screenshot\\20140422-161703.png"), "http://localhost:8080/AutoTestPlat/logtest/upload");
- }
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/ScreenShotUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/ScreenShotUtil.java
deleted file mode 100644
index 36362482a6..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/ScreenShotUtil.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.Robot;
-import java.awt.Toolkit;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.imageio.ImageIO;
-
-import org.apache.commons.io.FileUtils;
-import org.openqa.selenium.OutputType;
-import org.openqa.selenium.TakesScreenshot;
-import org.openqa.selenium.WebDriver;
-
-public class ScreenShotUtil {
- private static String BASE_DIR = "C:\\autosky_log\\";
-
- public static String screenShotByDriver(WebDriver driver, String suitePath) {
- String picPath = "";
- //
- // Properties properties = FileUtil.getProperties();
- // BASE_DIR = properties.getProperty("logDir", BASE_DIR) == null ?
- // BASE_DIR : properties.getProperty("logPath", BASE_DIR);
- // if (!BASE_DIR.endsWith("/")) {
- // BASE_DIR = BASE_DIR + "/";
- // }
- // String screenShotPath = BASE_DIR;
- // // Boolean reportMerged =
- // // Boolean.valueOf(System.getProperty("report.merged") == null ?
- // "false"
- // // : System.getProperty("report.merged"));
- // // screenShotPath = screenShotPath + suitePath + "/screenshot";
- // screenShotPath = suitePath + "screenshot";
- // // 这里定义了截图存放目录名
- // if (!(new File(screenShotPath).isDirectory())) { // 判断是否存在该目录
- // new File(screenShotPath).mkdir(); // 如果不存在则新建一个目录
- // }
- String screenShotPath = createScreenShotPath(suitePath);
- String time = DateUtil.dateToStr(new Date(), "yyyyMMdd-HHmmss");
- try {
- File source_file = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); // 关键代码，执行屏幕截图，默认会把截图保存到temp目录
- File file = new File(screenShotPath + File.separator + time + ".png");
- FileUtils.copyFile(source_file, file); // 这里将截图另存到我们需要保存的目录，例如screenshot\20120406-165210.png
- picPath = file.getAbsolutePath();
- return picPath;
- } catch (Exception e) {
- return screenShotByDesktop(suitePath);
- }
- }
-
- // 如果通过webdriver截图失败的话，就采用桌面截图，后续添加上
- public static String screenShotByDesktop(String suitePath) {
- String picPath = "";
- try {
- Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
- String time = DateUtil.dateToStr(new Date(), "yyyyMMdd-HHmmss");
- String screenShotPath = createScreenShotPath(suitePath);
- BufferedImage screen = (new Robot()).createScreenCapture(new Rectangle(0, 0, (int) d.getWidth(), (int) d.getHeight()));
- String name = screenShotPath + "/" + time + ".png";
- File file = new File(name);
- ImageIO.write(screen, "png", file);
- picPath = file.getAbsolutePath();
- } catch (Exception e) {
- // TODO: handle exception
- System.out.println("截图失败！！！\n" + e.getMessage());
- }
- return picPath;
- }
-
- private static String createScreenShotPath(String suitePath) {
- Properties properties = FileUtil.getProperties();
- BASE_DIR = properties.getProperty("logDir", BASE_DIR) == null ? BASE_DIR : properties.getProperty("logPath", BASE_DIR);
- if (!BASE_DIR.endsWith("/")) {
- BASE_DIR = BASE_DIR + "/";
- }
- String screenShotPath = BASE_DIR;
- screenShotPath = suitePath + "Link/screenshot";
- // 这里定义了截图存放目录名
- if (!(new File(screenShotPath).isDirectory())) { // 判断是否存在该目录
- new File(screenShotPath).mkdir(); // 如果不存在则新建一个目录
- }
- return screenShotPath;
- }
- // 截图前先滚动下拉框,解决懒加载
- // browser.execute_script("""
- // (function () {
- // var y = 0;
- // var step = 100;
- // window.scroll(0, 0);
- //
- // function f() {
- // if (y < document.body.scrollHeight) {
- // y += step;
- // window.scroll(0, y);
- // setTimeout(f, 50);
- // } else {
- // window.scroll(0, 0);
- // document.title += "scroll-done";
- // }
- // }
- //
- // setTimeout(f, 1000);
- // })();
- // """)
- //
- // for i in xrange(30):
- // if "scroll-done" in browser.title:
- // break
- // time.sleep(1)
- //
- // browser.save_screenshot(save_fn)
- // browser.close()
-
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/SystemUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/SystemUtil.java
deleted file mode 100644
index 99fecbab08..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/SystemUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-
-import network.platon.autotest.junit.enums.BrowserProcessType;
-import network.platon.autotest.junit.enums.BrowserType;
-
-/**
- * SystemUtil 系统公用方法类
- * @Description: TODO(这里用一句话描述这个类的作用)
- * @author phuang_ckg
- * @date 2015年11月18日 下午6:53:11
- *
- */
-public class SystemUtil {
- public static Map browserProcessMap = new HashMap();
-
- public static void killProcessOld(String processName) {
- Runtime rt = Runtime.getRuntime();
- try {
- rt.exec("cmd.exe /C start wmic process where name='" + processName + "' call terminate");
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public static void killProcess(String processName) {
- Runtime rt = Runtime.getRuntime();
- try {
- rt.exec("cmd.exe /C taskkill /f /im " + processName);
- // tskill iexplore
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public static void openProcess(String processName) {
- Runtime rt = Runtime.getRuntime();
- try {
- rt.exec("cmd.exe /k start " + processName);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public static void killBrowserProcess() {
- // killProcess()
- }
-
- @SuppressWarnings({ "unused" })
- public static boolean isPortUsing(String host,int port) {
- boolean flag = false;
- InetAddress theAddress = null;
- try {
- theAddress = InetAddress.getByName(host);
- } catch (UnknownHostException e1) {
- e1.printStackTrace();
- }
- try {
- Socket socket = new Socket(theAddress,port);
- flag = true;
- } catch (Exception e) {
-
- }
- return flag;
- }
-}
diff --git a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/XmlUtil.java b/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/XmlUtil.java
deleted file mode 100644
index 089f72b505..0000000000
--- a/cases/ContractsAutoTests/src/main/java/network/platon/autotest/utils/XmlUtil.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package network.platon.autotest.utils;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import network.platon.autotest.junit.modules.CaseInfo;
-import network.platon.autotest.junit.modules.ModuleInfo;
-import network.platon.autotest.junit.modules.SuiteInfo;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-
-public class XmlUtil {
-
- public static String GetResAttributeXML(String Attribute, String resultList)
- throws UnsupportedEncodingException, DocumentException {
- System.out.println(resultList);
- String res = "";
- try {
- Document doc = DocumentHelper.parseText(resultList);
- Element root = doc.getRootElement();
- res = getElementAttribute(root, Attribute);
- } catch (DocumentException e) {
- e.printStackTrace();
- }
- return res;
- }
-
- // 递归迭代获取xml的节点；
- @SuppressWarnings("rawtypes")
- public static String getElementAttribute(Element elem, String Attribute) {
- String res = "";
- res = elem.attributeValue(Attribute);
- System.out.println(elem.getName());
- if (res == null || res.equals("")) {
- Iterator it = elem.elementIterator();
- while (it.hasNext()) {
- Element e = (Element) it.next();
- System.out.println(e.getName());
- res = getElementAttribute(e, Attribute);
- if (res != null && !res.equals("")) {
- break;
- }
- }
- }
- return res;
- }
-
- /**
- * @param infoXML XML字符串信息
- * @param attribute 属性
- * @return 属性value值
- */
- public static List getAttributeValue(String infoXML,String attribute) {
- Document document;
- List listAttributeValue = new ArrayList();
- try {
- document = DocumentHelper.parseText(infoXML);
- Element root = document.getRootElement();
- listAttributeValue = getAttributeValue2(root,attribute);
-
- } catch (DocumentException e1) {
- e1.printStackTrace();
- }
- return listAttributeValue;
- }
-
- @SuppressWarnings("rawtypes")
- private static List getAttributeValue2(Element element, String attribute) {
- List value = new ArrayList();
- value.add(element.attributeValue(attribute));
- System.out.println(element.getName());
- if(value.get(value.size()-1)==null||value==null||"null".equals(value.get(value.size()-1))){
- for(Iterator it = element.elementIterator();it.hasNext();){
- Element ele = (Element)it.next();
- System.out.println(ele.getName());
- value = getAttributeValue2(ele,attribute);
- if(value.get(value.size()-1)!=null&&value!=null&&!"null".equals(value.get(value.size()-1))){
- continue;
- }
- }
- }
-
- return value;
- }
-
- @SuppressWarnings("rawtypes")
- public static List> xmlDatas(String filePath) {
- List> datas = new ArrayList>();
- // Map data = new HashMap();
- SAXReader reader = new SAXReader();
- Document doc;
- try {
- doc = reader.read(filePath);
- Element root = doc.getRootElement();
- // System.out.println(root.getName());
- for (Iterator it = root.elementIterator(); it.hasNext();) {
- Element element = (Element) it.next();
- // System.out.println(element.getName());
- Map data = new HashMap();
- for (Iterator itt = element.elementIterator(); itt.hasNext();) {
- // System.out.println(element.attributeValue("age"));
- Element el = (Element) itt.next();
- data.put(el.getName(), el.getText());
- }
- datas.add(data);
- }
- } catch (DocumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return datas;
- }
-
- /**
- * 获取src/test/resources下的plan.xml或者plan.error.xml中的数据信息并转换为测试套件SuiteInfo对象
- * @param filePath
- * @return
- * @throws DocumentException
- */
- @SuppressWarnings("rawtypes")
- public static SuiteInfo parsePlanXml(String filePath) throws DocumentException {
- SuiteInfo suiteInfo = new SuiteInfo();
- //List> datas = new ArrayList>();
- SAXReader reader = new SAXReader();
- Document doc;
- //File file = new File(filePath);
- try {
- doc = reader.read(filePath);
- Element root = doc.getRootElement();
- suiteInfo.setSuiteName(root.attributeValue("name"));
- List moduleInfoList = new ArrayList();
- for (Iterator it = root.elementIterator(); it.hasNext();) {
- Element element = (Element) it.next();
- ModuleInfo moduleInfo = new ModuleInfo();
- moduleInfo.setModuleName(element.attributeValue("name"));
- moduleInfo.setModuleRun(Boolean.valueOf(element.attributeValue("run")));
-
- List caseInfoList = new ArrayList();
- for (Iterator itt = element.elementIterator(); itt.hasNext();) {
- // System.out.println(element.attributeValue("age"));
- Element el = (Element) itt.next();
- CaseInfo caseInfo = new CaseInfo();
- caseInfo.setCaseName(el.attributeValue("name"));
- caseInfo.setCaseRun(Boolean.valueOf(el.attributeValue("run")));
- caseInfoList.add(caseInfo);
- }
- moduleInfo.setCaseInfoList(caseInfoList);
- moduleInfoList.add(moduleInfo);
- }
- suiteInfo.setModuleInfoList(moduleInfoList);
- } catch (DocumentException e) {
- throw new DocumentException(e);
- }
- return suiteInfo;
- }
-
- public static void main(String[] args) {
- List