Author: nzamosenchuk Date: 2009-12-08 09:47:25 -0500 (Tue, 08 Dec 2009) New Revision: 948 Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/lab/cluster/TestQueryAssert.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/lab/cluster/TestQueryPrepare.java Log: EXOJCR-291: Fixed cluster query tests. Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/lab/cluster/TestQueryAssert.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/lab/cluster/TestQueryAssert.java 2009-12-08 14:38:08 UTC (rev 947) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/lab/cluster/TestQueryAssert.java 2009-12-08 14:47:25 UTC (rev 948) @@ -46,11 +46,9 @@ { public void testAssert() throws RepositoryException, IOException { - System.out.println("Press enter to start asserting...."); + System.out.println("Start asserting...."); + int datum = System.in.read(); - BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); - String sample = br.readLine(); - Node doc1 = root.getNode("document1"); Node doc2 = root.getNode("document2"); @@ -70,8 +68,16 @@ long xpathsize = xres.getNodes().getSize(); assertEquals(2, xpathsize); checkResult(xres, new Node[]{doc1, doc2}); - System.out.println("Done! Press enter to finish..."); - br.readLine(); + System.out.println("Done!"); + try + { + Thread.sleep(1024*1024*1024); + } + catch (InterruptedException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } } protected void checkResult(QueryResult result, Node[] nodes) throws RepositoryException Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/lab/cluster/TestQueryPrepare.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/lab/cluster/TestQueryPrepare.java 2009-12-08 14:38:08 UTC (rev 947) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/lab/cluster/TestQueryPrepare.java 2009-12-08 14:47:25 UTC (rev 948) @@ -39,11 +39,8 @@ { public void testPrepareNodes() throws RepositoryException, IOException { - System.out.println("Press enter to start preparing...."); + System.out.println("preparing...."); - BufferedReader br = new BufferedReader(new InputStreamReader(System.in) ); - String sample = br.readLine(); - root.addNode("simplenode", "nt:unstructured"); Node doc1 = root.addNode("document1", "nt:file"); @@ -59,10 +56,16 @@ cont.setProperty("jcr:lastModified", Calendar.getInstance()); cont.setProperty("jcr:encoding", "UTF-8"); cont.setProperty("jcr:data", new ByteArrayInputStream("".getBytes())); - session.save(); - - System.out.println("Done! Press enter to finish..."); - br.readLine(); + System.out.println("Done!"); + try + { + Thread.sleep(1024*1024*1024); + } + catch (InterruptedException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }