홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
40f50b96 1 parent e1fd4d7d

Reenable tests cases that were turned off 

Change-Id: I4211d0e5ed92e7e4e66e2a8391e917d43dcef97c
Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
...@@ -17,6 +17,7 @@ package org.onlab.onos.net.intent.impl; ...@@ -17,6 +17,7 @@ package org.onlab.onos.net.intent.impl;
17 17
18 import org.hamcrest.Matchers; 18 import org.hamcrest.Matchers;
19 //import org.junit.Test; 19 //import org.junit.Test;
20 +import org.junit.Test;
20 import org.onlab.onos.core.ApplicationId; 21 import org.onlab.onos.core.ApplicationId;
21 import org.onlab.onos.TestApplicationId; 22 import org.onlab.onos.TestApplicationId;
22 import org.onlab.onos.net.flow.TrafficSelector; 23 import org.onlab.onos.net.flow.TrafficSelector;
...@@ -68,7 +69,7 @@ public class TestPointToPointIntentCompiler { ...@@ -68,7 +69,7 @@ public class TestPointToPointIntentCompiler {
68 private PointToPointIntentCompiler makeCompiler(String[] hops) { 69 private PointToPointIntentCompiler makeCompiler(String[] hops) {
69 PointToPointIntentCompiler compiler = 70 PointToPointIntentCompiler compiler =
70 new PointToPointIntentCompiler(); 71 new PointToPointIntentCompiler();
71 -// compiler.topologyService = new IntentTestsMocks.MockPathService(hops); 72 + compiler.pathService = new IntentTestsMocks.MockPathService(hops);
72 return compiler; 73 return compiler;
73 } 74 }
74 75
...@@ -76,7 +77,7 @@ public class TestPointToPointIntentCompiler { ...@@ -76,7 +77,7 @@ public class TestPointToPointIntentCompiler {
76 /** 77 /**
77 * Tests a pair of devices in an 8 hop path, forward direction. 78 * Tests a pair of devices in an 8 hop path, forward direction.
78 */ 79 */
79 -// @Test 80 + @Test
80 public void testForwardPathCompilation() { 81 public void testForwardPathCompilation() {
81 82
82 PointToPointIntent intent = makeIntent("d1", "d8"); 83 PointToPointIntent intent = makeIntent("d1", "d8");
...@@ -109,7 +110,7 @@ public class TestPointToPointIntentCompiler { ...@@ -109,7 +110,7 @@ public class TestPointToPointIntentCompiler {
109 /** 110 /**
110 * Tests a pair of devices in an 8 hop path, forward direction. 111 * Tests a pair of devices in an 8 hop path, forward direction.
111 */ 112 */
112 -// @Test 113 + @Test
113 public void testReversePathCompilation() { 114 public void testReversePathCompilation() {
114 115
115 PointToPointIntent intent = makeIntent("d8", "d1"); 116 PointToPointIntent intent = makeIntent("d8", "d1");
......