Projects >> social >>b99e266162cd1c6896f40af40f2278d856c361b6

Chunk
Conflicting content 
  /**
   * Tests {@link ActivityStorage#getNewerOnActivityFeed(Identity, ExoSocialActivity, int)}.
   */
<<<<<<< HEAD
  @MaxQueryNumber(500)
=======
  @MaxQueryNumber(550)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetNewerOnActivityFeed() {
    createActivities(3, demoIdentity);
    ExoSocialActivity demoBaseActivity = activityStorage.getActivityFeed(demoIdentity, 0, 10).get(0);
Solution content 
  /**
   * Tests {@link ActivityStorage#getNewerOnActivityFeed(Identity, ExoSocialActivity, int)}.
   */
  @MaxQueryNumber(500)
  public void testGetNewerOnActivityFeed() {
    createActivities(3, demoIdentity);
    ExoSocialActivity demoBaseActivity = activityStorage.getActivityFeed(demoIdentity, 0, 10).get(0);
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
  /**
   * Test {@link ActivityStorage#getActivitiesOfConnections(Identity, int, int)}
   */
<<<<<<< HEAD
  @MaxQueryNumber(800)
=======
  @MaxQueryNumber(850)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetActivitiesOfConnections() {
    List relationships = new ArrayList ();
Solution content 
  /**
   * Test {@link ActivityStorage#getActivitiesOfConnections(Identity, int, int)}
   */
  @MaxQueryNumber(800)
  public void testGetActivitiesOfConnections() {
    List relationships = new ArrayList ();
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
   * 
   * @since 1.2.0-Beta3
   */
<<<<<<< HEAD
  @MaxQueryNumber(800)
=======
  @MaxQueryNumber(850)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetNumberOfActivitiesOfConnections() {
    List relationships = new ArrayList ();
Solution content 
   * 
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(800)
  public void testGetNumberOfActivitiesOfConnections() {
    List relationships = new ArrayList ();
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
   * 
   * @since 1.2.0-Beta3
   */
<<<<<<< HEAD
  @MaxQueryNumber(800)
=======
  @MaxQueryNumber(850)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetNumberOfNewerOnActivitiesOfConnections() {
    List relationships = new ArrayList ();
Solution content 
   * 
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(800)
  public void testGetNumberOfNewerOnActivitiesOfConnections() {
    List relationships = new ArrayList ();
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
  @MaxQueryNumber(800)
   */
<<<<<<< HEAD
   * 
   * @since 1.2.0-Beta3
=======
  @MaxQueryNumber(850)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetNumberOfOlderOnActivitiesOfConnections() {
    List relationships = new ArrayList ();
Solution content 
   * 
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(800)
  public void testGetNumberOfOlderOnActivitiesOfConnections() {
    List relationships = new ArrayList ();
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
   * 
   * @since 1.2.0-Beta3
   */
<<<<<<< HEAD
  @MaxQueryNumber(800)
=======
  @MaxQueryNumber(850)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetOlderOnActivitiesOfConnections() {
    List relationships = new ArrayList ();
Solution content 
   * 
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(800)
  public void testGetOlderOnActivitiesOfConnections() {
    List relationships = new ArrayList ();
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
<<<<<<< HEAD
  @MaxQueryNumber(1700)
=======
  @MaxQueryNumber(1500)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetNumberOfUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
Solution content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(1700)
  public void testGetNumberOfUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
<<<<<<< HEAD
  @MaxQueryNumber(1700)
=======
  @MaxQueryNumber(1500)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetNumberOfNewerOnUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
Solution content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(1700)
  public void testGetNumberOfNewerOnUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
<<<<<<< HEAD
  @MaxQueryNumber(1700)
=======
  @MaxQueryNumber(1500)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetNewerOnUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
Solution content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(1700)
  public void testGetNewerOnUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
<<<<<<< HEAD
  @MaxQueryNumber(1700)
=======
  @MaxQueryNumber(1500)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetNumberOfOlderOnUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
Solution content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(1700)
  public void testGetNumberOfOlderOnUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
<<<<<<< HEAD
  @MaxQueryNumber(1700)
=======
  @MaxQueryNumber(1500)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testGetOlderOnUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
Solution content 
   * @throws Exception
   * @since 1.2.0-Beta3
   */
  @MaxQueryNumber(1700)
  public void testGetOlderOnUserSpacesActivities() throws Exception {
    SpaceService spaceService = this.getSpaceService();
    Space space = this.getSpaceInstance(spaceService, 0);
File
ActivityStorageTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
  }

<<<<<<< HEAD
  @MaxQueryNumber(50)
=======
  @MaxQueryNumber(80)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testSaveComment() throws Exception {

    //
Solution content 
  }

  @MaxQueryNumber(50)
  public void testSaveComment() throws Exception {

    //
File
ActivityStorageImplTestCase.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
  }

<<<<<<< HEAD
  @MaxQueryNumber(900)
=======
  @MaxQueryNumber(800)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testActivityCount() throws Exception {

    // fill 10 activities
Solution content 
  }

  @MaxQueryNumber(900)
  public void testActivityCount() throws Exception {

    // fill 10 activities
File
ActivityStorageImplTestCase.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
      ExoSocialActivity activity = new ExoSocialActivityImpl();
      activity.setTitle("title " + i);
      activityStorage.saveActivity(rootIdentity, activity);
<<<<<<< HEAD
=======
      
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
    }

    //
Solution content 
      ExoSocialActivity activity = new ExoSocialActivityImpl();
      activity.setTitle("title " + i);
      activityStorage.saveActivity(rootIdentity, activity);
    }

    //
File
ActivityStorageImplTestCase.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    
  }

<<<<<<< HEAD
  @MaxQueryNumber(50)
=======
  @MaxQueryNumber(100)
>>>>>>> 270ac91e067e0c87281a108f930a50e8a807757e
  public void testActivityProcessing() throws Exception {

    //
Solution content 
    
  }

  @MaxQueryNumber(50)
  public void testActivityProcessing() throws Exception {

    //
File
ActivityStorageImplTestCase.java
Developer's decision
Version 1
Kind of conflict
Annotation