[smart-load-test commit] r162 - in trunk/smart-load-test: smart-load-test-engine-impl/src/main/java/com/smartitengineering...
codesite...@google.com
Date: Sun Jan 25 20:18:28 2009
New Revision: 162
Modified:
trunk/smart-load-test/smart-load-test-engine-impl/src/main/java/com/smartitengineering/loadtest/engine/impl/persistence/db/DatabasePersistentTestResultEngineImpl.java
trunk/smart-load-test/smart-load-test-engine-impl/src/test/java/com/smartitengineering/loadtest/engine/impl/LoadTestEngineImplTest.java
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/KeyedInformation.java
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestCaseInstanceResult.java
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestCaseResult.java
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestProperty.java
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestResult.java
Log:
Integrate smart-dao's changes into load test project
Discovered that while building the whole project the test fails
indeterministically and thus was trying to debug, but could not resolve the
problem; but the project compiles without any error.
Signed-off-by: Imran M Yousuf <imyo...@smartitengineering.com>
Modified:
trunk/smart-load-test/smart-load-test-engine-impl/src/main/java/com/smartitengineering/loadtest/engine/impl/persistence/db/DatabasePersistentTestResultEngineImpl.java
==============================================================================
---
trunk/smart-load-test/smart-load-test-engine-impl/src/main/java/com/smartitengineering/loadtest/engine/impl/persistence/db/DatabasePersistentTestResultEngineImpl.java
(original)
+++
trunk/smart-load-test/smart-load-test-engine-impl/src/main/java/com/smartitengineering/loadtest/engine/impl/persistence/db/DatabasePersistentTestResultEngineImpl.java
Sun Jan 25 20:18:28 2009
@@ -19,7 +19,9 @@
import com.smartitengineering.dao.common.CommonReadDao;
import com.smartitengineering.dao.common.CommonWriteDao;
-import com.smartitengineering.dao.common.QueryParameter;
+import com.smartitengineering.dao.common.queryparam.MatchMode;
+import com.smartitengineering.dao.common.queryparam.QueryParameter;
+import com.smartitengineering.dao.common.queryparam.QueryParameterFactory;
import
com.smartitengineering.loadtest.engine.persistence.PersistentTestResultEngine;
import com.smartitengineering.loadtest.engine.result.TestResult;
import java.util.ArrayList;
@@ -38,7 +40,6 @@
implements PersistentTestResultEngine {
private CommonReadDao<TestResult> persistentEngineDao;
-
private CommonWriteDao<TestResult> persistentWriteEngineDao;
public List<TestResult> getAllResults() {
@@ -48,19 +49,19 @@
}
catch (Exception ex) {
ex.printStackTrace();
- allResults = Collections.<TestResult>emptyList();
+ allResults = Collections.<TestResult>emptyList();
}
return new ArrayList<TestResult>(new
HashSet<TestResult>(allResults));
}
public List<TestResult> getAllForTestName(final String testName) {
- QueryParameter<String> param =
+ QueryParameter<String> param =
getNameParam(testName);
List<TestResult> searchResults;
try {
searchResults = persistentEngineDao.getList(param);
}
- catch(Exception ex) {
+ catch (Exception ex) {
ex.printStackTrace();
searchResults = Collections.<TestResult>emptyList();
}
@@ -79,7 +80,7 @@
try {
searchResults = persistentEngineDao.getList(param);
}
- catch(Exception ex) {
+ catch (Exception ex) {
ex.printStackTrace();
searchResults = Collections.<TestResult>emptyList();
}
@@ -92,9 +93,9 @@
List<TestResult> searchResults;
try {
searchResults =
persistentEngineDao.getList(getNameParam(testName),
- getDateParam(startDate,
endDate));
+ getDateParam(startDate, endDate));
}
- catch(Exception ex) {
+ catch (Exception ex) {
ex.printStackTrace();
searchResults = Collections.<TestResult>emptyList();
}
@@ -104,7 +105,7 @@
public boolean deleteTestResult(TestResult testResult)
throws IllegalArgumentException,
UnsupportedOperationException {
- if(testResult == null) {
+ if (testResult == null) {
throw new IllegalArgumentException();
}
try {
@@ -129,12 +130,12 @@
*/
public List<TestResult> getTestResults(Map<String, ? extends Object>
filters)
throws UnsupportedOperationException {
- if(filters == null) {
+ if (filters == null) {
return Collections.<TestResult>emptyList();
}
ArrayList<QueryParameter> params = new ArrayList<QueryParameter>();
for (Map.Entry<String, ? extends Object> entry :
filters.entrySet()) {
- if(entry.getValue() instanceof QueryParameter) {
+ if (entry.getValue() instanceof QueryParameter) {
params.add((QueryParameter) entry.getValue());
}
}
@@ -142,7 +143,7 @@
try {
searchResults = persistentEngineDao.getList(params);
}
- catch(Exception ex) {
+ catch (Exception ex) {
ex.printStackTrace();
searchResults = Collections.<TestResult>emptyList();
}
@@ -162,7 +163,8 @@
return persistentWriteEngineDao;
}
- public void setPersistentWriteEngineDao(CommonWriteDao<TestResult>
persistentWriteEngineDao) {
+ public void setPersistentWriteEngineDao(
+ CommonWriteDao<TestResult> persistentWriteEngineDao) {
this.persistentWriteEngineDao = persistentWriteEngineDao;
}
@@ -181,20 +183,15 @@
endDate = new Date();
}
QueryParameter<Date> param =
- new QueryParameter<Date>("startDateTime",
- QueryParameter.PARAMETER_TYPE_PROPERTY,
- QueryParameter.OPERATOR_BETWEEN, startDate);
- param.setParameter2(endDate);
+
QueryParameterFactory.<Date>getBetweenPropertyParam("startDateTime",
+ startDate, endDate);
return param;
}
protected QueryParameter<String> getNameParam(final String testName) {
QueryParameter<String> param =
- new QueryParameter<String>("testName",
- QueryParameter.PARAMETER_TYPE_PROPERTY,
- QueryParameter.OPERATOR_STRING_LIKE,
- testName == null ? "" : testName);
- param.setMatchMode(QueryParameter.MatchMode.START);
+
QueryParameterFactory.<String>getStringLikePropertyParam("testName",
testName == null
+ ? "" : testName, MatchMode.START);
return param;
}
}
Modified:
trunk/smart-load-test/smart-load-test-engine-impl/src/test/java/com/smartitengineering/loadtest/engine/impl/LoadTestEngineImplTest.java
==============================================================================
---
trunk/smart-load-test/smart-load-test-engine-impl/src/test/java/com/smartitengineering/loadtest/engine/impl/LoadTestEngineImplTest.java
(original)
+++
trunk/smart-load-test/smart-load-test-engine-impl/src/test/java/com/smartitengineering/loadtest/engine/impl/LoadTestEngineImplTest.java
Sun Jan 25 20:18:28 2009
@@ -324,7 +324,7 @@
int[] batchCounts = {5, 6, 3, 3,};
int[] threadsPerBatchCounts = {3, 4, 5, 5,};
int[] sleepDurations = {10, 5, 20, 10};
- int[] batchIntervals = {500, 200, 500, 300};
+ int[] batchIntervals = {200, 200, 100, 300};
for (int i = 0; i < instanceNames.length; ++i) {
TestData testData = new TestData();
testData.instanceName = instanceNames[i];
@@ -378,9 +378,12 @@
boolean validationResult = true;
validationResult = validationResult && startDate.before(result.
getStartDateTime());
+ System.out.println("START TIME: " + validationResult);
validationResult = validationResult && endDate.after(result.
getEndDateTime());
+ System.out.println("END TIME: " + validationResult);
if (validationResult) {
+ System.out.println("Results: " +
result.getTestCaseRunResults());
for (TestCaseResult caseResult :
result.getTestCaseRunResults()) {
//Test for existence of test instance
String instanceName = caseResult.getName();
@@ -393,11 +396,16 @@
}
}
validationResult = validationResult && found;
+ System.out.println("Instance found? " + found);
if (validationResult) {
//Check for all instances in result
validationResult = validationResult && caseResult.
getTestCaseInstanceResults().size() ==
instanceData.batchCount *
instanceData.threadsPerBatch;
+ System.out.println("Instance count matched? " +
+ validationResult + " " + caseResult.
+ getTestCaseInstanceResults().size() + " " +
+ (instanceData.batchCount *
instanceData.threadsPerBatch));
if (!validationResult) {
break;
}
@@ -407,12 +415,16 @@
getTestCaseInstanceResults()) {
validationResult = validationResult
&& !numbers.contains(
instanceResult.getInstanceNumber());
+ System.out.println("Instance number checked? " +
+ validationResult);
if (validationResult) {
numbers.add(instanceResult.getInstanceNumber());
- long duration =
instanceResult.getEndTime().getTime()
- - instanceResult.getStartTime().getTime();
- validationResult = validationResult
- && duration >= instanceData.sleepDuration;
+ long duration =
instanceResult.getEndTime().getTime() - instanceResult.getStartTime().
+ getTime();
+ validationResult = validationResult &&
duration >=
+ instanceData.sleepDuration;
+ System.out.println("Check duration: " +
+ validationResult);
}
else {
break;
@@ -424,6 +436,7 @@
}
}
}
+ System.out.println("Returning: " + validationResult);
return validationResult;
}
@@ -432,7 +445,7 @@
final int maxWaitDuration) {
while (!engine.getState().
equals(LoadTestEngine.State.FINISHED) &&
- System.currentTimeMillis() - startMillis < maxWaitDuration) {
+ (System.currentTimeMillis() - startMillis) < maxWaitDuration) {
try {
//Wait for the engine to finish
Thread.sleep(500);
Modified:
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/KeyedInformation.java
==============================================================================
---
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/KeyedInformation.java
(original)
+++
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/KeyedInformation.java
Sun Jan 25 20:18:28 2009
@@ -18,6 +18,7 @@
*/
package com.smartitengineering.loadtest.engine.result;
+import com.smartitengineering.domain.AbstractPersistentDTO;
import com.smartitengineering.domain.PersistentDTO;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -28,7 +29,8 @@
*/
@XmlAccessorType(XmlAccessType.PROPERTY)
public class KeyedInformation
- extends PersistentDTO<KeyedInformation> {
+ extends AbstractPersistentDTO<KeyedInformation>
+ implements PersistentDTO<KeyedInformation> {
private String key;
private String value;
Modified:
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestCaseInstanceResult.java
==============================================================================
---
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestCaseInstanceResult.java
(original)
+++
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestCaseInstanceResult.java
Sun Jan 25 20:18:28 2009
@@ -18,6 +18,7 @@
*/
package com.smartitengineering.loadtest.engine.result;
+import com.smartitengineering.domain.AbstractPersistentDTO;
import com.smartitengineering.domain.PersistentDTO;
import com.smartitengineering.loadtest.engine.TestCase;
import java.util.Date;
@@ -32,7 +33,8 @@
*/
@XmlAccessorType(XmlAccessType.PROPERTY)
public class TestCaseInstanceResult
- extends PersistentDTO<TestCaseInstanceResult> {
+ extends AbstractPersistentDTO<TestCaseInstanceResult>
+ implements PersistentDTO<TestCaseInstanceResult> {
private Date startTime;
private Date endTime;
@@ -139,5 +141,4 @@
public void setOtherInfomations(Set<KeyedInformation>
otherInfomations) {
this.otherInfomations = otherInfomations;
}
-
}
Modified:
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestCaseResult.java
==============================================================================
---
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestCaseResult.java
(original)
+++
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestCaseResult.java
Sun Jan 25 20:18:28 2009
@@ -18,6 +18,7 @@
*/
package com.smartitengineering.loadtest.engine.result;
+import com.smartitengineering.domain.AbstractPersistentDTO;
import com.smartitengineering.domain.PersistentDTO;
import java.util.HashSet;
import java.util.Set;
@@ -30,7 +31,8 @@
*/
@XmlAccessorType(XmlAccessType.PROPERTY)
public class TestCaseResult
- extends PersistentDTO<TestCaseResult> {
+ extends AbstractPersistentDTO<TestCaseResult>
+ implements PersistentDTO<TestCaseResult> {
private String name;
private String instanceFactoryClassName;
@@ -39,9 +41,9 @@
private Set<KeyedInformation> otherInfomations;
public boolean isValid() {
- if (name != null && instanceFactoryClassName != null
- && testCaseInstanceResults != null
- && testCaseInstanceResults.size() > 0) {
+ if (name != null && instanceFactoryClassName != null &&
+ testCaseInstanceResults != null &&
testCaseInstanceResults.size() >
+ 0) {
for (TestCaseInstanceResult instanceResult :
testCaseInstanceResults) {
if (!instanceResult.isValid()) {
return false;
@@ -158,5 +160,4 @@
public void setOtherInfomations(Set<KeyedInformation>
otherInfomations) {
this.otherInfomations = otherInfomations;
}
-
}
Modified:
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestProperty.java
==============================================================================
---
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestProperty.java
(original)
+++
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestProperty.java
Sun Jan 25 20:18:28 2009
@@ -18,6 +18,7 @@
*/
package com.smartitengineering.loadtest.engine.result;
+import com.smartitengineering.domain.AbstractPersistentDTO;
import com.smartitengineering.domain.PersistentDTO;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -28,7 +29,8 @@
*/
@XmlAccessorType(XmlAccessType.PROPERTY)
public class TestProperty
- extends PersistentDTO<TestProperty> {
+ extends AbstractPersistentDTO<TestProperty>
+ implements PersistentDTO<TestProperty> {
private String key;
private String value;
@@ -76,5 +78,4 @@
public void setValue(String value) {
this.value = value;
}
-
}
Modified:
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestResult.java
==============================================================================
---
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestResult.java
(original)
+++
trunk/smart-load-test/smart-load-test-engine/src/main/java/com/smartitengineering/loadtest/engine/result/TestResult.java
Sun Jan 25 20:18:28 2009
@@ -18,6 +18,7 @@
*/
package com.smartitengineering.loadtest.engine.result;
+import com.smartitengineering.domain.AbstractPersistentDTO;
import com.smartitengineering.domain.PersistentDTO;
import java.util.Date;
import java.util.HashSet;
@@ -33,7 +34,7 @@
@XmlRootElement
@XmlAccessorType(XmlAccessType.PROPERTY)
public class TestResult
- extends PersistentDTO<TestResult> {
+ extends AbstractPersistentDTO<TestResult> implements
PersistentDTO<TestResult> {
private String testName;
private Date startDateTime;