1 files changed, 162 insertions, 162 deletions
diff --git a/protocols/bundles/ch.ethz.iks.slp/runtimeTests/src/main/java/ch/ethz/iks/slp/test/TestActivator.java b/protocols/bundles/ch.ethz.iks.slp/runtimeTests/src/main/java/ch/ethz/iks/slp/test/TestActivator.java
index b75f27c21..c17c1e1a5 100644
--- a/protocols/bundles/ch.ethz.iks.slp/runtimeTests/src/main/java/ch/ethz/iks/slp/test/TestActivator.java
+++ b/protocols/bundles/ch.ethz.iks.slp/runtimeTests/src/main/java/ch/ethz/iks/slp/test/TestActivator.java
@@ -1,162 +1,162 @@
-/****************************************************************************
- * Copyright (c) 2005, 2010 Jan S. Rellermeyer, Systems Group,
- * Department of Computer Science, ETH Zurich and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Jan S. Rellermeyer - initial API and implementation
- *    Markus Alexander Kuppe - enhancements and bug fixes
- *
-*****************************************************************************/
-package ch.ethz.iks.slp.test;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-import junit.framework.TestFailure;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter;
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter;
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
-import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-import ch.ethz.iks.slp.Advertiser;
-import ch.ethz.iks.slp.Locator;
-
-public class TestActivator implements BundleActivator {
-	protected String outputDirectory = System.getProperty("test.result.output.dir", System.getProperty("user.dir"));
-	
-	static Advertiser advertiser;
-	static Locator locator;
-
-	public void start(BundleContext context) throws Exception {
-		ServiceReference advertiserRef = null;
-		try {
-			ServiceReference[] aSrefs = context
-						.getServiceReferences(Advertiser.class.getName(), null);
-			for (int i = 0; i < aSrefs.length; i++) {
-				ServiceReference serviceReference = aSrefs[i];
-				String version = (String) serviceReference.getBundle().getHeaders().get("Bundle-Version");
-				if(version.equals(System.getProperty("net.slp.versionUnderTest"))) {
-					advertiserRef = serviceReference;
-				} else { 
-					context.getService(serviceReference);
-				}
-			}
-			
-			advertiser = (Advertiser) context.getService(advertiserRef);
-			locator = (Locator) context.getService(context
-					.getServiceReference(Locator.class.getName()));
-		} catch (Exception e) {
-			System.exit(1);
-		}
-		
-		startTests();
-	}
-
-	protected void startTests() {
-		final TestSuite suite = new TestSuite();
-		final TestResult result = new TestResult();
-
-		final JUnitTest jUnitTest = new JUnitTest("ch.ethz.iks.slp.test");
-	    jUnitTest.setProperties(System.getProperties());
-	    
-	    // create the xml result formatter
-		final JUnitResultFormatter xmlResultFormatter = new XMLJUnitResultFormatter();
-		final File file = new File(outputDirectory, "TEST-ch.ethz.iks.slp.test" + ".xml");
-		try {
-			xmlResultFormatter.setOutput(new FileOutputStream(file));
-		} catch (FileNotFoundException e) {
-			// may never happen
-			e.printStackTrace();
-		}
-		result.addListener(xmlResultFormatter);
-		// create a result formatter that prints to the console
-		final JUnitResultFormatter consoleResultFormatter = new BriefJUnitResultFormatter();
-		consoleResultFormatter.setOutput(System.out);
-		result.addListener(consoleResultFormatter);
-
-		// add the actual tests to the test suite
-		Collection collection = new ArrayList();
-		collection.add(SelfDiscoveryTest.class);
-		for (Iterator iterator = collection.iterator(); iterator.hasNext();) {
-			Class clazz = (Class) iterator.next();
-			// run all methods starting with "test*"
-			Method[] methods = clazz.getMethods();
-			for (int i = 0; i < methods.length; i++) {
-				if (methods[i].getName().startsWith("test")) {
-					TestCase testCase;
-					try {
-						testCase = (TestCase) clazz.newInstance();
-						testCase.setName(methods[i].getName());
-						suite.addTest(testCase);
-					} catch (InstantiationException e) {
-						// may never happen
-						e.printStackTrace();
-					} catch (IllegalAccessException e) {
-						// may never happen
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-		
-		// prepare to run tests
-		final long start = System.currentTimeMillis();
-		xmlResultFormatter.startTestSuite(jUnitTest);
-		consoleResultFormatter.startTestSuite(jUnitTest);
-		
-	    // run tests
-		suite.run(result);
-	    
-		// write stats and close reultformatter
-		jUnitTest.setCounts(result.runCount(), result.failureCount(), result.errorCount());
-	    jUnitTest.setRunTime(System.currentTimeMillis() - start);
-		xmlResultFormatter.endTestSuite(jUnitTest);
-		consoleResultFormatter.endTestSuite(jUnitTest);
-		
-		// print success of failure
-		if (result.wasSuccessful()) {
-			System.exit(0);
-		} else {
-			if (result.errorCount() > 0) {
-				System.err.println("Errors:");
-				for (Enumeration errors = result.errors(); errors
-						.hasMoreElements();) {
-					TestFailure error = (TestFailure) errors.nextElement();
-					System.err.println(error.trace());
-				}
-			}
-			if (result.failureCount() > 0) {
-				System.err.println("Failures:");
-				for (Enumeration failures = result.failures(); failures
-						.hasMoreElements();) {
-					TestFailure failure = (TestFailure) failures.nextElement();
-					System.err.println(failure.trace());
-				}
-			}
-			System.exit(1);
-		};
-	}
-		
-	public void stop(BundleContext context) throws Exception {
-		advertiser = null;
-		locator = null;
-	}
-
-}
+/****************************************************************************
+ * Copyright (c) 2005, 2010 Jan S. Rellermeyer, Systems Group,
+ * Department of Computer Science, ETH Zurich and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Jan S. Rellermeyer - initial API and implementation
+ *    Markus Alexander Kuppe - enhancements and bug fixes
+ *
+*****************************************************************************/
+package ch.ethz.iks.slp.test;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+
+import junit.framework.TestCase;
+import junit.framework.TestFailure;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter;
+import org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter;
+import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
+import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+import ch.ethz.iks.slp.Advertiser;
+import ch.ethz.iks.slp.Locator;
+
+public class TestActivator implements BundleActivator {
+	protected String outputDirectory = System.getProperty("test.result.output.dir", System.getProperty("user.dir"));
+	
+	static Advertiser advertiser;
+	static Locator locator;
+
+	public void start(BundleContext context) throws Exception {
+		ServiceReference advertiserRef = null;
+		try {
+			ServiceReference[] aSrefs = context
+						.getServiceReferences(Advertiser.class.getName(), null);
+			for (int i = 0; i < aSrefs.length; i++) {
+				ServiceReference serviceReference = aSrefs[i];
+				String version = (String) serviceReference.getBundle().getHeaders().get("Bundle-Version");
+				if(version.equals(System.getProperty("net.slp.versionUnderTest"))) {
+					advertiserRef = serviceReference;
+				} else { 
+					context.getService(serviceReference);
+				}
+			}
+			
+			advertiser = (Advertiser) context.getService(advertiserRef);
+			locator = (Locator) context.getService(context
+					.getServiceReference(Locator.class.getName()));
+		} catch (Exception e) {
+			System.exit(1);
+		}
+		
+		startTests();
+	}
+
+	protected void startTests() {
+		final TestSuite suite = new TestSuite();
+		final TestResult result = new TestResult();
+
+		final JUnitTest jUnitTest = new JUnitTest("ch.ethz.iks.slp.test");
+	    jUnitTest.setProperties(System.getProperties());
+	    
+	    // create the xml result formatter
+		final JUnitResultFormatter xmlResultFormatter = new XMLJUnitResultFormatter();
+		final File file = new File(outputDirectory, "TEST-ch.ethz.iks.slp.test" + ".xml");
+		try {
+			xmlResultFormatter.setOutput(new FileOutputStream(file));
+		} catch (FileNotFoundException e) {
+			// may never happen
+			e.printStackTrace();
+		}
+		result.addListener(xmlResultFormatter);
+		// create a result formatter that prints to the console
+		final JUnitResultFormatter consoleResultFormatter = new BriefJUnitResultFormatter();
+		consoleResultFormatter.setOutput(System.out);
+		result.addListener(consoleResultFormatter);
+
+		// add the actual tests to the test suite
+		Collection collection = new ArrayList();
+		collection.add(SelfDiscoveryTest.class);
+		for (Iterator iterator = collection.iterator(); iterator.hasNext();) {
+			Class clazz = (Class) iterator.next();
+			// run all methods starting with "test*"
+			Method[] methods = clazz.getMethods();
+			for (int i = 0; i < methods.length; i++) {
+				if (methods[i].getName().startsWith("test")) {
+					TestCase testCase;
+					try {
+						testCase = (TestCase) clazz.newInstance();
+						testCase.setName(methods[i].getName());
+						suite.addTest(testCase);
+					} catch (InstantiationException e) {
+						// may never happen
+						e.printStackTrace();
+					} catch (IllegalAccessException e) {
+						// may never happen
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		
+		// prepare to run tests
+		final long start = System.currentTimeMillis();
+		xmlResultFormatter.startTestSuite(jUnitTest);
+		consoleResultFormatter.startTestSuite(jUnitTest);
+		
+	    // run tests
+		suite.run(result);
+	    
+		// write stats and close reultformatter
+		jUnitTest.setCounts(result.runCount(), result.failureCount(), result.errorCount());
+	    jUnitTest.setRunTime(System.currentTimeMillis() - start);
+		xmlResultFormatter.endTestSuite(jUnitTest);
+		consoleResultFormatter.endTestSuite(jUnitTest);
+		
+		// print success of failure
+		if (result.wasSuccessful()) {
+			System.exit(0);
+		} else {
+			if (result.errorCount() > 0) {
+				System.err.println("Errors:");
+				for (Enumeration errors = result.errors(); errors
+						.hasMoreElements();) {
+					TestFailure error = (TestFailure) errors.nextElement();
+					System.err.println(error.trace());
+				}
+			}
+			if (result.failureCount() > 0) {
+				System.err.println("Failures:");
+				for (Enumeration failures = result.failures(); failures
+						.hasMoreElements();) {
+					TestFailure failure = (TestFailure) failures.nextElement();
+					System.err.println(failure.trace());
+				}
+			}
+			System.exit(1);
+		};
+	}
+		
+	public void stop(BundleContext context) throws Exception {
+		advertiser = null;
+		locator = null;
+	}
+
+}