From 00b55e89dd504bcea9906d7446090215e2860fca Mon Sep 17 00:00:00 2001 From: coderfengyun Date: Fri, 28 Mar 2014 14:01:15 +0800 Subject: [PATCH] refactor and add new tests refactor and add new tests --- .../param1.txt | 1 + .../param1.txt | 1 + .../param1.txt | 1 + .../param1.txt | 1 + .../agent/api/ParameterizationController.java | 8 ++++++++ .../agent/parameterization/impl/Para_File.java | 18 ------------------ .../Test_InstanceCotroller.java | 11 +++++++---- 7 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 Bench4Q-Agent/ScenarioParameters/3da766c9-5801-4caa-a815-b8974e895a79/param1.txt create mode 100644 Bench4Q-Agent/ScenarioParameters/8895ad81-4ac9-4d73-a3d8-068905f5720f/param1.txt create mode 100644 Bench4Q-Agent/ScenarioParameters/b2870112-ebc0-4d58-bd87-601a071fe252/param1.txt create mode 100644 Bench4Q-Agent/ScenarioParameters/fae336cb-46c9-486e-81fd-2428dfe61588/param1.txt create mode 100644 Bench4Q-Agent/src/main/java/org/bench4q/agent/api/ParameterizationController.java delete mode 100644 Bench4Q-Agent/src/main/java/org/bench4q/agent/parameterization/impl/Para_File.java diff --git a/Bench4Q-Agent/ScenarioParameters/3da766c9-5801-4caa-a815-b8974e895a79/param1.txt b/Bench4Q-Agent/ScenarioParameters/3da766c9-5801-4caa-a815-b8974e895a79/param1.txt new file mode 100644 index 00000000..748dc5f7 --- /dev/null +++ b/Bench4Q-Agent/ScenarioParameters/3da766c9-5801-4caa-a815-b8974e895a79/param1.txt @@ -0,0 +1 @@ +row1;10;11~row2;20;21~row3,30,31~ \ No newline at end of file diff --git a/Bench4Q-Agent/ScenarioParameters/8895ad81-4ac9-4d73-a3d8-068905f5720f/param1.txt b/Bench4Q-Agent/ScenarioParameters/8895ad81-4ac9-4d73-a3d8-068905f5720f/param1.txt new file mode 100644 index 00000000..748dc5f7 --- /dev/null +++ b/Bench4Q-Agent/ScenarioParameters/8895ad81-4ac9-4d73-a3d8-068905f5720f/param1.txt @@ -0,0 +1 @@ +row1;10;11~row2;20;21~row3,30,31~ \ No newline at end of file diff --git a/Bench4Q-Agent/ScenarioParameters/b2870112-ebc0-4d58-bd87-601a071fe252/param1.txt b/Bench4Q-Agent/ScenarioParameters/b2870112-ebc0-4d58-bd87-601a071fe252/param1.txt new file mode 100644 index 00000000..748dc5f7 --- /dev/null +++ b/Bench4Q-Agent/ScenarioParameters/b2870112-ebc0-4d58-bd87-601a071fe252/param1.txt @@ -0,0 +1 @@ +row1;10;11~row2;20;21~row3,30,31~ \ No newline at end of file diff --git a/Bench4Q-Agent/ScenarioParameters/fae336cb-46c9-486e-81fd-2428dfe61588/param1.txt b/Bench4Q-Agent/ScenarioParameters/fae336cb-46c9-486e-81fd-2428dfe61588/param1.txt new file mode 100644 index 00000000..748dc5f7 --- /dev/null +++ b/Bench4Q-Agent/ScenarioParameters/fae336cb-46c9-486e-81fd-2428dfe61588/param1.txt @@ -0,0 +1 @@ +row1;10;11~row2;20;21~row3,30,31~ \ No newline at end of file diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/ParameterizationController.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/ParameterizationController.java new file mode 100644 index 00000000..bbc9aec4 --- /dev/null +++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/ParameterizationController.java @@ -0,0 +1,8 @@ +package org.bench4q.agent.api; + +import org.springframework.stereotype.Controller; + +@Controller +public class ParameterizationController { + +} diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/parameterization/impl/Para_File.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/parameterization/impl/Para_File.java deleted file mode 100644 index aaca0b6d..00000000 --- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/parameterization/impl/Para_File.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.bench4q.agent.parameterization.impl; - -import java.io.BufferedReader; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -public class Para_File { - - @SuppressWarnings("unused") - private Map readBuffer = new HashMap(); - - public void getFromFile(UUID id, String fileName, String column, - String firstData, String byNumber) { - - } - -} diff --git a/Bench4Q-Agent/src/test/java/org/bench4q/agent/test/parameterization/Test_InstanceCotroller.java b/Bench4Q-Agent/src/test/java/org/bench4q/agent/test/parameterization/Test_InstanceCotroller.java index d499bc94..6a6b6f7c 100644 --- a/Bench4Q-Agent/src/test/java/org/bench4q/agent/test/parameterization/Test_InstanceCotroller.java +++ b/Bench4Q-Agent/src/test/java/org/bench4q/agent/test/parameterization/Test_InstanceCotroller.java @@ -73,13 +73,17 @@ public class Test_InstanceCotroller { ic.doCleanUp(); } + @Test + public void testGetParamWithUpdateOnEachOccurrence() { + + } + @Test public void testGetParameter() throws Exception { UUID testId = UUID.randomUUID(); createParamFileFor(new Para_Table(testId) .getParamFileFullPath("param1")); - VUserContext paracCoor = new VUserContext( - new ParametersFactory(testId)); + VUserContext paracCoor = new VUserContext(new ParametersFactory(testId)); ParamFormatParser paramFormatParser = ParamFormatParser .parseInputParameter(Test_CASE1); String result = (String) TestHelper.invokePrivate(paracCoor, @@ -94,8 +98,7 @@ public class Test_InstanceCotroller { UUID testId = UUID.randomUUID(); createParamFileFor(new Para_Table(testId) .getParamFileFullPath("param1")); - VUserContext paracCoor = new VUserContext( - new ParametersFactory(testId)); + VUserContext paracCoor = new VUserContext(new ParametersFactory(testId)); ParamFormatParser paramFormatParser = ParamFormatParser .parseInputParameter(Test_CASE1); String result = (String) TestHelper.invokePrivate(