ZOOKEEPER-724. Forgot to add files

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@929564 13f79535-47bb-0310-9956-ffa450edef68

src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java

@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zookeeper;
+
+import org.apache.log4j.Logger;
+import org.junit.internal.runners.statements.InvokeMethod;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+/**
+ * The sole responsibility of this class is to print to the log when a test
+ * starts and when it finishes.
+ */
+public class JUnit4ZKTestRunner extends BlockJUnit4ClassRunner {
+    private static final Logger LOG = Logger.getLogger(JUnit4ZKTestRunner.class);
+
+    public JUnit4ZKTestRunner(Class<?> klass) throws InitializationError {
+        super(klass);
+    }
+
+    public class LoggedInvokeMethod extends InvokeMethod {
+        private String name;
+
+        public LoggedInvokeMethod(FrameworkMethod method, Object target) {
+            super(method, target);
+            name = method.getName();
+        }
+
+        @Override
+        public void evaluate() throws Throwable {
+            LOG.info("RUNNING TEST METHOD " + name);
+            try {
+                super.evaluate();
+            } catch (Throwable t) {
+                LOG.info("TEST METHOD FAILED " + name, t);
+                throw t;
+            }
+            LOG.info("FINISHED TEST METHOD " + name);
+        }
+    }
+
+    @Override
+    protected Statement methodInvoker(FrameworkMethod method, Object test) {
+        return new LoggedInvokeMethod(method, test);
+    }
+}

src/java/test/org/apache/zookeeper/ZKTestCase.java

@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zookeeper;
+
+import org.apache.log4j.Logger;
+import org.junit.Rule;
+import org.junit.rules.MethodRule;
+import org.junit.rules.TestWatchman;
+import org.junit.runner.RunWith;
+import org.junit.runners.model.FrameworkMethod;
+
+/**
+ * Base class for a non-parameterized ZK test.
+ *
+ * Basic utilities shared by all tests. Also logging of various events during
+ * the test execution (start/stop/success/failure/etc...)
+ */
+@RunWith(JUnit4ZKTestRunner.class)
+public class ZKTestCase {
+    private static final Logger LOG = Logger.getLogger(ZKTestCase.class);
+
+    private String testName;
+
+    protected String getTestName() {
+        return testName;
+    }
+
+    @Rule
+    public MethodRule watchman = new TestWatchman() {
+        @Override
+        public void starting(FrameworkMethod method) {
+            testName = method.getName();
+            LOG.info("STARTING " + testName);
+        }
+
+        @Override
+        public void finished(FrameworkMethod method) {
+            LOG.info("FINISHED " + testName);
+        }
+
+        @Override
+        public void succeeded(FrameworkMethod method) {
+            LOG.info("SUCCEEDED " + testName);
+        }
+
+        @Override
+        public void failed(Throwable e, FrameworkMethod method) {
+            LOG.info("FAILED " + testName, e);
+        }
+
+    };
+
+}