LUCENE-5973: fix index generation

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_8@1627041 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
index f33cdf7..e1f9344 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -161,7 +161,7 @@
   }
   */
   
-/*  
+/*
   private void updateNumeric(IndexWriter writer, String id, String f, String cf, long value) throws IOException {
     writer.updateNumericDocValue(new Term("id", id), f, value);
     writer.updateNumericDocValue(new Term("id", id), cf, value*2);
@@ -182,12 +182,12 @@
     Directory dir = newFSDirectory(indexDir);
     
     IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
-      .setUseCompoundFile(false).setMergePolicy(NoMergePolicy.INSTANCE);
+      .setUseCompoundFile(false).setMergePolicy(NoMergePolicy.COMPOUND_FILES);
     IndexWriter writer = new IndexWriter(dir, conf);
     // create an index w/ few doc-values fields, some with updates and some without
     for (int i = 0; i < 30; i++) {
       Document doc = new Document();
-      doc.add(new StringField("id", "" + i, Store.NO));
+      doc.add(new StringField("id", "" + i, Field.Store.NO));
       doc.add(new NumericDocValuesField("ndv1", i));
       doc.add(new NumericDocValuesField("ndv1_c", i*2));
       doc.add(new NumericDocValuesField("ndv2", i*3));
@@ -216,7 +216,7 @@
     updateNumeric(writer, "22", "ndv1", "ndv1_c", 200L); // update the field again
     writer.commit();
     
-    writer.shutdown();
+    writer.close();
     dir.close();
   }*/