Projects information

Chunk

Conflicting content
assertEquals(2, resultList.size()); assertEquals(1, resultList.size()); } <<<<<<< HEAD public void testRealmQueryContainsAndCaseSensitive() { RealmResults resultList = testRealm.where(AllTypes.class) .beginGroup().contains("columnString", "DaTa 0", RealmQuery.CASE_INSENSITIVE) .or().contains("columnString", "20").endGroup().findAll(); assertEquals(3, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "DATA").findAll(); assertEquals(0, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "TEST", RealmQuery.CASE_INSENSITIVE).findAll(); assertEquals(TEST_DATA_SIZE, resultList.size()); } public void testRealmQueryContainsAndCaseSensitiveWithNonLatinCharacters() { testRealm.beginTransaction(); testRealm.clear(AllTypes.class); AllTypes at1 = testRealm.createObject(AllTypes.class); at1.setColumnString("Αλφα"); AllTypes at2 = testRealm.createObject(AllTypes.class); at2.setColumnString("βήτα"); AllTypes at3 = testRealm.createObject(AllTypes.class); at3.setColumnString("δέλτα"); testRealm.commitTransaction(); RealmResults resultList = testRealm.where(AllTypes.class) .beginGroup().contains("columnString", "Α", RealmQuery.CASE_INSENSITIVE) .or().contains("columnString", "δ").endGroup().findAll(); // Without case sensitive there is 3, Α = α // assertEquals(3,resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "α").findAll(); assertEquals(3, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "Δ").findAll(); assertEquals(0, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "Δ", RealmQuery.CASE_INSENSITIVE).findAll(); // Without case sensitive there is 1, Δ = δ // assertEquals(1,resultList.size()); assertEquals(0, resultList.size()); } ======= >>>>>>> b3c15ca228e782be8e7195e80b3533153daf5744 public void testQueryWithNonExistingField() { try { testRealm.where(AllTypes.class).equalTo("NotAField", 13).findAll();

Conflicting content

        assertEquals(2, resultList.size());
        assertEquals(1, resultList.size());
    }

<<<<<<< HEAD
    public void testRealmQueryContainsAndCaseSensitive() {
        RealmResults resultList = testRealm.where(AllTypes.class)
                .beginGroup().contains("columnString", "DaTa 0", RealmQuery.CASE_INSENSITIVE)
                .or().contains("columnString", "20").endGroup().findAll();
        assertEquals(3, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "DATA").findAll();
        assertEquals(0, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "TEST", RealmQuery.CASE_INSENSITIVE).findAll();
        assertEquals(TEST_DATA_SIZE, resultList.size());
    }

    public void testRealmQueryContainsAndCaseSensitiveWithNonLatinCharacters() {
        testRealm.beginTransaction();
        testRealm.clear(AllTypes.class);
        AllTypes at1 = testRealm.createObject(AllTypes.class);
        at1.setColumnString("Αλφα");
        AllTypes at2 = testRealm.createObject(AllTypes.class);
        at2.setColumnString("βήτα");
        AllTypes at3 = testRealm.createObject(AllTypes.class);
        at3.setColumnString("δέλτα");
        testRealm.commitTransaction();

        RealmResults resultList = testRealm.where(AllTypes.class)
                .beginGroup().contains("columnString", "Α", RealmQuery.CASE_INSENSITIVE)
                .or().contains("columnString", "δ").endGroup().findAll();
        // Without case sensitive there is 3, Α = α
        // assertEquals(3,resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "α").findAll();
        assertEquals(3, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "Δ").findAll();
        assertEquals(0, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "Δ", RealmQuery.CASE_INSENSITIVE).findAll();
        // Without case sensitive there is 1, Δ = δ
        // assertEquals(1,resultList.size());
        assertEquals(0, resultList.size());
    }

