fixup test scaling and diagnostics

Author: Myron Scott

common/pom.xml

@@ -109,7 +109,7 @@ Apache Ivy version: 2.2.0 20100923230623
         <groupId>org.terracotta</groupId>
         <artifactId>maven-forge-plugin</artifactId>
         <configuration>
-            <forkCount>2C</forkCount>
+            <forkCount>0.5C</forkCount>
             <reuseForks>false</reuseForks>
             <workingDirectory>${project.build.directory}/test-fork-${surefire.forkNumber}</workingDirectory>
             <argLine>-Xmx2G -Djava.awt.headless=true</argLine>

dso-l1/src/main/java/com/terracotta/diagnostic/DiagnosticClientEntityManager.java

@@ -41,7 +41,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
-import org.terracotta.connection.Diagnostics;
 import org.terracotta.entity.EntityClientEndpoint;
 import org.terracotta.entity.EntityMessage;
 import org.terracotta.entity.EntityResponse;
@@ -63,7 +62,10 @@ public DiagnosticClientEntityManager(ClientMessageChannel channel) {
 
   @Override
   public EntityClientEndpoint fetchEntity(EntityID entity, long version, ClientInstanceID entityDescriptor, MessageCodec<? extends EntityMessage, ? extends EntityResponse> codec, Runnable closeHook) throws EntityException {
-    Assert.assertEquals(Diagnostics.class.getName(), entity.getClassName());
+    if (!entity.getClassName().equals(com.terracotta.diagnostic.Diagnostics.class.getName())
+            && !entity.getClassName().equals(org.terracotta.connection.Diagnostics.class.getName())) {
+      throw new AssertionError("wrong entity type " + entity.getClassName());
+    }
     Assert.assertEquals("root", entity.getEntityName());
     return new EntityClientEndpointImpl(entity, version, EntityDescriptor.NULL_ID, this, new byte[] {}, codec, closeHook, null);
   }

dso-l1/src/main/java/com/terracotta/diagnostic/DiagnosticEntityClientService.java

@@ -25,7 +25,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.terracotta.connection.Diagnostics;
 import org.terracotta.connection.DiagnosticsConfig;
 import org.terracotta.entity.EntityClientEndpoint;
 import org.terracotta.entity.EntityClientService;
@@ -41,7 +40,7 @@ public class DiagnosticEntityClientService implements EntityClientService<Diagno
 
   @Override
   public boolean handlesEntityType(Class<Diagnostics> type) {
-    return type.isAssignableFrom(org.terracotta.connection.Diagnostics.class);
+    return type.isAssignableFrom(com.terracotta.diagnostic.Diagnostics.class);
   }
 
   @Override

dso-l2/pom.xml

@@ -139,7 +139,7 @@
         <groupId>org.terracotta</groupId>
         <artifactId>maven-forge-plugin</artifactId>
         <configuration>
-            <forkCount>1C</forkCount>
+            <forkCount>0.5C</forkCount>
             <reuseForks>false</reuseForks>
             <workingDirectory>${project.build.directory}/test-fork-${surefire.forkNumber}</workingDirectory>
             <argLine>-Djava.awt.headless=true</argLine>