0
@@ -17,6 +17,10 @@ namespace tut {
0
       pool = server->connect();
0
       pool2 = server->connect();
0
     }
0
+		
0
+		ApplicationPoolPtr newPoolConnection() {
0
+			return server->connect();
0
+		}
0
   };
0
   
0
   DEFINE_TEST_GROUP(ApplicationPoolServer_ApplicationPoolTest);

0
@@ -358,10 +358,22 @@
0
   }
0
   
0
   TEST_METHOD(17) {
0
-		// MaxPerApp must be respected.
0
+		// MaxPerApp is respected.
0
     pool->setMax(3);
0
     pool->setMaxPerApp(1);
0
-		// TODO: how do we test this?
0
+		
0
+		// We connect to stub/rack while it already has an instance with
0
+		// 1 request in its queue. Assert that the pool doesn't spawn
0
+		// another instance.
0
+		Application::SessionPtr session1 = spawnRackApp(pool, "stub/rack");
0
+		Application::SessionPtr session2 = spawnRackApp(pool2, "stub/rack");
0
+		ensure_equals(pool->getCount(), 1u);
0
+		
0
+		// We connect to stub/wsgi. Assert that the pool spawns a new
0
+		// instance for this app.
0
+		ApplicationPoolPtr pool3(newPoolConnection());
0
+		Application::SessionPtr session3 = spawnWsgiApp(pool3, "stub/wsgi");
0
+		ensure_equals(pool->getCount(), 2u);
0
   }
0
   
0
   TEST_METHOD(18) {
0
@@ -438,7 +450,5 @@
0
     session.reset();
0
     thr.join();
0
   }
0
-	
0
-	// TODO: test maxIdleTime == 0
0
 
0
 #endif /* USE_TEMPLATE */

0
@@ -12,6 +12,10 @@ namespace tut {
0
       pool = ptr(new StandardApplicationPool("../bin/passenger-spawn-server"));
0
       pool2 = pool;
0
     }
0
+		
0
+		ApplicationPoolPtr newPoolConnection() {
0
+			return pool;
0
+		}
0
   };
0
 
0
   DEFINE_TEST_GROUP(StandardApplicationPoolTest);