[Esbox-commits] r2130 - branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-09-09 22:54:34 +0300 (Wed, 09 Sep 2009)
New Revision: 2130

Modified:
   branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxFacade.java
Log:
Update some tests for Fremantle.

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxFacade.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxFacade.java	2009-09-09 19:35:51 UTC (rev 2129)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxFacade.java	2009-09-09 19:54:34 UTC (rev 2130)
@@ -109,36 +109,16 @@
 		cputranspExpected
 				.add("/scratchbox/devkits/cputransp/bin/qemu-arm-0.8.2-sb2");
 		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-armeb-0.8.1-sb2");
-		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-armeb-0.8.2-sb2");
-		cputranspExpected
 				.add("/scratchbox/devkits/cputransp/bin/qemu-i386-0.7.0-sb2");
 		cputranspExpected
 				.add("/scratchbox/devkits/cputransp/bin/qemu-i386-0.8.1-sb2");
 		cputranspExpected
 				.add("/scratchbox/devkits/cputransp/bin/qemu-i386-0.8.2-sb2");
 		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-mips-0.8.1-sb2");
+				.add("/scratchbox/devkits/qemu/bin/qemu-arm-sb");
 		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-mips-0.8.2-sb2");
+				.add("/scratchbox/devkits/qemu/bin/qemu-i386-sb");
 		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-mipsel-0.8.1-sb2");
-		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-mipsel-0.8.2-sb2");
-		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-ppc-0.7.0-sb2");
-		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-ppc-0.8.0-m2");
-		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-ppc-0.8.1-sb2");
-		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-ppc-0.8.2-sb2");
-		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-sparc-0.7.0-sb2");
-		cputranspExpected
-				.add("/scratchbox/devkits/cputransp/bin/qemu-sparc-0.8.1-sb2");
-		cputranspExpected
 				.add("/scratchbox/devkits/cputransp/bin/qemu-sparc-0.8.2-sb2");
 		cputranspExpected.add("/scratchbox/devkits/cputransp/bin/sbrsh");
 
@@ -279,7 +259,7 @@
 		List<String> compilers = getCompilers();
 		String compiler = "host-gcc";
 		for (String c : compilers) {
-			if (c.matches("cs2005.*arm")) {
+			if (c.matches("cs200[5-9].*arm.*")) {
 				compiler = c;
 				break;
 			}
@@ -287,7 +267,7 @@
 		List<String> cputransps = getCputransps();
 		String cputransp = "sbrsh";
 		for (String c : cputransps) {
-			if (c.matches("qemu.*arm.*sb2")) {
+			if (c.matches("qemu.*arm.*sb.*")) {
 				cputransp = c;
 				break;
 			}
@@ -296,7 +276,7 @@
 		sdk.createTarget(
 				TARGET_NAME,
 				compiler, 
-				"doctools:cputransp",
+				"doctools:perl",
 				cputransp);
 
 		List<String> targetsAvailable;//ScratchboxFacade.getInstance().getTargets(sdk);
@@ -404,53 +384,4 @@
 		// fail("Not yet implemented");
 	}
 
-	/**
-	 * Test method for
-	 * {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#showTarget(java.lang.String)}.
-	 * 
-	 * @throws ESboxException
-	 */
-	/* 
-	@Test
-	public void testShowTarget() throws ESboxException {
-		final String TARGET_ARMEL = "SDK_ARMEL";
-
-		ScratchboxTarget target = ScratchboxFacade.getInstance().showTarget(sdk,
-				TARGET_ARMEL);
-
-		assertEquals(TARGET_ARMEL, target.getName());
-		assertEquals("cs2005q3.2-glibc-arm", target.getCompiler());
-		assertEquals("/scratchbox/devkits/cputransp/bin/qemu-arm-0.8.2-sb2",
-				target.getCputransp());
-
-		List<String> devkitsExpected = new ArrayList<String>();
-		devkitsExpected.add("perl");
-		devkitsExpected.add("maemo3-tools");
-		devkitsExpected.add("doctools");
-		devkitsExpected.add("debian-sarge");
-		devkitsExpected.add("maemo3-debian");
-		devkitsExpected.add("cputransp");
-
-		List<String> devkitsActual = target.getDevkits();
-		for (String devkit : devkitsActual) {
-			assertTrue(devkitsExpected.contains(devkit));
-		}
-	}
-	*/
-
-	/**
-	 * Test method for
-	 * {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#execSimpleCommand(java.lang.String)}.
-	 * 
-	 * @throws ESboxException
-	 */
-//	@Test
-//	public void testExecSimpleCommand() throws ESboxException {
-//		ISDKTarget sdkTarget = sdk.getSDKTargets()[0];
-//		List<String> currentTarget = ScratchboxFacade.getInstance().execSimpleCommand(
-//				sdkTarget, 
-//				CommandLineArguments.createFromVarArgs("sb-conf", "current"));
-//		assertEquals(sdkTarget.getName(), currentTarget.get(0));
-//	}
-
 }