[cvs]
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache
CacheTest.java
JCorporate Ltd
jcorp at jcorp2.servlets.net
Tue Sep 21 22:00:03 PDT 2004
Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache
In directory jcorp2.servlets.net:/tmp/cvs-serv13925/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache
Modified Files:
CacheTest.java
Log Message:
cleaned up compiler warnings
Index: CacheTest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache/CacheTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CacheTest.java 6 May 2004 09:15:22 -0000 1.13
--- CacheTest.java 22 Sep 2004 05:00:01 -0000 1.14
***************
*** 139,147 ****
{
try {
! cm.createCache(TestSystemInitializer.getTestContext(), cacheName,
false);
/* Create an ordered cache as well */
! cm.createCache(TestSystemInitializer.getTestContext(),
cacheName + "O", true);
} catch (java.util.ConcurrentModificationException cme) {
--- 139,147 ----
{
try {
! CacheManager.createCache(TestSystemInitializer.getTestContext(), cacheName,
false);
/* Create an ordered cache as well */
! CacheManager.createCache(TestSystemInitializer.getTestContext(),
cacheName + "O", true);
} catch (java.util.ConcurrentModificationException cme) {
***************
*** 191,196 ****
{
try {
! cm.clear(TestSystemInitializer.getTestContext(), cacheName);
! cm.clear(TestSystemInitializer.getTestContext(), cacheName + "O");
} catch (java.util.ConcurrentModificationException cme) {
log.error("Error Tearing Down", cme);
--- 191,196 ----
{
try {
! CacheManager.clear(TestSystemInitializer.getTestContext(), cacheName);
! CacheManager.clear(TestSystemInitializer.getTestContext(), cacheName + "O");
} catch (java.util.ConcurrentModificationException cme) {
log.error("Error Tearing Down", cme);
***************
*** 210,224 ****
ValidValue c = new ValidValue("c", "c");
! if (cm.existsCache(TestSystemInitializer.getTestContext(), cacheName)) {
if (log.isInfoEnabled()) {
log.debug("Clearing cache: " + cacheName);
}
! cm.clear(TestSystemInitializer.getTestContext(), cacheName);
}
! cm.addItem(TestSystemInitializer.getTestContext(), cacheName, b);
! ValidValue retrieved = (ValidValue) cm.getItem(TestSystemInitializer.getTestContext(),
cacheName, "b");
--- 210,224 ----
ValidValue c = new ValidValue("c", "c");
! if (CacheManager.existsCache(TestSystemInitializer.getTestContext(), cacheName)) {
if (log.isInfoEnabled()) {
log.debug("Clearing cache: " + cacheName);
}
! CacheManager.clear(TestSystemInitializer.getTestContext(), cacheName);
}
! CacheManager.addItem(TestSystemInitializer.getTestContext(), cacheName, b);
! ValidValue retrieved = (ValidValue) CacheManager.getItem(TestSystemInitializer.getTestContext(),
cacheName, "b");
***************
*** 254,260 ****
ValidValue c = new ValidValue("cO", "cO");
! if (cm.existsCache(TestSystemInitializer.getTestContext(),
cacheName + "O")) {
! cm.clear(TestSystemInitializer.getTestContext(), cacheName +
"O");
}
--- 254,260 ----
ValidValue c = new ValidValue("cO", "cO");
! if (CacheManager.existsCache(TestSystemInitializer.getTestContext(),
cacheName + "O")) {
! CacheManager.clear(TestSystemInitializer.getTestContext(), cacheName +
"O");
}
***************
*** 263,267 ****
cacheName + "O", b);
! ValidValue retrieved = (ValidValue) cm.getItem(
TestSystemInitializer.getTestContext(),
cacheName + "O", "bO");
--- 263,267 ----
cacheName + "O", b);
! ValidValue retrieved = (ValidValue) CacheManager.getItem(
TestSystemInitializer.getTestContext(),
cacheName + "O", "bO");
***************
*** 290,297 ****
ValidValue b = new ValidValue("b", "b");
ValidValue c = new ValidValue("c", "c");
! cm.addItem(TestSystemInitializer.getTestContext(), cacheName, b);
! cm.addItem(TestSystemInitializer.getTestContext(), cacheName, c);
! ValidValue retrieved = (ValidValue) cm.getItem(
TestSystemInitializer.getTestContext(),
cacheName, "b");
--- 290,297 ----
ValidValue b = new ValidValue("b", "b");
ValidValue c = new ValidValue("c", "c");
! CacheManager.addItem(TestSystemInitializer.getTestContext(), cacheName, b);
! CacheManager.addItem(TestSystemInitializer.getTestContext(), cacheName, c);
! ValidValue retrieved = (ValidValue) CacheManager.getItem(
TestSystemInitializer.getTestContext(),
cacheName, "b");
***************
*** 303,307 ****
! retrieved = (ValidValue) cm.getItem(TestSystemInitializer.getTestContext(),
cacheName, "c");
assertTrue("Got null back for item 'b' from ordered test cache",
--- 303,307 ----
! retrieved = (ValidValue) CacheManager.getItem(TestSystemInitializer.getTestContext(),
cacheName, "c");
assertTrue("Got null back for item 'b' from ordered test cache",
***************
*** 330,339 ****
ValidValue b = new ValidValue("bO", "bO");
ValidValue c = new ValidValue("cO", "cO");
! cm.addItem(TestSystemInitializer.getTestContext(), cacheName + "O",
b);
! cm.addItem(TestSystemInitializer.getTestContext(), cacheName + "O",
c);
! ValidValue retrieved = (ValidValue) cm.getItem(
TestSystemInitializer.getTestContext(),
cacheName + "O", "bO");
--- 330,339 ----
ValidValue b = new ValidValue("bO", "bO");
ValidValue c = new ValidValue("cO", "cO");
! CacheManager.addItem(TestSystemInitializer.getTestContext(), cacheName + "O",
b);
! CacheManager.addItem(TestSystemInitializer.getTestContext(), cacheName + "O",
c);
! ValidValue retrieved = (ValidValue) CacheManager.getItem(
TestSystemInitializer.getTestContext(),
cacheName + "O", "bO");
***************
*** 345,349 ****
! retrieved = (ValidValue) cm.getItem(TestSystemInitializer.getTestContext(),
cacheName + "O", "cO");
--- 345,349 ----
! retrieved = (ValidValue) CacheManager.getItem(TestSystemInitializer.getTestContext(),
cacheName + "O", "cO");
***************
*** 383,397 ****
try {
for (int i = 0; i < aCacheNames.length; i++) {
! cm.createCache(TestSystemInitializer.getTestContext(),
aCacheNames[i], true);
for (int j = 0; j < a.length; j++) {
! cm.addItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j], 10000);
! cm.getItemCount(TestSystemInitializer.getTestContext(),
aCacheNames[i]);
! cm.getItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j].getKey());
! cm.removeItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j]);
}
--- 383,397 ----
try {
for (int i = 0; i < aCacheNames.length; i++) {
! CacheManager.createCache(TestSystemInitializer.getTestContext(),
aCacheNames[i], true);
for (int j = 0; j < a.length; j++) {
! CacheManager.addItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j], 10000);
! CacheManager.getItemCount(TestSystemInitializer.getTestContext(),
aCacheNames[i]);
! CacheManager.getItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j].getKey());
! CacheManager.removeItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j]);
}
***************
*** 399,417 ****
for (int i = 0; i < aCacheNames.length; i++) {
! cm.clear(TestSystemInitializer.getTestContext(), aCacheNames[i]);
}
for (int i = 0; i < aCacheNames.length; i++) {
! cm.createCache(TestSystemInitializer.getTestContext(),
aCacheNames[i], true);
for (int j = 0; j < a.length; j++) {
! cm.addItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j], 10000);
! cm.getItemCount(TestSystemInitializer.getTestContext(),
aCacheNames[i]);
! cm.getItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j].getKey());
! cm.removeItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j]);
}
--- 399,417 ----
for (int i = 0; i < aCacheNames.length; i++) {
! CacheManager.clear(TestSystemInitializer.getTestContext(), aCacheNames[i]);
}
for (int i = 0; i < aCacheNames.length; i++) {
! CacheManager.createCache(TestSystemInitializer.getTestContext(),
aCacheNames[i], true);
for (int j = 0; j < a.length; j++) {
! CacheManager.addItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j], 10000);
! CacheManager.getItemCount(TestSystemInitializer.getTestContext(),
aCacheNames[i]);
! CacheManager.getItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j].getKey());
! CacheManager.removeItem(TestSystemInitializer.getTestContext(),
aCacheNames[i], a[j]);
}
***************
*** 419,423 ****
for (int i = 0; i < aCacheNames.length; i++) {
! cm.clear(TestSystemInitializer.getTestContext(), aCacheNames[i]);
}
} catch (java.util.ConcurrentModificationException ce) {
--- 419,423 ----
for (int i = 0; i < aCacheNames.length; i++) {
! CacheManager.clear(TestSystemInitializer.getTestContext(), aCacheNames[i]);
}
} catch (java.util.ConcurrentModificationException ce) {
***************
*** 440,444 ****
{
try {
! CacheSystem cs = cm.getCacheSystem(TestSystemInitializer.getTestContext());
/* Now test "related" caches - we create 2 caches, one listening to the */
--- 440,444 ----
{
try {
! CacheSystem cs = CacheManager.getCacheSystem(TestSystemInitializer.getTestContext());
/* Now test "related" caches - we create 2 caches, one listening to the */
***************
*** 489,493 ****
{
try {
! CacheSystem cs = cm.getCacheSystem(TestSystemInitializer.getTestContext());
--- 489,493 ----
{
try {
! CacheSystem cs = CacheManager.getCacheSystem(TestSystemInitializer.getTestContext());
***************
*** 504,508 ****
cs.addItem("secondCache" + cacheName, b);
! ValidValue returnValue1 = (ValidValue) cm.getItem(TestSystemInitializer.getTestContext(),
"secondCache" +
cacheName,
--- 504,508 ----
cs.addItem("secondCache" + cacheName, b);
! ValidValue returnValue1 = (ValidValue) CacheManager.getItem(TestSystemInitializer.getTestContext(),
"secondCache" +
cacheName,
***************
*** 520,524 ****
cs.put("firstCache" + cacheName, c);
! ValidValue returnValue = (ValidValue) cm.getItem(TestSystemInitializer.getTestContext(),
"secondCache" +
cacheName,
--- 520,524 ----
cs.put("firstCache" + cacheName, c);
! ValidValue returnValue = (ValidValue) CacheManager.getItem(TestSystemInitializer.getTestContext(),
"secondCache" +
cacheName,
***************
*** 531,535 ****
/* this should have cleared secondCache */
! returnValue = (ValidValue) cm.getItem(TestSystemInitializer.getTestContext(),
"secondCache" +
cacheName,
--- 531,535 ----
/* this should have cleared secondCache */
! returnValue = (ValidValue) CacheManager.getItem(TestSystemInitializer.getTestContext(),
"secondCache" +
cacheName,
***************
*** 555,561 ****
try {
ValidValue a = new ValidValue("a", "a");
! cm.addItem(TestSystemInitializer.getTestContext(), cacheName, a);
! ValidValue retrieved = (ValidValue) cm.getItem(TestSystemInitializer.getTestContext(),
cacheName, "a");
--- 555,561 ----
try {
ValidValue a = new ValidValue("a", "a");
! CacheManager.addItem(TestSystemInitializer.getTestContext(), cacheName, a);
! ValidValue retrieved = (ValidValue) CacheManager.getItem(TestSystemInitializer.getTestContext(),
cacheName, "a");
***************
*** 587,594 ****
try {
ValidValue a = new ValidValue("aO", "aO");
! cm.addItem(TestSystemInitializer.getTestContext(), cacheName + "O",
a);
! ValidValue retrieved = (ValidValue) cm.getItem(TestSystemInitializer.getTestContext(),
cacheName + "O", "aO");
--- 587,594 ----
try {
ValidValue a = new ValidValue("aO", "aO");
! CacheManager.addItem(TestSystemInitializer.getTestContext(), cacheName + "O",
a);
! ValidValue retrieved = (ValidValue) CacheManager.getItem(TestSystemInitializer.getTestContext(),
cacheName + "O", "aO");
More information about the cvs
mailing list