From c4ceec145a253352a2cc6ad5abf7e1e78b8598fc Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Sat, 10 Sep 2016 13:01:16 -0700
Subject: [PATCH] Enable unit tests.

---
 cameraserver.gradle            | 7 +++----
 test/unit/CameraSourceTest.cpp | 6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cameraserver.gradle b/cameraserver.gradle
index 179d07b051..626f672df9 100644
--- a/cameraserver.gradle
+++ b/cameraserver.gradle
@@ -126,10 +126,9 @@ project(':native') {
 
     apply from: "${rootDir}/toolchains/native.gradle"
 
-    // TODO
-    //if (!project.hasProperty("withoutTests")) {
-    //    apply from: "${rootDir}/test/tests.gradle"
-    //}
+    if (!project.hasProperty("withoutTests")) {
+        apply from: "${rootDir}/test/tests.gradle"
+    }
 
     if (includeJava) {
         apply from: "${rootDir}/java/java.gradle"
diff --git a/test/unit/CameraSourceTest.cpp b/test/unit/CameraSourceTest.cpp
index 842e10cfcd..aebedb6d93 100644
--- a/test/unit/CameraSourceTest.cpp
+++ b/test/unit/CameraSourceTest.cpp
@@ -7,6 +7,8 @@
 
 #include "gtest/gtest.h"
 
+#include "cameraserver.h"
+
 namespace cs {
 
 class CameraSourceTest : public ::testing::Test {
@@ -15,8 +17,8 @@ class CameraSourceTest : public ::testing::Test {
   }
 };
 
-TEST_F(CameraSourceTest, CreateHTTP) {
-  auto source = CameraSource::CreateHTTP("http", "http://localhost:8000");
+TEST_F(CameraSourceTest, HTTPCamera) {
+  auto source = HTTPCamera("axis", "http://localhost:8000");
 }
 
 }  // namespace cs