diff --git a/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java b/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java index e8cba8c1..c6ab9580 100644 --- a/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java @@ -18,9 +18,8 @@ package org.hyperic.sigar.test; +import org.hyperic.sigar.Sigar; import org.hyperic.sigar.SigarException; -import org.hyperic.sigar.SigarProxy; -import org.hyperic.sigar.SigarProxyCache; import org.hyperic.sigar.SigarNotImplementedException; import org.hyperic.sigar.ptql.ProcessQuery; @@ -105,7 +104,7 @@ public class TestPTQL extends SigarTestCase { super(name); } - private int runQuery(SigarProxy proxy, String qs) + private int runQuery(Sigar sigar, String qs) throws MalformedQueryException, SigarException { @@ -118,7 +117,7 @@ public class TestPTQL extends SigarTestCase { throw e; } - ProcessFinder finder = new ProcessFinder(proxy); + ProcessFinder finder = new ProcessFinder(sigar); try { long[] pids = finder.find(query); @@ -136,27 +135,27 @@ public class TestPTQL extends SigarTestCase { } } - private void testOK(SigarProxy proxy) throws Exception { + private void testOK(Sigar sigar) throws Exception { for (int i=0; i= 0); + runQuery(sigar, qs) >= 0); } } - private void testReOK(SigarProxy proxy) throws Exception { + private void testReOK(Sigar sigar) throws Exception { for (int i=0; i= 0); + runQuery(sigar, qs) >= 0); } } - private void testMalformed(SigarProxy proxy) throws Exception { + private void testMalformed(Sigar sigar) throws Exception { for (int i=0; i