1 files changed, 52 insertions, 56 deletions

diff --git a/tests/src/com/android/loganalysis/UnitTests.java b/tests/src/com/android/loganalysis/UnitTests.java
index c50de34..70c4bd3 100644
--- a/tests/src/com/android/loganalysis/UnitTests.java
+++ b/tests/src/com/android/loganalysis/UnitTests.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2013 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
  *
@@ -55,67 +55,63 @@ import com.android.loganalysis.util.config.ArgsOptionParserTest;
 import com.android.loganalysis.util.config.OptionSetterTest;
 import com.android.loganalysis.util.config.OptionUpdateRuleTest;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * A test suite for all Trade Federation unit tests.
  * <p/>
  * All tests listed here should be self-contained, and should not require any external dependencies.
  */
-public class UnitTests extends TestSuite {
+@RunWith(Suite.class)
+@SuiteClasses({
+    // item
+    BatteryDischargeItemTest.class,
+    DvmLockSampleItemTest.class,
+    GenericItemTest.class,
+    InterruptItemTest.class,
+    MemInfoItemTest.class,
+    MonkeyLogItemTest.class,
+    ProcrankItemTest.class,
+    SmartMonkeyLogItemTest.class,
+    SystemPropsItemTest.class,
+    TopItemTest.class,
+    WakelockItemTest.class,
 
-    public UnitTests() {
-        super();
+    // parser
+    AbstractSectionParserTest.class,
+    AnrParserTest.class,
+    BugreportParserTest.class,
+    CompactMemInfoParserTest.class,
+    DmesgParserTest.class,
+    EventsLogParserTest.class,
+    DvmLockSampleParserTest.class,
+    InterruptParserTest.class,
+    JavaCrashParserTest.class,
+    KernelLogParserTest.class,
+    LogcatParserTest.class,
+    MemInfoParserTest.class,
+    MonkeyLogParserTest.class,
+    NativeCrashParserTest.class,
+    ProcessUsageParserTest.class,
+    ProcrankParserTest.class,
+    SystemPropsParserTest.class,
+    TopParserTest.class,
+    TracesParserTest.class,
+    WakelockParserTest.class,
 
-        // item
-        addTestSuite(BatteryDischargeItemTest.class);
-        addTestSuite(DvmLockSampleItemTest.class);
-        addTestSuite(GenericItemTest.class);
-        addTestSuite(InterruptItemTest.class);
-        addTestSuite(MemInfoItemTest.class);
-        addTestSuite(MonkeyLogItemTest.class);
-        addTestSuite(ProcrankItemTest.class);
-        addTestSuite(SmartMonkeyLogItemTest.class);
-        addTestSuite(SystemPropsItemTest.class);
-        addTestSuite(TopItemTest.class);
-        addTestSuite(WakelockItemTest.class);
+    // util
+    ArrayUtilTest.class,
+    LogPatternUtilTest.class,
+    LogTailUtilTest.class,
+    RegexTrieTest.class,
 
-        // parser
-        addTestSuite(AbstractSectionParserTest.class);
-        addTestSuite(AnrParserTest.class);
-        addTestSuite(BugreportParserTest.class);
-        addTestSuite(CompactMemInfoParserTest.class);
-        addTestSuite(DmesgParserTest.class);
-        addTestSuite(EventsLogParserTest.class);
-        addTestSuite(DvmLockSampleParserTest.class);
-        addTestSuite(InterruptParserTest.class);
-        addTestSuite(JavaCrashParserTest.class);
-        addTestSuite(KernelLogParserTest.class);
-        addTestSuite(LogcatParserTest.class);
-        addTestSuite(MemInfoParserTest.class);
-        addTestSuite(MonkeyLogParserTest.class);
-        addTestSuite(NativeCrashParserTest.class);
-        addTestSuite(ProcessUsageParserTest.class);
-        addTestSuite(ProcrankParserTest.class);
-        addTestSuite(SystemPropsParserTest.class);
-        addTestSuite(TopParserTest.class);
-        addTestSuite(TracesParserTest.class);
-        addTestSuite(WakelockParserTest.class);
-
-        // util
-        addTestSuite(ArrayUtilTest.class);
-        addTestSuite(LogPatternUtilTest.class);
-        addTestSuite(LogTailUtilTest.class);
-        addTestSuite(RegexTrieTest.class);
-
-        // util.config
-        addTestSuite(ArgsOptionParserTest.class);
-        addTestSuite(OptionSetterTest.class);
-        addTestSuite(OptionUpdateRuleTest.class);
-    }
-
-    public static Test suite() {
-        return new UnitTests();
-    }
-}
+    // util.config
+    ArgsOptionParserTest.class,
+    OptionSetterTest.class,
+    OptionUpdateRuleTest.class,
+})
+public class UnitTests {
+    // empty of purpose
+}
\ No newline at end of file