mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

bug 357660: JUnit failure: cdt.core testSharedDefaults

Browse source
This commit is contained in:
Andrew Gvozdev 2011-09-14 13:25:49 -04:00
parent ea1b3639c4
commit 5ce8c11602
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2010 Wind River Systems, Inc. and others. * Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -159,7 +159,7 @@ public class BaseTestCase extends TestCase {
if (statusLog.size() != fExpectedLoggedNonOK) { if (statusLog.size() != fExpectedLoggedNonOK) {
StringBuffer msg= new StringBuffer("Expected number (" + fExpectedLoggedNonOK + ") of "); StringBuffer msg= new StringBuffer("Expected number (" + fExpectedLoggedNonOK + ") of ");
msg.append("non-OK status objects differs from actual (" + statusLog.size() + ").\n"); msg.append("non-OK status objects in log differs from actual (" + statusLog.size() + ").\n");
Throwable cause= null; Throwable cause= null;
if (!statusLog.isEmpty()) { if (!statusLog.isEmpty()) {
for (IStatus status : statusLog) { for (IStatus status : statusLog) {

14
core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateEngine.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007 Symbian Software Limited and others. * Copyright (c) 2007, 2011 Symbian Software Limited and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@ package org.eclipse.cdt.core.tests.templateengine;
import org.eclipse.cdt.core.templateengine.TemplateEngine; import org.eclipse.cdt.core.templateengine.TemplateEngine;
import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
import org.eclipse.ui.PlatformUI;
/** /**
* Test the functionality of TemplateEngine. * Test the functionality of TemplateEngine.
@ -50,19 +49,14 @@ public class TestTemplateEngine extends BaseTestCase {
* check for non null SharedDefaults * check for non null SharedDefaults
* *
*/ */
public void testSharedDefaults(){ public void testSharedDefaults() {
// when running the testcase in head-less mode, the TestExtraPagesProvider class cannot be loaded,
// which is logged.
if (!PlatformUI.isWorkbenchRunning()) {
setExpectedNumberOfLoggedNonOKStatusObjects(1);
}
assertNotNull(TemplateEngine.getSharedDefaults()); assertNotNull(TemplateEngine.getSharedDefaults());
} }
/** /**
* check that the instace is created once(Singleton). * check that the instance is created once(Singleton).
*/ */
public void testSingleton(){ public void testSingleton() {
assertSame(templateEngine, TemplateEngine.getDefault()); assertSame(templateEngine, TemplateEngine.getDefault());
} }