conflict_resolution
stringlengths
27
16k
<<<<<<< private final HttpProperties httpProperties; private final ConfigurableServletWebServerFactory serverFactory; ======= >>>>>>> private final ConfigurableServletWebServerFactory serverFactory; <<<<<<< public ServletWebServerInitializer(ServerProperties serverProperties, HttpProperties httpProperties, ...
<<<<<<< // TODO: Revert cache version before publishing app update in cache.json private static final int BUNDLED_CACHE_VERSION = 1; ======= // TODO: Revert cache version before publishing app update (same goes for cache.json) private static final int BUNDLED_CACHE_VERSION = 3; >>>>>>> private st...
<<<<<<< import me.devsaki.hentoid.database.DatabaseMaintenance; ======= import me.devsaki.hentoid.database.HentoidDB; import me.devsaki.hentoid.database.domains.Content; >>>>>>> import me.devsaki.hentoid.database.HentoidDB; import me.devsaki.hentoid.database.domains.Content; import me.devsaki.hentoid.database.Databa...
<<<<<<< private static Content importJson(@NonNull Context context, @NonNull DocumentFile folder) throws JSONParseException { //DocumentFile json = folder.findFile(Consts.JSON_FILE_NAME_V2); // (v2) JSON file format DocumentFile json = FileHelper.findFile(context, folder, Consts.JSON_FILE_NAME_V2); ...
<<<<<<< List<ContentItem> content = Stream.of(result).map(c -> new ContentItem(c, touchHelper, ContentItem.ViewType.ERRORS, null)).toList(); FastAdapterDiffUtil.INSTANCE.set(itemAdapter, content); new Handler().postDelayed(this::differEndCallback, 150); ======= List<ContentItem> conten...
<<<<<<< ======= import javax.annotation.Nonnull; import io.reactivex.Completable; >>>>>>> import javax.annotation.Nonnull; import io.reactivex.Completable; <<<<<<< import static com.annimon.stream.Collectors.toList; ======= import static android.os.Build.VERSION_CODES.LOLLIPOP; >>>>>>> import static android.os...
<<<<<<< private List<ImageFile> images = new ArrayList<>(); // To preload images before they appear on screen with CustomSubsamplingScaleImageView ======= // To preload images before they appear on screen with SubsamplingScaleImageView >>>>>>> // To preload images before they appear on screen with C...
<<<<<<< import java.util.Date; ======= import java.util.HashMap; import java.util.HashSet; >>>>>>> import java.util.Date; import java.util.HashMap; import java.util.HashSet; <<<<<<< import me.devsaki.hentoid.adapters.ContentAdapter.ContentsWipedListener; import me.devsaki.hentoid.collection.CollectionAccessor; impo...
<<<<<<< ======= import android.os.Build; import android.os.Environment; >>>>>>> import android.os.Build; import android.os.Environment; <<<<<<< static InputStream getInputStream(@NonNull final File target) throws IOException { return FileUtils.openInputStream(target); } static InputStream getIn...
<<<<<<< import me.devsaki.hentoid.database.enums.Site; import me.devsaki.hentoid.parser.HitomiParser; import me.devsaki.hentoid.util.AndroidHelper; import me.devsaki.hentoid.util.ConstantsPreferences; ======= import me.devsaki.hentoid.enums.Site; import me.devsaki.hentoid.parsers.HitomiParser; >>>>>>> import me.devs...
<<<<<<< public ContentAdapter(Context cxt, ItemSelectListener listener, Comparator<Content> comparator) { this.cxt = cxt; ======= public ContentAdapter(Context context, List<Content> contents, ItemSelectListener listener) { this.context = context; this.contents = contents; >>>>>>> ...
<<<<<<< import android.os.Build; ======= import android.content.pm.PackageManager; >>>>>>> import android.os.Build; import android.content.pm.PackageManager; <<<<<<< Timber.d("Content item(s) count: %s", db.getContentCount()); ======= LogHelper.d(TAG, "Content item(s) count: " + db.getContentCoun...
<<<<<<< Timber.d("Opening: %s from: %s", content.getTitle(), getContentDownloadDir(cxt, content)); ======= // File dir = getContentDownloadDir(cxt, content); String settingDir = getRoot(); File dir = new File(settingDir, content.getStorageFolder()); LogHelper.d(TAG, "O...
<<<<<<< /** * Get the map id * * @return the map id */ ======= public MapMeta() {} public MapMeta(int id) { this.mapId = id; } >>>>>>> public MapMeta() {} public MapMeta(int id) { this.mapId = id; } /** * Get the map id * * @retur...
<<<<<<< public StatementInterface getStatement(int position); /** * Check if there is a statement at the given position. * * @param position * Index of statement * @return Whether or not there is a statement at the given position. */ public boolean hasStatement(int position); ======= publ...
<<<<<<< public TestChromosome() { //#TODO steenbuck similar logic is repeated in TestSuiteChromosomeFactory if (test_factory == null) { test_factory = DefaultTestFactory.getInstance(); } } ======= >>>>>>> <<<<<<< if (getLastExecutionResult() != null) { c.setLastExecutionResult(this.lastExecutionRe...
<<<<<<< ======= import java.util.List; >>>>>>> import java.util.List; <<<<<<< ArrayReference otherArray = new ArrayReference(newTestCase, type, array_length); otherArray.setArrayLength(array_length); newTestCase.getStatement(getStPosition() + offset).setRetval(otherArray); ======= ...
<<<<<<< private static Logger logger = LoggerFactory.getLogger(VariableReferenceImpl.class); ======= private int distance = 0; protected static Logger logger = LoggerFactory.getLogger(VariableReferenceImpl.class); >>>>>>> private int distance = 0; private static Logger logger = LoggerFactory.getLogger(Variabl...
<<<<<<< CONCURRENCY, LCSAJ, DEFUSE, PATH, BRANCH, MUTATION, COMP_LCSAJ_BRANCH, STATEMENT, ANALYZE, DATA ======= CONCURRENCY, LCSAJ, DEFUSE, ALLDEFS, PATH, BRANCH, MUTATION, COMP_LCSAJ_BRANCH, STATEMENT, ANALYZE >>>>>>> CONCURRENCY, LCSAJ, DEFUSE, ALLDEFS, PATH, BRANCH, MUTATION, COMP_LCSAJ_BRANCH, STATEMENT, A...
<<<<<<< protected StatementInterface statement; /** Assertion Comment */ protected String comment; ======= protected Statement statement; >>>>>>> protected Statement statement; /** Assertion Comment */ protected String comment;
<<<<<<< import org.evosuite.ga.metaheuristics.mosa.DynaMOSA; import org.evosuite.ga.metaheuristics.OnePlusOneEA; import org.evosuite.ga.metaheuristics.StandardGA; import org.evosuite.ga.metaheuristics.MonotonicGA; ======= >>>>>>> import org.evosuite.ga.metaheuristics.mosa.DynaMOSA; <<<<<<< case DYNAMOSA: ...
<<<<<<< import org.evosuite.ga.metaheuristics.mosa.DynaMOSA; ======= import org.evosuite.ga.metaheuristics.mulambda.MuLambdaEA; import org.evosuite.ga.metaheuristics.mulambda.MuPlusLambdaEA; import org.evosuite.ga.metaheuristics.mulambda.OnePlusLambdaLambdaGA; import org.evosuite.ga.metaheuristics.mulambda.OnePlusOne...
<<<<<<< import org.evosuite.ga.localsearch.BranchCoverageMap; import org.evosuite.ga.metaheuristics.GeneticAlgorithm; import org.evosuite.ga.metaheuristics.MuPlusLambdaGA; import org.evosuite.ga.metaheuristics.NSGAII; import org.evosuite.ga.metaheuristics.OnePlusOneEA; import org.evosuite.ga.metaheuristics.RandomSearch...
<<<<<<< /** */ ======= >>>>>>>
<<<<<<< import java.util.Set; import org.evosuite.Properties; import org.evosuite.Properties.Strategy; import org.evosuite.TestGenerationContext; import org.evosuite.testcase.CodeUnderTestException; import org.evosuite.testcase.ExecutionObserver; import org.evosuite.testcase.ExecutionTracer; import org.evosuite.testca...
<<<<<<< ======= /** * Exception to handle the case when a mutation fails * */ static class MutationFailedException extends Exception { private static final long serialVersionUID = 1667810363133452317L; }; /** * only used for testing/debugging */ protected Chromosome(){ } >>>>>>> /** * onl...
<<<<<<< import org.evosuite.testcase.AbstractTestChromosome; import org.evosuite.testcase.ExecutableChromosome; import org.evosuite.testsuite.AbstractTestSuiteChromosome; ======= import org.evosuite.testcase.TestChromosome; import org.evosuite.testsuite.TestSuiteChromosome; >>>>>>> import org.evosuite.testcase.Abstr...
<<<<<<< // addClass(Type.getObjectType(classNode.name)); ======= >>>>>>> <<<<<<< /* * for (Type type : parameterClasses) { addClass(type); } */ ======= >>>>>>> <<<<<<< Class<?> clazz = TestGenerationContext.getClassLoader() .loadClass(className); addDependencyClass(clazz); ======= ...
<<<<<<< @Test public void testRegexMatchesTrue() { List<Constraint<?>> constraints = new ArrayList<Constraint<?>>(); String var1 = "test"; String const2 = "TEST"; StringVariable strVar = new StringVariable("test1", var1); StringConstant strConst = new StringConstant(const2); StringBinaryComparison strCo...
<<<<<<< if (Properties.CRITERION.equals("defuse")) { ======= // TODO line_trace ? if(Properties.CRITERION.equals("defuse")) { >>>>>>> // TODO line_trace ? if (Properties.CRITERION.equals("defuse")) { <<<<<<< * Returns a copy of this trace where all MethodCall-information associated * with duCount...
<<<<<<< public void testGatherClassNoAnonymous(){ Collection<String> classes = ResourceList.getInstance(TestGenerationContext.getInstance().getClassLoaderForSUT()).getAllClasses( ======= public void testGatherClassNoInternal(){ Collection<String> classes = ResourceList.getAllClasses( >>>>>>> public void testG...
<<<<<<< ======= import org.evosuite.setup.TestClusterGenerator; import org.evosuite.symbolic.DSEStats; >>>>>>> import org.evosuite.symbolic.DSEStats;
<<<<<<< private static void gatherStatistics() { ClientServices.getInstance().getClientNode().trackOutputVariable(RuntimeVariable.Predicates, BranchPool.getInstance(TestGenerationContext.getInstance().getClassLoaderForSUT()).getBranchCounter()); ClientServices.getInstance().getClientNode().trackOutputVariable(Ru...
<<<<<<< ======= /** Different models of neighbourhoods in the Cellular GA **/ public enum CGA_Models{ ONE_DIMENSION, LINEAR_FIVE, COMPACT_NINE, COMPACT_THIRTEEN } /** Constant <code>NEIGHBORHOOD_MODEL</code> */ @Parameter(key = "neighborhood_model", group = "Search Algorithm", description = "The model o...
<<<<<<< import org.objectweb.asm.tree.LdcInsnNode; ======= import org.objectweb.asm.tree.LabelNode; >>>>>>> import org.objectweb.asm.tree.LdcInsnNode; import org.objectweb.asm.tree.LabelNode; <<<<<<< if (instruction.isActualBranch()) BranchPool.getInstance(classLoader).registerAsBranch(instruction); ======= ...
<<<<<<< private static Logger logger = Logger.getLogger(ConcurrencyTracer.class); private List<SchedulingDecisionTuple> seen; ======= private static Logger logger = LoggerFactory.getLogger(ConcurrencyTracer.class); >>>>>>> private static Logger logger = LoggerFactory.getLogger(ConcurrencyTracer.class); //pri...
<<<<<<< import org.evosuite.ga.metaheuristics.GeneticAlgorithm; import org.evosuite.testsuite.SearchStatistics; ======= import org.evosuite.ga.GeneticAlgorithm; import org.evosuite.statistics.OutputVariable; import org.evosuite.statistics.RuntimeVariable; import org.evosuite.statistics.backend.DebugStatisticsBackend;...
<<<<<<< import java.io.IOException; ======= import java.io.FileInputStream; import java.io.IOException; import java.io.ObjectInputStream; >>>>>>> import java.io.FileInputStream; import java.io.IOException; import java.io.ObjectInputStream; <<<<<<< import org.evosuite.regression.RegressionSearchListener; import org....
<<<<<<< checkTimeout(); ======= if (tracer.killSwitch) { logger.info("Raising TimeoutException as kill switch is active - passedLine"); throw new TestCaseExecutor.TimeoutExceeded(); } if (Properties.DYNAMIC_SEEDING) { ConstantPoolManager.getInstance().addDynamicConstant(val1); ConstantPoolManag...
<<<<<<< import org.evosuite.testcase.AbstractTestChromosome; import org.evosuite.testcase.ExecutableChromosome; ======= >>>>>>> import org.evosuite.testcase.AbstractTestChromosome; <<<<<<< protected final Map<String, TestFitnessFunction<?>> methodCoverageMap = new LinkedHashMap<>(); ======= protected final Map<...
<<<<<<< /** * Set to a random value */ public abstract void randomize(); ======= @Override public AccessibleObject getAccessibleObject() { return null; } @Override public boolean isAssignmentStatement() { return false; } >>>>>>> /** * Set to a random value */ public abstract void randomize();...
<<<<<<< import org.evosuite.utils.ClassPathHandler; ======= import org.evosuite.statistics.SearchStatistics.RuntimeVariable; >>>>>>> import org.evosuite.utils.ClassPathHandler; import org.evosuite.statistics.SearchStatistics.RuntimeVariable;
<<<<<<< STANDARDGA, MONOTONICGA, ONEPLUSONEEA, MUPLUSLAMBDAEA, STEADYSTATEGA, RANDOM, NSGAII, MOSA, DYNAMOSA, SPEA2, ONEPLUSLAMBDALAMBDAGA, BREEDERGA, CELLULARGA, MIO, STANDARDCHEMICALREACTION ======= STANDARDGA, MONOTONICGA, ONEPLUSONEEA, MUPLUSLAMBDAEA, STEADYSTATEGA, RANDOM, NSGAII, MOSA, LIPS, SPEA2, ONEPLUSL...
<<<<<<< import org.evosuite.ga.metaheuristics.GeneticAlgorithm; import org.evosuite.testsuite.SearchStatistics; ======= import org.evosuite.ga.GeneticAlgorithm; import org.evosuite.statistics.OutputVariable; import org.evosuite.statistics.RuntimeVariable; import org.evosuite.statistics.backend.DebugStatisticsBackend;...
<<<<<<< import dr.evomodel.continuous.RestrictedPartials; import dr.evomodel.continuous.RestrictedPartialsModel; import dr.evomodel.treedatalikelihood.*; ======= import dr.evomodel.treedatalikelihood.BufferIndexHelper; import dr.evomodel.treedatalikelihood.DataLikelihoodDelegate; import dr.evomodel.treedatalikelihood...
<<<<<<< public void testSimplePLM(){ Properties.P_FUNCTIONAL_MOCKING = 0.5; //any value above 0 Properties.FUNCTIONAL_MOCKING_PERCENT = 0.0; do100percentLineTest(SimpleFM_PackageMethod.class); } @Test public void testSimplePLMwithReturn(){ Properties.P_FUNCTIONAL_MOCK...
<<<<<<< Injector.reset(); DSEStatistics.clear(); ======= DSEStats.clear(); >>>>>>> DSEStatistics.clear();
<<<<<<< import org.evosuite.ga.metaheuristics.GeneticAlgorithm; import org.evosuite.testsuite.SearchStatistics; ======= import org.evosuite.ga.GeneticAlgorithm; import org.evosuite.statistics.OutputVariable; import org.evosuite.statistics.RuntimeVariable; import org.evosuite.statistics.backend.DebugStatisticsBackend;...
<<<<<<< import org.evosuite.TestGenerationContext; ======= import org.evosuite.Properties; >>>>>>> import org.evosuite.TestGenerationContext; import org.evosuite.Properties; <<<<<<< for (String className : BranchPool.getInstance(TestGenerationContext.getInstance().getClassLoaderForSUT()).knownClasses()) { =====...
<<<<<<< import org.evosuite.sandbox.Sandbox; import org.evosuite.utils.ArrayUtil; ======= import org.evosuite.classpath.ClassPathHandler; import org.evosuite.runtime.sandbox.Sandbox; import org.evosuite.setup.DependencyAnalysis; >>>>>>> import org.evosuite.runtime.sandbox.Sandbox; import org.evosuite.utils.ArrayUtil...
<<<<<<< logger.warn("The class "+name+" is not on the classpath"); //only log once ======= /* * Note: can't really have "warn" here, as the SUT can use the classloader, * and try to load garbage (eg random string generated as test data) that * would fill the logs */ logger.debug("The ...
<<<<<<< //import org.jgrapht.alg.FloydWarshallShortestPaths; import org.jgrapht.graph.DefaultDirectedGraph; import org.jgrapht.graph.DefaultEdge; import org.jgrapht.graph.DirectedMultigraph; ======= >>>>>>> <<<<<<< import de.unisb.cs.st.evosuite.Properties; import de.unisb.cs.st.evosuite.cfg.ControlFlowGraph; impor...
<<<<<<< import org.evosuite.testcase.AbstractTestFactory; import org.evosuite.testcase.AssignmentStatement; ======= >>>>>>> import org.evosuite.testcase.AssignmentStatement; <<<<<<< import org.evosuite.testcase.DefaultTestFactory; import org.evosuite.testcase.FieldReference; ======= >>>>>>> import org.evosuite.t...
<<<<<<< copy.objectPool.addAll(objectPool); ======= if(returnValues != null) copy.returnValues = new HashMap<MethodStatement, Object>(returnValues); >>>>>>> copy.objectPool.addAll(objectPool); if(returnValues != null) copy.returnValues = new HashMap<MethodStatement, Object>(returnValues);
<<<<<<< import org.evosuite.ga.metaheuristics.GeneticAlgorithm; import org.evosuite.testsuite.SearchStatistics; ======= import org.evosuite.ga.GeneticAlgorithm; import org.evosuite.statistics.OutputVariable; import org.evosuite.statistics.RuntimeVariable; import org.evosuite.statistics.backend.DebugStatisticsBackend;...
<<<<<<< import org.evosuite.TestGenerationContext; ======= import org.evosuite.coverage.archive.TestsArchive; >>>>>>> import org.evosuite.TestGenerationContext; import org.evosuite.coverage.archive.TestsArchive; <<<<<<< totalMethods = CFGMethodAdapter.getNumMethodsPrefix(classLoader, prefix); totalBranches = ...
<<<<<<< switch (strategy) { case EVOSUITE: cmdLine.add("-Dstrategy=EvoSuite"); break; case ONEBRANCH: cmdLine.add("-Dstrategy=OneBranch"); break; case RANDOM: cmdLine.add("-Dstrategy=Random"); ...
<<<<<<< ======= import org.evosuite.graphs.cfg.CFGMethodAdapter; import org.evosuite.instrumentation.InstrumentingClassLoader; import org.evosuite.rmi.ClientServices; >>>>>>> <<<<<<< protected StoppingCondition getStoppingCondition() { return StoppingConditionFactory.getStoppingCondition(Properties.STOPPING_COND...
<<<<<<< final AttributedList<Path> list = new FileidDriveListService(session, fileid, file).list(file.getParent(), new DisabledListProgressListener()); final Path found = list.filter(new NullFilter<>()).find(new SimplePathPredicate(file)); ======= final AttributedList<Path> list = new FileidDr...
<<<<<<< if(type == AclPermission.class) { return (T) new VaultRegistryAclPermission(session, (AclPermission) proxy, this); } ======= if(type == UnixPermission.class) { return (T) new VaultRegistryUnixPermission(session, (UnixPermission) proxy, this); } >>>>>>> ...
<<<<<<< import ch.cyberduck.core.HostKeyCallback; import ch.cyberduck.core.HostParser; import ch.cyberduck.core.HostUrlProvider; ======= >>>>>>> import ch.cyberduck.core.HostKeyCallback; import ch.cyberduck.core.HostUrlProvider; <<<<<<< import java.net.UnknownHostException; ======= import java.net.URI; >>>>>>> i...
<<<<<<< if(session.isPosixFilesystem()) { session.open(Proxy.DIRECT, new DisabledHostKeyCallback(), new DisabledLoginCallback()); session.login(Proxy.DIRECT, new DisabledLoginCallback(), new DisabledCancelCallback()); final Path workdir = new LocalHomeFinderFeature(session).f...
<<<<<<< import org.n52.sos.ds.hibernate.dao.FeatureOfInterestDAO; ======= import org.n52.sos.ds.hibernate.dao.DaoFactory; >>>>>>> import org.n52.sos.ds.hibernate.dao.FeatureOfInterestDAO; import org.n52.sos.ds.hibernate.dao.DaoFactory; <<<<<<< List<String> featureOfInterestIdentifiers, AbstractObservati...
<<<<<<< dict.setStringForKey(this.getUuid(), "UUID"); if(size != null) { dict.setStringForKey(String.valueOf(size), "Size"); } if(transferred != null) { dict.setStringForKey(String.valueOf(transferred), "Current"); } ======= dict.setStringForKey(...
<<<<<<< new DbxUserFilesRequests(session.getClient()).move(file.getAbsolute(), renamed.getAbsolute()); // Copy original file attributes return new Path(renamed.getParent(), renamed.getName(), renamed.getType(), new PathAttributes(file.attributes())); ======= new DbxUser...
<<<<<<< final Path target = new Path(room, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new SDSMoveFeature(session).move(test, target, new TransferStatus(), new Delete.DisabledCallback()); ======= final Path target = new Path(room, UUID.randomUUID().toString(), ...
<<<<<<< protocols.append("\t").append(String.format("%s://<container>/<key>", p.isBundled() ? p.getIdentifier() : p.getProvider())); ======= case onedrive: protocols.append("\t").append(String.format("%s://<container>/<key>", getScheme(p))); >>>>>>> ...
<<<<<<< import ch.cyberduck.core.proxy.Proxy; ======= import ch.cyberduck.core.proxy.ProxyFinder; import ch.cyberduck.core.shared.DelegatingSchedulerFeature; >>>>>>> import ch.cyberduck.core.proxy.Proxy; import ch.cyberduck.core.shared.DelegatingSchedulerFeature;
<<<<<<< new HubicProtocol(), new DropboxProtocol(), new OneDriveProtocol() ======= new DropboxProtocol(), new HubicProtocol() >>>>>>> new HubicProtocol(), new DropboxProtocol(), new Dropbox...
<<<<<<< image = applyImageTransforms(data, image, data.xResolution, data.yResolution); //applyBulbMask(data, graphics, data.xResolution, data.yResolution); //WILBUR //applyImageTransforms(data, image, data.xResolution, data.yResolution); ======= applyBulbMask(data, graphics, data.xResolution,...
<<<<<<< public class Constants { ======= public final class Constants { // public static final String BASE_URL = "http://gank.avosapps.com/api/"; >>>>>>> public final class Constants {
<<<<<<< private Realm realm; private String mType; private boolean mIsCollections; ======= private final Realm realm; private final String mType; >>>>>>> private final Realm realm; private final String mType; private boolean mIsCollections;
<<<<<<< <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { _%> ======= <%_ } _%> <%_ if (authenticationType !== 'oauth2' && (databaseType === 'sql' || databaseType === 'mongodb')) { _%> >>>>>>> <%_ } _%> <%_ if (authenticationType !== 'oauth2' && (databaseType === 'sql' |...
<<<<<<< import <%=packageName%>.web.rest.vm.ManagedUserVM; import <%=packageName%>.web.rest.util.HeaderUtil;<% } %><% if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { %> import <%=packageName%>.web.rest.util.PaginationUtil;<% } %> ======= import <%=packageName%>.web.rest.uti...
<<<<<<< import org.springframework.boot.autoconfigure.SpringBootApplication; <%_ if (clusteredHttpSession === 'hazelcast') { _%> import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration; <%_ } _%> ======= >>>>>>> import org.springframework.boot.autoconfigure.SpringBootApplication; <<<<<<< ...
<<<<<<< public ManagedUserVM(<% if (databaseType === 'sql') { %>Long<% } else { %>String<% } %> id, String login, String password, String firstName, String lastName, String email, boolean activated<% if (databaseType === 'mongodb' || databaseType === 'couchbase' || databaseType === 'sql') {...
<<<<<<< /** * Create an entity for this test. * * This is a static method, as tests for other entities might also need it, * if they test an entity which requires the current entity. */ public static <%= entityClass %> createEntity(<% if (databaseType == 'sql') { %>EntityManager em<% } ...
<<<<<<< http //.addFilterAfter(new CsrfCookieGeneratorFilter(), CsrfFilter.class) // See https://github.com/jhipster/generator-jhipster/issues/965 ======= http<% if (authenticationType == 'cookie') { %> .addFilterAfter(new CsrfCookieGeneratorFilter(), CsrfFilter.class)<% } %> ...
<<<<<<< import org.slf4j.LoggerFactory;<% if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { %> ======= import org.slf4j.LoggerFactory; <%_ if (cacheManagerIsAvailable === true) { _%> import org.springframework.cache.CacheManager; <%_ } _%> <%_ if (databaseType === 'sql' || da...
<<<<<<< "<%= nativeLanguage %>", // langKey <%_ if (databaseType === 'mongodb' || databaseType === 'couchbase' || databaseType === 'sql') { _%> ======= Constants.DEFAULT_LANGUAGE,// langKey <%_ if (databaseType === 'mongodb' || databaseType === 'sql') ...
<<<<<<< // public static void safeSolveSymmPosDef(DenseMatrix64F A, // WrappedVector b, // WrappedVector x) { // final int dim = b.getDim(); // // assert (A.getNumRows() == dim && A.getNumCols() == dim); // // fi...
<<<<<<< public static final String PREMIUM_VIDEO_URL2 = "http://video.wikia.com/wiki/File:Frozen_-_Olaf%27s_Summer_Song"; public static final String PREMIUM_VIDEO_NAME2 = "Frozen - Olaf's Summer Song"; private VideoContent() { } ======= public static final String PREMIUM_VIDEO_URL = "http://video....
<<<<<<< testCategory = "Ca"; ======= testCategory = "ca"; categorySearchStr = "abcd"; >>>>>>> testCategory = "Ca"; categorySearchStr = "abcd"; <<<<<<< @Test( groups = {"VECategoryTests", "VECategoryTests_005", "VEAddCategory"} ) public void VECategoryTests_005_AddNewCategoryWithSortKey() { String ...
<<<<<<< ======= import com.wikia.webdriver.Common.ContentPatterns.ApiActions; import com.wikia.webdriver.Common.ContentPatterns.URLsContent; import com.wikia.webdriver.Common.DriverProvider.DriverProvider; import com.wikia.webdriver.Common.Logging.PageObjectLogging; import com.wikia.webdriver.Common.Properties.Proper...
<<<<<<< public static final String wikiDir = "wiki/"; public static final String wikiaDir = "Wikia"; ======= public static String WIKI_DIR = "wiki/"; public static String WIKIA_DIR = "Wikia"; >>>>>>> public static final String WIKI_DIR = "wiki/"; public static final String WIKIA_DIR = "Wikia"; <<<<<<< public...
<<<<<<< public void SpecialVideos_001_Provider() { YoutubeVideo video = YoutubeVideoProvider.getLatestVideoForQuery("review"); ======= public void SpecialVideos_001_Provider_qaart_518() { >>>>>>> public void SpecialVideos_001_Provider_qaart_518() { YoutubeVideo video = YoutubeVideoProvider.getLatestVi...
<<<<<<< @Test @Execute(onWikia = "mercuryautomationtesting") public void VKWidgetTest_002_areLoaded() { VKWidgetPageObject vkWidget = new VKWidgetPageObject(driver); vkWidget .create(2) .navigate(wikiURL); Assertion.assertTrue( vkWidget.areLoadedOnOasis(), MercuryMes...
<<<<<<< private String getArticleName() { return executeScriptRet(WikiaGlobalVariables.wgPageName); } public void verifyArticleName(String targetText) { Assertion.assertStringContains(getArticleName(), targetText); PageObjectLogging.log( "verifyArticleName", "The article shows " + targetText, true ...
<<<<<<< public enum ImageSize { WIDTH, HEIGHT } ======= public enum Transclusion { INLINE("span[typeof='mw:Transclusion']"), BLOCKED("div[typeof='mw:Transclusion']"); private String cssSelector; private Transclusion(String cssSelector) { this.cssSelector = cssSelector; } ...
<<<<<<< ======= @FindBy(css="button.close.wikia-chiclet-button") protected WebElement closeModalButton; @FindBy(css="#ca-ve-edit") protected WebElement veEditButton; @FindBy(css="body.ve") protected WebElement veMode; @FindBy(css=".editsection>a") protected List<WebElement> sectionEditButtons; >>>>>>> @Find...
<<<<<<< ======= private static String wikiaDomain; private static String geoEdgeCountry; >>>>>>> private static String geoEdgeCountry;
<<<<<<< @RelatedIssue(issueID = "MAIN-4191") ======= Credentials credentials = Configuration.getCredentials(); >>>>>>> @RelatedIssue(issueID = "MAIN-4191") <<<<<<< new ArticlePageObject(driver).openRandomArticle(wikiURL); String articleTitle = PageContent.ARTICLE_NAME_PREFIX + DateTime.now().getMilli...
<<<<<<< //Preview url prefix public static String previewPrefix = "http://preview"; ======= >>>>>>> <<<<<<< public static final String specialPreferences = "wiki/Special:Preferences"; ======= public static final String specialCreateBlogPage = "wiki/Special:CreateBlogPage"; public static final String spe...
<<<<<<< import com.wikia.webdriver.common.core.annotations.ExecuteAs; import com.wikia.webdriver.common.core.annotations.User; ======= import org.testng.annotations.Test; >>>>>>> import org.testng.annotations.Test; import com.wikia.webdriver.common.core.annotations.ExecuteAs; import com.wikia.webdriver.common.core...
<<<<<<< import com.wikia.webdriver.common.core.configuration.Configuration; ======= import com.wikia.webdriver.common.core.annotations.RelatedIssue; >>>>>>> import com.wikia.webdriver.common.core.annotations.RelatedIssue; import com.wikia.webdriver.common.core.configuration.Configuration;
<<<<<<< private double getEffectiveDimension(int iBuffer) { return partials[iBuffer * dimPartial + effectiveDimensionOffset]; } @SuppressWarnings("unused") private void setEffectiveDimension(int iBuffer, double effDim) { partials[iBuffer * dimPartial + effectiveDimensionOffset] = effDim...
<<<<<<< import com.wikia.webdriver.common.core.drivers.Browser; import com.wikia.webdriver.common.core.helpers.Emulator; ======= import com.wikia.webdriver.common.core.url.Page; >>>>>>> import com.wikia.webdriver.common.core.drivers.Browser; import com.wikia.webdriver.common.core.helpers.Emulator; import com.wikia.w...
<<<<<<< @Test(groups = "MercurySpotifyWidgetTest_004") @Execute(onWikia = "mercuryautomationtesting") public void MercurySpotifyWidgetTest_004_areLoadedOnFirstVisitDirectlyFromUrl() { SpotifyWidgetPageObject spotifyWidget = new SpotifyWidgetPageObject(driver); spotifyWidget .create(2) .n...
<<<<<<< import org.openqa.selenium.WebElement; ======= import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; >>>>>>> import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; <<<<<<< public boolean areLoadedOnMercury() { boolean result = areTagsLoadedOnMerc...
<<<<<<< private CrossWikiSearchProvider() { } @DataProvider public static final Object[][] getExactMatchQueries() { return new Object[][]{ { "call of duty", "Call of Duty Wiki", "VIDEO GAMES" }, { "call-of-duty", "Call of Duty Wiki", "VIDEO GAMES" }, { "call_of_duty", "Call of Duty Wiki", "VI...