SSDM-9374 : Deleting test lines looking for REINDEXING

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ReindexingSuccessfullyFinishedCondition.java

-/*
- * Copyright 2014 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
-
-/**
- * @author pkupczyk
- */
-public class ReindexingSuccessfullyFinishedCondition implements ILogMonitoringStopCondition
-{
-
-    private Class<?> reindexedClass;
-
-    public ReindexingSuccessfullyFinishedCondition(Class<?> reindexedClass)
-    {
-        this.reindexedClass = reindexedClass;
-    }
-
-    @Override
-    public boolean stopConditionFulfilled(ParsedLogEntry logEntry)
-    {
-        return "Full Text Index Updater".equals(logEntry.getThreadName())
-                && logEntry.getLogMessage().matches("OPERATION.FullTextIndexUpdater - REINDEX of \\d+ " + reindexedClass.getName() + "s took .*");
-    }
-
-}

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/gui/GeneralBatchImportGui.java

@@ -52,11 +52,6 @@ public class GeneralBatchImportGui implements Command<Void>
         console.setError("'General Batch Import' failed.");
         page.upload(file.getPath());
         console.waitFor("ms) register_or_update_samples_and_materials ");
-        for (int i = 0; i < file.getTypeCount(); i++)
-        {
-            console.startBuffering();
-            console.waitFor("REINDEX of");
-        }
         return null;
     }
 }

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AddEntitiesToMetaProjectRmi.java

@@ -106,7 +106,6 @@ public class AddEntitiesToMetaProjectRmi implements Command<Void>
         openbis.addToMetaproject(session,
                 new MetaprojectIdentifierId("/" + user.getName() + "/" + metaProject.getName()),
                 ids);
-        console.waitFor("REINDEX of", "took");
         return null;
     }
 }

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetRmi.java

@@ -80,8 +80,6 @@ public class CreateDataSetRmi implements Command<DataSet>
         if (false == external)
         {
             AbstractExternalData ds = etlService.tryGetDataSet(session, code);
-            console.waitFor("REINDEX of 1 ch.systemsx.cisd.openbis.generic.shared.dto.DataPEs [" 
-                    + ds.getId() + "] took");
         }
         return new DataSet()
             {

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialRmi.java

@@ -82,8 +82,6 @@ public class CreateMaterialRmi implements Command<Material>
         MaterialIdentifier identifier = new MaterialIdentifier(material.getCode(), type.getCode());
         ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material materialInfo 
                 = commonServer.getMaterialInfo(session, identifier);
-        console.waitFor("REINDEX of 1 ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPEs [" 
-                + materialInfo.getId() + "] took");
 
         return material;
     }

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleRmi.java

@@ -55,8 +55,6 @@ public class CreateSampleRmi implements Command<Sample>
         console.startBuffering();
         ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample registerdSample 
                 = genericServer.registerSample(session, convert(sample), new ArrayList<NewAttachment>());
-        console.waitFor("REINDEX of 1 ch.systemsx.cisd.openbis.generic.shared.dto.SamplePEs [" 
-                + registerdSample.getId() + "] took");
         return sample;
     }