Author: mir
Date: Thu Sep 16 15:19:01 2010
New Revision: 997785
URL: http://svn.apache.org/viewvc?rev=997785&view=rev
Log:
LockableMGraphWrapperForTesting now only test if the relevant methods are locked
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java?rev=997785&r1=997784&r2=997785&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
Thu Sep 16 15:19:01 2010
@@ -18,20 +18,15 @@
*/
package org.apache.clerezza.rdf.core.test;
-import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.NonLiteral;
import org.apache.clerezza.rdf.core.Resource;
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
-import org.apache.clerezza.rdf.core.event.FilterTriple;
-import org.apache.clerezza.rdf.core.event.GraphListener;
+import org.apache.clerezza.rdf.core.access.LockableMGraphWrapper;
/**
* Wrappes an MGraph as a LockableMGraph. If a method is called that reads
@@ -40,11 +35,10 @@ import org.apache.clerezza.rdf.core.even
*
* @author rbn, mir
*/
-public class LockableMGraphWrapperForTesting implements LockableMGraph {
+public class LockableMGraphWrapperForTesting extends LockableMGraphWrapper {
- private final ReentrantReadWriteLock lock = new
ReentrantReadWriteLock();
+ private final ReentrantReadWriteLock lock = (ReentrantReadWriteLock)
getLock();
private final Lock readLock = lock.readLock();
- private final Lock writeLock = lock.writeLock();
private final MGraph wrapped;
/**
@@ -53,26 +47,11 @@ public class LockableMGraphWrapperForTes
* @param providedMGraph a non-lockable mgraph
*/
public LockableMGraphWrapperForTesting(final MGraph providedMGraph) {
+ super(providedMGraph);
this.wrapped = providedMGraph;
}
@Override
- public ReadWriteLock getLock() {
- return lock;
- }
-
- @Override
- public Graph getGraph() {
- LockChecker.checkIfReadLocked(lock);
- readLock.lock();
- try {
- return wrapped.getGraph();
- } finally {
- readLock.unlock();
- }
- }
-
- @Override
public Iterator<Triple> filter(NonLiteral subject, UriRef predicate,
Resource object) {
LockChecker.checkIfReadLocked(lock);
readLock.lock();
@@ -84,40 +63,6 @@ public class LockableMGraphWrapperForTes
}
@Override
- public int size() {
- LockChecker.checkIfReadLocked(lock);
- readLock.lock();
- try {
- return wrapped.size();
- } finally {
- readLock.unlock();
- }
- }
-
- @Override
- public boolean isEmpty() {
- LockChecker.checkIfReadLocked(lock);
- readLock.lock();
- try {
- return wrapped.isEmpty();
- } finally {
- readLock.unlock();
- }
- }
-
- @Override
- @SuppressWarnings("element-type-mismatch")
- public boolean contains(Object o) {
- LockChecker.checkIfReadLocked(lock);
- readLock.lock();
- try {
- return wrapped.contains(o);
- } finally {
- readLock.unlock();
- }
- }
-
- @Override
public Iterator<Triple> iterator() {
LockChecker.checkIfReadLocked(lock);
readLock.lock();
@@ -128,118 +73,4 @@ public class LockableMGraphWrapperForTes
}
}
- @Override
- public Object[] toArray() {
- LockChecker.checkIfReadLocked(lock);
- readLock.lock();
- try {
- return wrapped.toArray();
- } finally {
- readLock.unlock();
- }
- }
-
- @Override
- public <T> T[] toArray(T[] a) {
- LockChecker.checkIfReadLocked(lock);
- readLock.lock();
- try {
- return wrapped.toArray(a);
- } finally {
- readLock.unlock();
- }
- }
-
- @Override
- public boolean containsAll(Collection<?> c) {
- LockChecker.checkIfReadLocked(lock);
- readLock.lock();
- try {
- return wrapped.containsAll(c);
- } finally {
- readLock.unlock();
- }
- }
-
- @Override
- public boolean add(Triple e) {
- LockChecker.checkIfWriteLocked(lock);
- writeLock.lock();
- try {
- return wrapped.add(e);
- } finally {
- writeLock.unlock();
- }
- }
-
- @Override
- public boolean remove(Object o) {
- LockChecker.checkIfWriteLocked(lock);
- writeLock.lock();
- try {
- return wrapped.remove(o);
- } finally {
- writeLock.unlock();
- }
- }
-
- @Override
- public boolean addAll(Collection<? extends Triple> c) {
- LockChecker.checkIfWriteLocked(lock);
- writeLock.lock();
- try {
- return wrapped.addAll(c);
- } finally {
- writeLock.unlock();
- }
- }
-
- @Override
- public boolean removeAll(Collection<?> c) {
- LockChecker.checkIfWriteLocked(lock);
- writeLock.lock();
- try {
- return wrapped.removeAll(c);
- } finally {
- writeLock.unlock();
- }
- }
-
- @Override
- public boolean retainAll(Collection<?> c) {
- LockChecker.checkIfWriteLocked(lock);
- writeLock.lock();
- try {
- return wrapped.retainAll(c);
- } finally {
- writeLock.unlock();
- }
- }
-
- @Override
- public void clear() {
- LockChecker.checkIfWriteLocked(lock);
- writeLock.lock();
- try {
- wrapped.clear();
- } finally {
- writeLock.unlock();
- }
- }
-
- @Override
- public void addGraphListener(GraphListener listener, FilterTriple
filter, long delay) {
- wrapped.addGraphListener(listener, filter, delay);
- }
-
- @Override
- public void addGraphListener(GraphListener listener, FilterTriple
filter) {
- wrapped.addGraphListener(listener, filter);
- }
-
- @Override
- public void removeGraphListener(GraphListener listener) {
- wrapped.removeGraphListener(listener);
- }
-
}
