Projects >> realm-java >>04be0b473a86490bf548c2cf3ab65ce33f3331fd

Chunk
Conflicting content 
        assertEquals(0, realm.getVersion());
        realm.close();

<<<<<<< HEAD
        // Version upgrades should happen automatically if possible
=======
        // Version upgrades should always require a migration.
>>>>>>> 5094622f13ba845ad6236bb075a120965dde723e
        try {
            realm = Realm.getInstance(new RealmConfiguration.Builder(getContext()).schemaVersion(42).build());
            fail();
Solution content 
        assertEquals(0, realm.getVersion());
        realm.close();

        // Version upgrades should always require a migration.
        try {
            realm = Realm.getInstance(new RealmConfiguration.Builder(getContext()).schemaVersion(42).build());
            fail();
File
RealmConfigurationTest.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
        } finally {
            fail();
        } catch (RealmMigrationNeededException expected) {
        }
<<<<<<< HEAD
=======
    }

    public void testEquals() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).build();
        assertTrue(config1.equals(config2));
    }

    public void testHashCode() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).build();
        assertEquals(config1.hashCode(), config2.hashCode());
    }

    public void testEqualConfigurationsReturnCachedRealm() {
        Realm realm1 = Realm.getInstance(getContext());
        Realm realm2 = Realm.getInstance(getContext());
        try {
            assertEquals(realm1, realm2);
            realm1.close();
            realm2.close();
        }
    }

    public void testDifferentVersionsThrows() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).schemaVersion(1).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).schemaVersion(2).build();

        Realm realm1 = Realm.getInstance(config1);
        try {
            Realm.getInstance(config2);
            fail();
        } catch (IllegalArgumentException expected) {
        } finally {
            realm1.close();
        }
    }

    public void testDifferentEncryptionKeysThrows() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).encryptionKey(TestHelper.getRandomKey()).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).encryptionKey(TestHelper.getRandomKey()).build();

        Realm realm1 = Realm.getInstance(config1);
        try {
            Realm.getInstance(config2);
            fail();
        } catch (IllegalArgumentException expected) {
        } finally {
            realm1.close();
        }
    }

    public void testDifferentSchemasThrows() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).schema(AllTypes.class).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).schema(CyclicType.class).build();

        Realm realm1 = Realm.getInstance(config1);
        try {
            Realm.getInstance(config2);
            fail();
        } catch (IllegalArgumentException expected) {
        } finally {
            realm1.close();
        }
>>>>>>> 5094622f13ba845ad6236bb075a120965dde723e
    }
}
Solution content 
            fail();
        } catch (RealmMigrationNeededException expected) {
        }
    }

    public void testEquals() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).build();
        assertTrue(config1.equals(config2));
    }

    public void testHashCode() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).build();
        assertEquals(config1.hashCode(), config2.hashCode());
    }

    public void testEqualConfigurationsReturnCachedRealm() {
        Realm realm1 = Realm.getInstance(getContext());
        Realm realm2 = Realm.getInstance(getContext());
        try {
            assertEquals(realm1, realm2);
        } finally {
            realm1.close();
            realm2.close();
        }
    }

    public void testDifferentVersionsThrows() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).schemaVersion(1).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).schemaVersion(2).build();

        Realm realm1 = Realm.getInstance(config1);
        try {
            Realm.getInstance(config2);
            fail();
        } catch (IllegalArgumentException expected) {
        } finally {
            realm1.close();
        }
    }

    public void testDifferentEncryptionKeysThrows() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).encryptionKey(TestHelper.getRandomKey()).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).encryptionKey(TestHelper.getRandomKey()).build();

        Realm realm1 = Realm.getInstance(config1);
        try {
            Realm.getInstance(config2);
            fail();
        } catch (IllegalArgumentException expected) {
        } finally {
            realm1.close();
        }
    }

    public void testDifferentSchemasThrows() {
        RealmConfiguration config1 = new RealmConfiguration.Builder(getContext()).schema(AllTypes.class).build();
        RealmConfiguration config2 = new RealmConfiguration.Builder(getContext()).schema(CyclicType.class).build();

        Realm realm1 = Realm.getInstance(config1);
        try {
            Realm.getInstance(config2);
            fail();
        } catch (IllegalArgumentException expected) {
        } finally {
            realm1.close();
        }
    }
}
File
RealmConfigurationTest.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Method invocation
Method signature
Try statement
Variable
Chunk
Conflicting content 
import io.realm.internal.android.DebugAndroidLogger;
import io.realm.internal.android.ReleaseAndroidLogger;
import io.realm.internal.log.RealmLog;
<<<<<<< HEAD

=======
>>>>>>> 5094622f13ba845ad6236bb075a120965dde723e

/**
 * The Realm class is the storage and transactional manager of your object persistent store. It
Solution content 
import io.realm.internal.android.DebugAndroidLogger;
import io.realm.internal.android.ReleaseAndroidLogger;
import io.realm.internal.log.RealmLog;

/**
 * The Realm class is the storage and transactional manager of your object persistent store. It
File
Realm.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        RealmMigration realmMigration = (migration == null) ? configuration.getMigration() : migration;
        Realm realm = null;
        try {
<<<<<<< HEAD
            // TODO Record steps instead of executing?
            realm = Realm.createAndValidate(configuration, false, Looper.myLooper() != null);
            realm.beginTransaction();
            long currentVersion = realm.getVersion();
            realmMigration.migrate(realm.getSchema(), currentVersion, configuration.getSchemaVersion());
            realm.setVersion(configuration.getSchemaVersion());
            // TODO Validate schema before committing, otherwise we might risk saving the versionnumber for a wrong
            // schema
=======
            realm = Realm.createAndValidate(configuration, false, Looper.myLooper() != null);
            realm.beginTransaction();
            realm.setVersion(realmMigration.execute(realm, realm.getVersion()));
>>>>>>> 5094622f13ba845ad6236bb075a120965dde723e
            realm.commitTransaction();
        } finally {
            if (realm != null) {
Solution content 
        RealmMigration realmMigration = (migration == null) ? configuration.getMigration() : migration;
        Realm realm = null;
        try {
            // TODO Record steps instead of executing?
            realm = Realm.createAndValidate(configuration, false, Looper.myLooper() != null);
            realm.beginTransaction();
            long currentVersion = realm.getVersion();
            realmMigration.migrate(realm.getSchema(), currentVersion, configuration.getSchemaVersion());
            realm.setVersion(configuration.getSchemaVersion());
            // TODO Validate schema before committing, otherwise we might risk saving the versionnumber for a wrong
            // schema
            realm.commitTransaction();
        } finally {
            if (realm != null) {
File
Realm.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
                realmsCache.remove();
            }
        }
<<<<<<< HEAD
    }

    /**
     * Returns the dynamic schema for this Realm.
     */
    RealmSchema getSchema() {
        return new RealmSchema(this, transaction);
=======
>>>>>>> 5094622f13ba845ad6236bb075a120965dde723e
    }

    /**
Solution content 
                realmsCache.remove();
            }
        }
    }

    /**
     * Returns the dynamic schema for this Realm.
     */
    RealmSchema getSchema() {
        return new RealmSchema(this, transaction);
    }

    /**
File
Realm.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Return statement