From 859983049030db60a5c198dcd97bdc71cd837e63 Mon Sep 17 00:00:00 2001
From: Jonathan Leitschuh <jlleitschuh@wpi.edu>
Date: Thu, 22 May 2014 15:42:56 -0400
Subject: [PATCH] Added in LiveWindow initialization code, and the network
 tables dependecies for WPILibJ. - Fredric Silberberg

Change-Id: I776096385dc13db64c9eb2adbe0397b632057adf
---
 wpilibj/wpilibJavaIntegrationTests/pom.xml            | 11 +++++++++++
 .../edu/wpi/first/wpilibj/test/AbstractComsSetup.java |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/wpilibj/wpilibJavaIntegrationTests/pom.xml b/wpilibj/wpilibJavaIntegrationTests/pom.xml
index 5c55e1ebc7..01425db634 100644
--- a/wpilibj/wpilibJavaIntegrationTests/pom.xml
+++ b/wpilibj/wpilibJavaIntegrationTests/pom.xml
@@ -14,6 +14,11 @@
 			<artifactId>wpilibJavaFinal</artifactId>
 			<version>0.1.0-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
+			<artifactId>NetworkTables</artifactId>
+			<version>0.1.0-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -77,6 +82,12 @@
 									<version>0.1.0-SNAPSHOT</version>
 									<type>jar</type>
 								</artifactItem>
+								<artifactItem>
+									<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
+									<artifactId>NetworkTables</artifactId>
+									<version>0.1.0-SNAPSHOT</version>
+									<type>jar</type>
+								</artifactItem>
 								<artifactItem>
 									<groupId>junit</groupId>
 									<artifactId>junit</artifactId>
diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/AbstractComsSetup.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/AbstractComsSetup.java
index 79fb47a215..9dedb79b3b 100644
--- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/AbstractComsSetup.java
+++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/AbstractComsSetup.java
@@ -10,6 +10,7 @@ import org.junit.BeforeClass;
 
 import edu.wpi.first.wpilibj.DriverStation;
 import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary;
+import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 
 /**
  * This class serves as a superclass for all tests that involve the hardware on
@@ -41,6 +42,7 @@ public abstract class AbstractComsSetup {
 			FRCNetworkCommunicationsLibrary.FRCNetworkCommunicationReserve();
 			FRCNetworkCommunicationsLibrary
 					.FRCNetworkCommunicationObserveUserProgramStarting();
+			LiveWindow.setEnabled(false);
 			System.out.println("Started coms");
 
 			// Wait until the robot is enabled before starting the tests