Commit: 1182938a26ad4c02186aa4d26023fdf44f79aafe - cit_bach (git)

Testcase generation tool for combinatorial interaction testing

Commit MetaInfo

• Revision: 1182938a26ad4c02186aa4d26023fdf44f79aafe (tree)
• Time: 2016-02-19 18:16:33
• Author: t-tutiya <tatsuhiro@ieee...>
• Commiter: t-tutiya

Log Message

Corrected CVS processing. (It is only used for processing a seeding
file.)

Change Summary

• modified: src/v1/Generator.java
• modified: src/v1/Inputer.java

Incremental Difference

--- a/src/v1/Generator.java
+++ b/src/v1/Generator.java
@@ -134,7 +134,7 @@ class Generator2 extends Generator {
 
 	// for regression testing  it should be reduced to 1
 	final int NumOfIterationForEachTest = 20;
-//	final int NumOfIterationForEachTest = 1;
+	// final int NumOfIterationForEachTest = 1;
 
 	Generator2(ParameterModel parametermodel, GList groupList,
 			ConstraintHandler constrainthandler, List<Testcase> seed,

--- a/src/v1/Inputer.java
+++ b/src/v1/Inputer.java
@@ -42,17 +42,17 @@ public class Inputer {
 		while ((row = parseCSVRow(reader)) != null) {
 			// TODO debug
 			// debug
-			/*
-			 * System.out.print("seed:"); for (String str: row) {
-			 * System.out.print(str + "\t"); } System.out.println();
-			 */
+			/**
+			  System.out.print("seed:"); for (String str: row) {
+			  System.out.print(str + "\t"); } System.out.println();
+			 
 
-			/*
-			 * System.err.print(row.size() +": "); for (String str: row) {
-			 * System.err.print(str + ","); } System.err.println();
-			 */
+			
+			  System.err.print(row.size() +": "); for (String str: row) {
+			  System.err.print(str + ","); } System.err.println();
+			 
 
-			/*
+			
 			 * if (isValueConsistent(row, inputfiledata) == false) {
 			 * Error.printError("seedファイルの値の記述に誤りがあります"); return null; }
 			 */
@@ -142,15 +142,18 @@ public class Inputer {
 				// line = line.replaceAll("#", ",#,");
 				// #以降を消去
 				line = line.replaceAll("#.*", "");
+				
 				// ,から始まる場合，行頭にスペースを入れる
 				// line = line.replaceAll(",", " ,");
+				// ,の前後にスペースを入れる．2016/2/19以下を追加
+				line = line.replaceAll(",", " , ");
 				StringTokenizer st = new StringTokenizer(line, ",");
 				while (st.hasMoreTokens()) {
 					String token = st.nextToken();
 					token = token.trim();
 					// if (token.equals("#"))
 					// break;
-					token = token.trim();
+					// token = token.trim(); unnecessary
 					tokenList.add(token);
 				}
 			} catch (IOException e) {