From 239cb25348477b2519ce2536dd75c702fb4ba008 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 13 Jul 2012 15:35:00 +0400 Subject: [PATCH] Enable JsUnitTestReporter test since teamcity is fixed. --- .../k2js/test/config/JsUnitTestReporter.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java b/js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java index af5a8fe81a1..ebdcaed0a77 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java @@ -18,6 +18,8 @@ package org.jetbrains.k2js.test.config; import closurecompiler.internal.com.google.common.collect.Lists; import closurecompiler.internal.com.google.common.collect.Maps; +import junit.framework.Assert; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -104,26 +106,25 @@ public class JsUnitTestReporter { final TestSuite suite = new TestSuite("!"); Collection newFinishedTests = getNewFinishedTests(); for (String test : newFinishedTests) { - //TODO: uncomment this when teamcity test runner is fixed //NOTE: well, it is a test //noinspection JUnitTestCaseWithNoTests - //suite.addTest(new TestCase(test) { - // @Override - // protected void runTest() throws Throwable { - // Boolean result = getResult(getName()); - // if (!result) { - // Collection errorMessages = getErrors(getName()); - // StringBuilder sb = new StringBuilder(); - // for (String error : errorMessages) { - // sb.append(error); - // } - // eraseTestInfo(getName()); - // Assert.fail(sb.toString()); - // } - // eraseTestInfo(getName()); - // Assert.assertTrue(result); - // } - //}); + suite.addTest(new TestCase(test) { + @Override + protected void runTest() throws Throwable { + Boolean result = getResult(getName()); + if (!result) { + Collection errorMessages = getErrors(getName()); + StringBuilder sb = new StringBuilder(); + for (String error : errorMessages) { + sb.append(error); + } + eraseTestInfo(getName()); + Assert.fail(sb.toString()); + } + eraseTestInfo(getName()); + Assert.assertTrue(result); + } + }); } processedTests.addAll(newFinishedTests); return suite;