Permalink
Browse files

Commit with proper user name

  • Loading branch information...
1 parent 2f4199c commit fdb421cfc33f2b137d751ab728a5ea83e3acb980 @WAAT WAAT committed with unknown Jan 3, 2011
Showing with 29 additions and 36 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 LICENSE.txt
  3. +0 −1 README
  4. +1 −1 build.xml
  5. +1 −0 resources/log4j.properties
  6. +1 −1 resources/waat.properties
  7. +1 −1 src/com/thoughtworks/webanalyticsautomation/Controller.java
  8. +1 −1 src/com/thoughtworks/webanalyticsautomation/Engine.java
  9. +1 −1 src/com/thoughtworks/webanalyticsautomation/Result.java
  10. +1 −1 src/com/thoughtworks/webanalyticsautomation/Status.java
  11. +1 −1 src/com/thoughtworks/webanalyticsautomation/common/CONFIG.java
  12. +1 −1 src/com/thoughtworks/webanalyticsautomation/common/FileUtils.java
  13. +1 −1 src/com/thoughtworks/webanalyticsautomation/common/Utils.java
  14. +1 −1 src/com/thoughtworks/webanalyticsautomation/inputdata/InputFileType.java
  15. +1 −1 src/com/thoughtworks/webanalyticsautomation/inputdata/Section.java
  16. +1 −1 src/com/thoughtworks/webanalyticsautomation/inputdata/TestData.java
  17. +1 −1 src/com/thoughtworks/webanalyticsautomation/plugins/IWAATPlugin.java
  18. +1 −2 src/com/thoughtworks/webanalyticsautomation/plugins/OmnitureDebugger.java
  19. +1 −1 src/com/thoughtworks/webanalyticsautomation/plugins/PluginFactory.java
  20. +1 −1 src/com/thoughtworks/webanalyticsautomation/plugins/WebAnalyticTool.java
  21. +1 −1 src/com/thoughtworks/webanalyticsautomation/scriptrunner/IScriptRunner.java
  22. +1 −1 test/com/thoughtworks/webanalyticsautomation/ControllerTest.java
  23. +1 −1 test/com/thoughtworks/webanalyticsautomation/EngineWithSeleniumTest.java
  24. +1 −1 test/com/thoughtworks/webanalyticsautomation/common/TestBase.java
  25. +1 −1 test/com/thoughtworks/webanalyticsautomation/inputdata/TestDataTest.java
  26. +1 −1 test/com/thoughtworks/webanalyticsautomation/scriptrunner/SeleniumScriptRunner.java
  27. +1 −1 test/com/thoughtworks/webanalyticsautomation/scriptrunner/SeleniumScriptRunnerHelper.java
  28. +1 −1 test/com/thoughtworks/webanalyticsautomation/utils/BROWSER.java
  29. +0 −7 test/com/thoughtworks/webanalyticsautomation/utils/CustomTestListener.java
  30. +1 −1 test/com/thoughtworks/webanalyticsautomation/utils/UIDriverThreadRunner.java
  31. +1 −1 test/sampledata/OmnitureTestData.xml
