package scoutmgr.server.test.util;

import com.google.inject.Module;
import java.util.ArrayList;
import java.util.Collections;
import javax.transaction.TransactionSynchronizationRegistry;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeSuite;

public abstract class AbstractGlassFishTest
  extends AbstractScoutmgrEntityTest
{
  @BeforeSuite
  public final void setUpServices()
    throws Exception
  {
    AppServer.setUpAppServer();
  }

  @AfterSuite
  public final void tearDownServices()
  {
    AppServer.tearDownAppServer();
  }

  @BeforeMethod
  public void preTest()
    throws Exception
  {
    super.preTest();
    s( TransactionSynchronizationRegistry.class ).putResource( "ReplicationActive", "Test" );
    usesTransaction();
  }

  @Override
  protected Module[] getModules()
  {
    final ArrayList<Module> modules = new ArrayList<>();
    Collections.addAll( modules, super.getModules() );
    modules.add( new MyprojectIntegrationModule() );
    return modules.toArray( new Module[ modules.size() ] );
  }

  protected final String getServiceURL( final String service )
  {
    return AppServer.getServiceURL( service );
  }

  protected final String getSiteURL()
  {
    return AppServer.getSiteURL();
  }

  @Override
  protected Module[] getModules()
  {
    final ArrayList<Module> modules = new ArrayList<>();
    Collections.addAll( modules, super.getModules() );
    modules.add( new ScoutmgrIntegrationModule() );
    return modules.toArray( new Module[ modules.size() ] );
  }
}

@@ -999,17 +999,16 @@
 new 
-Myproject
+Scoutmgr
 Inte
@@ -1248,24 +1248,24 @@
 teURL()%0A  %7B%0A
+
     return A
@@ -1294,286 +1294,7 @@
 %0A  %7D
-%0A%0A  @Override%0A  protected Module%5B%5D getModules()%0A  %7B%0A    final ArrayList%3CModule%3E modules = new ArrayList%3C%3E();%0A    Collections.addAll( modules, super.getModules() );%0A    modules.add( new ScoutmgrIntegrationModule() );%0A    return modules.toArray( new Module%5B modules.size() %5D );%0A  %7D
 %0A%7D%0A

Fix merge mistake