svn commit: r673295 - in /logging/log4cxx/trunk/src/test/cpp: Makefile.am helpers/threadtestcase.cpp

[ca...@apache.org]

Author: carnold
Date: Tue Jul  1 23:31:27 2008
New Revision: 673295

URL: http://svn.apache.org/viewvc?rev=673295&view=rev
Log:
LOGCXX-282: Add one missing test, remove reference to forthcoming test

Added:
    logging/log4cxx/trunk/src/test/cpp/helpers/threadtestcase.cpp
Modified:
    logging/log4cxx/trunk/src/test/cpp/Makefile.am

Modified: logging/log4cxx/trunk/src/test/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/Makefile.am?rev=673295&r1=673294&r2=673295&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/test/cpp/Makefile.am Tue Jul  1 23:31:27 2008
@@ -51,7 +51,6 @@
         helpers/charsetencodertestcase.cpp \
         helpers/cyclicbuffertestcase.cpp\
         helpers/datetimedateformattestcase.cpp \
-        helpers/filewatchdogtest.cpp \
         helpers/inetaddresstestcase.cpp \
         helpers/iso8601dateformattestcase.cpp \
         helpers/localechanger.cpp\

Added: logging/log4cxx/trunk/src/test/cpp/helpers/threadtestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/helpers/threadtestcase.cpp?rev=673295&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/helpers/threadtestcase.cpp (added)
+++ logging/log4cxx/trunk/src/test/cpp/helpers/threadtestcase.cpp Tue Jul  1 23:31:27 2008
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+#include <log4cxx/helpers/thread.h>
+#include "../insertwide.h"
+#include "../logunit.h"
+#include <apr_time.h>
+#include <log4cxx/helpers/exception.h>
+
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+
+
+/**
+   Unit test for Thread.
+   
+   */
+LOGUNIT_CLASS(ThreadTestCase) {
+  LOGUNIT_TEST_SUITE(ThreadTestCase);
+          LOGUNIT_TEST(testInterrupt);
+  LOGUNIT_TEST_SUITE_END();
+
+  public:
+  /**
+   * Start a thread that will wait for a minute, then interrupt it.
+   */
+  void testInterrupt() {
+    Thread thread1;
+    bool interrupted = false;
+    thread1.run(sleep, &interrupted);
+    apr_sleep(100000);
+    apr_time_t start = apr_time_now();
+    thread1.interrupt();
+    thread1.join();
+    LOGUNIT_ASSERT_EQUAL(true, interrupted);
+    apr_time_t elapsed = apr_time_now() - start;
+    LOGUNIT_ASSERT(elapsed < 1000000); 
+  }
+
+private:
+  static void* LOG4CXX_THREAD_FUNC sleep(apr_thread_t* thread, void* data) {
+      try {
+        Thread::sleep(60000);
+      } catch(InterruptedException& ex) {
+        *(reinterpret_cast<bool*>(data)) = true;
+      }
+      return NULL;
+  }
+
+};
+
+LOGUNIT_TEST_SUITE_REGISTRATION(ThreadTestCase);
+