Repository: apex-core Updated Branches: refs/heads/master e924284ee -> 0b518dea6
APEXCORE-531 - Enable System.out/System.err check for *Test Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/14cc547b Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/14cc547b Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/14cc547b Branch: refs/heads/master Commit: 14cc547be939c3dc15fd18c7aafe4d319d7b8c0f Parents: 0670eb3 Author: MalharJenkins <[email protected]> Authored: Tue Sep 13 14:06:32 2016 -0700 Committer: Vlad Rozov <[email protected]> Committed: Tue Sep 13 14:06:32 2016 -0700 ---------------------------------------------------------------------- engine/engine-checkstyle-suppressions.xml | 1 - .../test/java/com/datatorrent/stram/OutputUnifiedTest.java | 1 - .../src/test/java/com/datatorrent/stram/StreamCodecTest.java | 1 - .../stram/client/WebServicesVersionConversionTest.java | 7 +++++-- .../datatorrent/stram/moduleexperiment/InjectConfigTest.java | 4 ++-- .../com/datatorrent/stram/plan/StreamPersistanceTests.java | 3 +-- .../com/datatorrent/stram/plan/logical/LogicalPlanTest.java | 5 ----- .../com/datatorrent/stram/util/StablePriorityQueueTest.java | 2 -- 8 files changed, 8 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/14cc547b/engine/engine-checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/engine/engine-checkstyle-suppressions.xml b/engine/engine-checkstyle-suppressions.xml index 341add6..422afd3 100644 --- a/engine/engine-checkstyle-suppressions.xml +++ b/engine/engine-checkstyle-suppressions.xml @@ -25,7 +25,6 @@ <suppressions> <suppress checks="RegexpMultiline" files="ApexCli.java"/> - <suppress checks="RegexpMultiline" files=".*Tests?.java"/> <suppress checks="RegexpMultiline" files="VersionInfo.java"/> <suppress checks="NoFinalizer" files="FSRecoveryHandler.java"/> <suppress checks="AnnotationLocation" files="PhysicalPlan.java"/> http://git-wip-us.apache.org/repos/asf/apex-core/blob/14cc547b/engine/src/test/java/com/datatorrent/stram/OutputUnifiedTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/OutputUnifiedTest.java b/engine/src/test/java/com/datatorrent/stram/OutputUnifiedTest.java index e83c7e4..2c4812a 100644 --- a/engine/src/test/java/com/datatorrent/stram/OutputUnifiedTest.java +++ b/engine/src/test/java/com/datatorrent/stram/OutputUnifiedTest.java @@ -155,7 +155,6 @@ public class OutputUnifiedTest for (PTOperator ptOperator : ptOperators) { PTContainer container = ptOperator.getContainer(); StreamingContainerAgent agent = scm.getContainerAgent("container" + container.getId()); - System.out.println("Opsize " + container.getOperators().size()); List<OperatorDeployInfo> deployInfoList = agent.getDeployInfoList(container.getOperators()); Assert.assertEquals("Deploy info size", 1, deployInfoList.size()); Assert.assertEquals("Is output unified", deployInfoList.get(0).outputs.get(0).getAttributes().get(PortContext.IS_OUTPUT_UNIFIED), result); http://git-wip-us.apache.org/repos/asf/apex-core/blob/14cc547b/engine/src/test/java/com/datatorrent/stram/StreamCodecTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/StreamCodecTest.java b/engine/src/test/java/com/datatorrent/stram/StreamCodecTest.java index 3d3f7b0..cebeade 100644 --- a/engine/src/test/java/com/datatorrent/stram/StreamCodecTest.java +++ b/engine/src/test/java/com/datatorrent/stram/StreamCodecTest.java @@ -1189,7 +1189,6 @@ public class StreamCodecTest private OperatorDeployInfo getOperatorDeployInfo(PTOperator operator, String id, StreamingContainerManager scm) { String containerId = operator.getContainer().getExternalId(); - System.out.println("Container id " + containerId); List<OperatorDeployInfo> cdi = StreamingContainerManagerTest.getDeployInfo(scm.getContainerAgent(containerId)); http://git-wip-us.apache.org/repos/asf/apex-core/blob/14cc547b/engine/src/test/java/com/datatorrent/stram/client/WebServicesVersionConversionTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/client/WebServicesVersionConversionTest.java b/engine/src/test/java/com/datatorrent/stram/client/WebServicesVersionConversionTest.java index ef393cd..96f2f96 100644 --- a/engine/src/test/java/com/datatorrent/stram/client/WebServicesVersionConversionTest.java +++ b/engine/src/test/java/com/datatorrent/stram/client/WebServicesVersionConversionTest.java @@ -34,6 +34,8 @@ import org.junit.Test; import org.mortbay.jetty.Request; import org.mortbay.jetty.Server; import org.mortbay.jetty.handler.AbstractHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.WebResource; @@ -47,6 +49,8 @@ import com.datatorrent.stram.util.WebServicesClient; */ public class WebServicesVersionConversionTest { + private static final Logger logger = LoggerFactory.getLogger(WebServicesVersionConversionTest.class); + private int port = 12441; private Server server; @@ -55,8 +59,7 @@ public class WebServicesVersionConversionTest @Override public void handle(String target, HttpServletRequest request, HttpServletResponse response, int i) throws IOException, ServletException { - System.out.println("Target: " + target); - System.out.println("Request URL: " + request.getRequestURI()); + logger.debug("Target: {}. Request URL: {}" + target, request.getRequestURI()); response.setContentType(MediaType.APPLICATION_JSON); JSONObject json = new JSONObject(); try { http://git-wip-us.apache.org/repos/asf/apex-core/blob/14cc547b/engine/src/test/java/com/datatorrent/stram/moduleexperiment/InjectConfigTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/moduleexperiment/InjectConfigTest.java b/engine/src/test/java/com/datatorrent/stram/moduleexperiment/InjectConfigTest.java index 579c089..0730289 100644 --- a/engine/src/test/java/com/datatorrent/stram/moduleexperiment/InjectConfigTest.java +++ b/engine/src/test/java/com/datatorrent/stram/moduleexperiment/InjectConfigTest.java @@ -241,7 +241,7 @@ public class InjectConfigTest ObjectMapper mapper = new ObjectMapper(); Map<String, Object> properties = mapper.convertValue(testBean, Map.class); - System.out.println("testBean source: " + properties); + LOG.debug("testBean source: {}", properties); BeanUtilsTestBean testBean2 = new BeanUtilsTestBean(); testBean2.string2 = "testBean2"; @@ -267,7 +267,7 @@ public class InjectConfigTest // Assert.assertEquals("preserve existing value", "testBean2", testBean2.string2); // Assert.assertEquals("map property", "someValue", testBean2.mapProperty.get("someKey")); - // System.out.println("testBean cloned: " + mapper.convertValue(testBean2, Map.class)); + // LOG.debug("testBean cloned: {}", mapper.convertValue(testBean2, Map.class)); PropertyUtilsBean propertyUtilsBean = BeanUtilsBean.getInstance().getPropertyUtils(); //PropertyDescriptor pd = propertyUtilsBean.getPropertyDescriptor(testBean2, "mapProperty.someKey2"); http://git-wip-us.apache.org/repos/asf/apex-core/blob/14cc547b/engine/src/test/java/com/datatorrent/stram/plan/StreamPersistanceTests.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/plan/StreamPersistanceTests.java b/engine/src/test/java/com/datatorrent/stram/plan/StreamPersistanceTests.java index 2457786..4472743 100644 --- a/engine/src/test/java/com/datatorrent/stram/plan/StreamPersistanceTests.java +++ b/engine/src/test/java/com/datatorrent/stram/plan/StreamPersistanceTests.java @@ -828,8 +828,7 @@ public class StreamPersistanceTests @Override public void partitioned(Map partitions) { - // TODO Auto-generated method stub - System.out.println("Dynamic partitioning done...."); + logger.debug("Dynamic partitioning done...."); } } http://git-wip-us.apache.org/repos/asf/apex-core/blob/14cc547b/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java b/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java index d4c68aa..b3367cc 100644 --- a/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java +++ b/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java @@ -215,8 +215,6 @@ public class LogicalPlanTest ByteArrayOutputStream bos = new ByteArrayOutputStream(); LogicalPlan.write(dag, bos); - // System.out.println("serialized size: " + bos.toByteArray().length); - ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); LogicalPlan dagClone = LogicalPlan.read(bis); Assert.assertNotNull(dagClone); @@ -355,9 +353,6 @@ public class LogicalPlanTest Validator validator = factory.getValidator(); Set<ConstraintViolation<ValidationTestOperator>> constraintViolations = validator.validate(bean); - //for (ConstraintViolation<ValidationTestOperator> cv : constraintViolations) { - // System.out.println("validation error: " + cv); - //} Assert.assertEquals("" + constraintViolations,1, constraintViolations.size()); ConstraintViolation<ValidationTestOperator> cv = constraintViolations.iterator().next(); Assert.assertEquals("", bean.intField1, cv.getInvalidValue()); http://git-wip-us.apache.org/repos/asf/apex-core/blob/14cc547b/engine/src/test/java/com/datatorrent/stram/util/StablePriorityQueueTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/util/StablePriorityQueueTest.java b/engine/src/test/java/com/datatorrent/stram/util/StablePriorityQueueTest.java index aa7fe88..5bc70dc 100644 --- a/engine/src/test/java/com/datatorrent/stram/util/StablePriorityQueueTest.java +++ b/engine/src/test/java/com/datatorrent/stram/util/StablePriorityQueueTest.java @@ -65,7 +65,6 @@ public class StablePriorityQueueTest @Test public void testElement() { - System.out.println("element"); StablePriorityQueue<Integer> instance = new StablePriorityQueue<Integer>(1); Integer i = 10; instance.add(i); @@ -79,7 +78,6 @@ public class StablePriorityQueueTest @Test public void testOffer() { - System.out.println("offer"); StablePriorityQueue<Integer> instance = new StablePriorityQueue<Integer>(1); Integer i = 10; assertTrue(instance.offer(i));