View
@@ -4,3 +4,4 @@ out
testNGReports
waat.log
velocity.log
+
View
@@ -10,4 +10,4 @@ Copyright 2010 Anand Bagmar
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
+ limitations under the License.
View
1 README
@@ -36,4 +36,3 @@
For any other questions, comments, help, email Anand @ anandb@thoughtworks.com / abagmar@gmail.com
-
View
@@ -9,11 +9,11 @@
<property name="test.output.dir" value="${out.dir}/${TEST_TYPE}"/>
<property name="testNGOutput.dir" value="${out.dir}/testNGReports"/>
-
<path id="library.lib.test.classpath">
<fileset dir="${lib.dir}" includes="**/*.jar"/>
<path location="${basedir}/resources"/>
</path>
+
<path id="library.lib.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
@@ -13,3 +13,4 @@ log4j.appender.LogToFile.threshold=INFO
log4j.appender.LogToFile.Append=true
log4j.appender.LogToFile.layout=org.apache.log4j.PatternLayout
log4j.appender.LogToFile.layout.ConversionPattern=%d %-5p [%t] %-17c{1} (%13F:%L) \n %3x - %m%n
+
@@ -3,4 +3,4 @@ PRODUCTION_TYPE=prod
SRC_DIR=src
VERSION=v1.0
JAR_FILE_PREFIX=WAAT
-threadCount=2
+threadCount=2
@@ -54,4 +54,4 @@ private static Engine createNewEngine(String webAnalyticTool,
logger.info("Creating new Engine reference");
return new Engine ();
}
-}
+}
@@ -131,4 +131,4 @@ private boolean isExpectedTagPresentInActualTagList(ArrayList<String> actualSect
}
return allTags;
}
-}
+}
@@ -42,4 +42,4 @@ else if (verificationStatus != Status.SKIPPED) {
verificationStatus = Status.PASS;
}
}
-}
+}
@@ -9,4 +9,4 @@
public enum Status {
PASS, FAIL, SKIPPED
-}
+}
@@ -42,4 +42,4 @@ protected static void setUpConfig(String webAnalyticTool, String inputFileType,
LOG4J_PROPERTIES_ABSOLUTE_FILE_PATH = log4jPropertiesAbsoluteFilePath;
PropertyConfigurator.configure(LOG4J_PROPERTIES_ABSOLUTE_FILE_PATH);
}
-}
+}
@@ -35,4 +35,4 @@ public static String getXMLContentFromFile(String absoluteFilePath) {
}
return new String(buffer);
}
-}
+}
@@ -24,4 +24,4 @@
public static String getThreadLocalID() {
return REQUIRES_WEBANALYTICS_TESTING + Thread.currentThread().getId();
}
-}
+}
@@ -9,4 +9,4 @@
public enum InputFileType {
XML
-}
+}
@@ -50,4 +50,4 @@ public int getNumberOfEventsTriggered() {
public void setup() {
loadedTagList = convertStringArrayToArrayList(tagList.split(Utils.TEST_DATA_DELIMITER));
}
-}
+}
@@ -76,4 +76,4 @@ private static XStream configureXStream() {
xStream = Section.configurePageLayoutXStream(xStream);
return xStream;
}
-}
+}
@@ -14,4 +14,4 @@
public interface IWAATPlugin {
public ArrayList<Section> captureSections(IScriptRunner scriptRunner);
-}
+}
@@ -41,5 +41,4 @@ public OmnitureDebugger() {
}
return capturedSections;
}
-
-}
+}
@@ -16,4 +16,4 @@ public IWAATPlugin getWebAnalyticsPluginInstance(WebAnalyticTool webAnalyticTool
throw new IllegalArgumentException("Invalid type of Web Analytic Tool (" + webAnalyticTool + ") specified");
}
}
-}
+}
@@ -9,4 +9,4 @@
public enum WebAnalyticTool {
OMNITURE
-}
+}
@@ -9,4 +9,4 @@
public interface IScriptRunner {
String getHTMLSourceByExecutingScript(String OMNITURE_DEBUGGER_URL, String OMNITURE_DEBUGGER_WINDOW_TITLE, String OMNITURE_DEBUGGER_URL_DECODE_CHECKBOX);
-}
+}
@@ -34,4 +34,4 @@ public void enableAndDisableWebAnalyticsTesting() throws Exception {
engine.disableWebAnalyticsTesting();
assertEquals(false, engine.isWebAnalyticsTestingEnabled(), "WebAnalytics Testing should be disabled.");
}
-}
+}
@@ -85,4 +85,4 @@ private void startSeleniumDriver(BROWSER browser) {
seleniumScriptRunnerHelper = new SeleniumScriptRunnerHelper(logger, browser);
seleniumScriptRunnerHelper.startSeleniumDriver();
}
-}
+}
@@ -21,4 +21,4 @@
protected String log4jPropertiesAbsoluteFilePath = System.getProperty("user.dir") + "\\resources\\log4j.properties";
protected String inputDataFileName = System.getProperty("user.dir") + "\\test\\sampledata\\OmnitureTestData.xml";
-}
+}
@@ -50,4 +50,4 @@ public void removeLoadedFileFromMemoryTest() throws Exception {
boolean isFileLoaded = TestData.isFileLoaded(inputDataFileName);
assertEquals(keepLoadedFileInMemory, isFileLoaded, "File should NOT be loaded in memory");
}
-}
+}
@@ -44,4 +44,4 @@ private void closeDebugger() {
logger.info ("Select parent window.");
selenium.selectWindow("");
}
-}
+}
@@ -53,4 +53,4 @@ public void stopSeleniumDriver()
e.printStackTrace();
}
}
-}
+}
@@ -9,4 +9,4 @@
public enum BROWSER {
firefox, iehta
-}
+}
@@ -27,12 +27,6 @@
"-----------------------------------\n" +
"------------------------------------------------------------------------------------\n";
-/*
- {
- PropertyConfigurator.configure(CONFIG.getLOG4J_PROPERTIES_ABSOLUTE_FILE_PATH());
- }
-*/
-
private Logger logger = Logger.getLogger(getClass());
public void onTestStart(ITestResult iTestResult) {
@@ -60,5 +54,4 @@ public void onStart(ITestContext iTestContext) {
public void onFinish(ITestContext iTestContext) {
logger.info(WAAT_END_LOG_MESSAGE);
}
-
}
@@ -65,4 +65,4 @@ public void stop() {
logger.info ("Calling stop in the thread");
process.destroy();
}
-}
+}
@@ -61,4 +61,4 @@
s.prop9 = 'all';||
s.eVar9 = 'all';||
s.events = 'event2';||"/>
-</Sections>
+</Sections>

0 comments on commit fdb421c

Please sign in to comment.