=======
>>>>>>> b3c15ca228e782be8e7195e80b3533153daf5744
    public void testQueryWithNonExistingField() {
        try {
            testRealm.where(AllTypes.class).equalTo("NotAField", 13).findAll();

Solution content
assertEquals(1, resultList.size()); } public void testRealmQueryContainsAndCaseSensitive() { RealmResults resultList = testRealm.where(AllTypes.class) .beginGroup().contains("columnString", "DaTa 0", RealmQuery.CASE_INSENSITIVE) .or().contains("columnString", "20").endGroup().findAll(); assertEquals(3, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "DATA").findAll(); assertEquals(0, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "TEST", RealmQuery.CASE_INSENSITIVE).findAll(); assertEquals(TEST_DATA_SIZE, resultList.size()); } public void testRealmQueryContainsAndCaseSensitiveWithNonLatinCharacters() { testRealm.beginTransaction(); testRealm.clear(AllTypes.class); AllTypes at1 = testRealm.createObject(AllTypes.class); at1.setColumnString("Αλφα"); AllTypes at2 = testRealm.createObject(AllTypes.class); at2.setColumnString("βήτα"); AllTypes at3 = testRealm.createObject(AllTypes.class); at3.setColumnString("δέλτα"); testRealm.commitTransaction(); RealmResults resultList = testRealm.where(AllTypes.class) .beginGroup().contains("columnString", "Α", RealmQuery.CASE_INSENSITIVE) .or().contains("columnString", "δ").endGroup().findAll(); // Without case sensitive there is 3, Α = α // assertEquals(3,resultList.size()); assertEquals(2, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "α").findAll(); assertEquals(3, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "Δ").findAll(); assertEquals(0, resultList.size()); resultList = testRealm.where(AllTypes.class).contains("columnString", "Δ", RealmQuery.CASE_INSENSITIVE).findAll(); // Without case sensitive there is 1, Δ = δ // assertEquals(1,resultList.size()); assertEquals(0, resultList.size()); } public void testQueryWithNonExistingField() { try { testRealm.where(AllTypes.class).equalTo("NotAField", 13).findAll();

Solution content

        assertEquals(1, resultList.size());
    }

    public void testRealmQueryContainsAndCaseSensitive() {
        RealmResults resultList = testRealm.where(AllTypes.class)
                .beginGroup().contains("columnString", "DaTa 0", RealmQuery.CASE_INSENSITIVE)
                .or().contains("columnString", "20").endGroup().findAll();
        assertEquals(3, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "DATA").findAll();
        assertEquals(0, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "TEST", RealmQuery.CASE_INSENSITIVE).findAll();
        assertEquals(TEST_DATA_SIZE, resultList.size());
    }

    public void testRealmQueryContainsAndCaseSensitiveWithNonLatinCharacters() {
        testRealm.beginTransaction();
        testRealm.clear(AllTypes.class);
        AllTypes at1 = testRealm.createObject(AllTypes.class);
        at1.setColumnString("Αλφα");
        AllTypes at2 = testRealm.createObject(AllTypes.class);
        at2.setColumnString("βήτα");
        AllTypes at3 = testRealm.createObject(AllTypes.class);
        at3.setColumnString("δέλτα");
        testRealm.commitTransaction();

        RealmResults resultList = testRealm.where(AllTypes.class)
                .beginGroup().contains("columnString", "Α", RealmQuery.CASE_INSENSITIVE)
                .or().contains("columnString", "δ").endGroup().findAll();
        // Without case sensitive there is 3, Α = α
        // assertEquals(3,resultList.size());
        assertEquals(2, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "α").findAll();
        assertEquals(3, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "Δ").findAll();
        assertEquals(0, resultList.size());

        resultList = testRealm.where(AllTypes.class).contains("columnString", "Δ", RealmQuery.CASE_INSENSITIVE).findAll();
        // Without case sensitive there is 1, Δ = δ
        // assertEquals(1,resultList.size());
        assertEquals(0, resultList.size());
    }

    public void testQueryWithNonExistingField() {
        try {
            testRealm.where(AllTypes.class).equalTo("NotAField", 13).findAll();

File
RealmTest.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content
realm1.commitTransaction(); realm1.close(); <<<<<<< HEAD File file = new File(getContext().getFilesDir() + "/" + fileName); ======= File file = new File(getContext().getFilesDir(), fileName); >>>>>>> b3c15ca228e782be8e7195e80b3533153daf5744 assertTrue(language, file.exists()); Realm realm2 = Realm.getInstance(getContext(), fileName);

Conflicting content

        realm1.commitTransaction();
        realm1.close();

<<<<<<< HEAD
        File file = new File(getContext().getFilesDir() + "/" + fileName);
=======
        File file = new File(getContext().getFilesDir(), fileName);
>>>>>>> b3c15ca228e782be8e7195e80b3533153daf5744
        assertTrue(language, file.exists());

        Realm realm2 = Realm.getInstance(getContext(), fileName);

Solution content
realm1.commitTransaction(); realm1.close(); File file = new File(getContext().getFilesDir(), fileName); assertTrue(language, file.exists()); Realm realm2 = Realm.getInstance(getContext(), fileName);

File
RealmTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Projects >> realm-java >>1c2fa226d03cd2cab86cfcbe5f29f5a8da8e936b